diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart index 30424e80..2a1cba08 100644 --- a/lib/gen/assets.gen.dart +++ b/lib/gen/assets.gen.dart @@ -1297,10 +1297,6 @@ class $AssetsImagesGen { AssetGenImage get wxpay => const AssetGenImage('assets/images/wxpay.png'); } -class $AssetsJsonGen { - const $AssetsJsonGen(); -} - class $AssetsNewIconGen { const $AssetsNewIconGen(); @@ -1533,7 +1529,6 @@ class Assets { static const $AssetsHomeGen home = $AssetsHomeGen(); static const $AssetsIconsGen icons = $AssetsIconsGen(); static const $AssetsImagesGen images = $AssetsImagesGen(); - static const $AssetsJsonGen json = $AssetsJsonGen(); static const $AssetsNewIconGen newIcon = $AssetsNewIconGen(); static const $AssetsStaticGen static = $AssetsStaticGen(); static const $AssetsTabGen tab = $AssetsTabGen(); diff --git a/lib/models/message/reply_list_model.dart b/lib/models/message/reply_list_model.dart index 5dbbb296..03cf1cbf 100644 --- a/lib/models/message/reply_list_model.dart +++ b/lib/models/message/reply_list_model.dart @@ -7,8 +7,9 @@ part 'reply_list_model.g.dart'; @JsonSerializable() class ReplyListModel { final int id; + final int type; final int status; - final String content; + final String? content; final int sendId; final String sendName; final String sendDate; @@ -26,6 +27,7 @@ class ReplyListModel { const ReplyListModel({ required this.id, + required this.type, required this.status, required this.content, required this.sendId, diff --git a/lib/models/message/reply_list_model.g.dart b/lib/models/message/reply_list_model.g.dart index 279b79a2..214a552e 100644 --- a/lib/models/message/reply_list_model.g.dart +++ b/lib/models/message/reply_list_model.g.dart @@ -9,8 +9,9 @@ part of 'reply_list_model.dart'; ReplyListModel _$ReplyListModelFromJson(Map json) => ReplyListModel( id: json['id'] as int, + type: json['type'] as int, status: json['status'] as int, - content: json['content'] as String, + content: json['content'] !=null? json['content'] as String:'', sendId: json['sendId'] as int, sendName: json['sendName'] as String, sendDate: json['sendDate'] as String, diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index d7b309d3..cef2869e 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -129,14 +129,14 @@ class _HomePageState extends State ), textAlign: TextAlign.center, ), - Text( - '(${appProvider.weatherType} ${appProvider.weatherTemp}℃)', - style: TextStyle( - fontSize: 28.sp, - color: Color(0xff999999), - ), - textAlign: TextAlign.center, - ), + // Text( + // '(${appProvider.weatherType} ${appProvider.weatherTemp}℃)', + // style: TextStyle( + // fontSize: 28.sp, + // color: Color(0xff999999), + // ), + // textAlign: TextAlign.center, + // ), Spacer(), // GestureDetector( // onTap: () { diff --git a/lib/pages/message_center_page/message_center_page.dart b/lib/pages/message_center_page/message_center_page.dart index 9340abbb..2ea77b14 100644 --- a/lib/pages/message_center_page/message_center_page.dart +++ b/lib/pages/message_center_page/message_center_page.dart @@ -47,6 +47,8 @@ class _MessageCenterPageState extends State @override Widget build(BuildContext context) { return BeeScaffold( + bgColor: Colors.white, + bodyColor: Color(0xFFF9F9F9), title: '消息', actions: [ MaterialButton( @@ -65,21 +67,28 @@ class _MessageCenterPageState extends State padding: EdgeInsets.symmetric(horizontal: 32.w), ), ], - appBarBottom: BeeTabBar( + appBarBottom: + TabBar( controller: _tabController, - tabs: _tabs, + indicatorColor: Color(0xffffc40c), + tabs: _tabs.map((e) => Tab(text: e)).toList(), + indicatorPadding: EdgeInsets.only(bottom: 15.w,left: 35.w,right: 35.w), ), - body: TabBarView( - children: [ - ReplayView( - controller: _controllers[0], - ), - ThumbsUpView( - controller: _controllers[1], - ), - AnnounceView(), - ], - controller: _tabController, + body: + Padding( + padding: EdgeInsets.only(top: 10.w), + child: TabBarView( + children: [ + ReplayView( + controller: _controllers[0], + ), + ThumbsUpView( + controller: _controllers[1], + ), + AnnounceView(), + ], + controller: _tabController, + ), ), ); } diff --git a/lib/pages/message_center_page/reply/replay_view.dart b/lib/pages/message_center_page/reply/replay_view.dart index 8229be86..b8572236 100644 --- a/lib/pages/message_center_page/reply/replay_view.dart +++ b/lib/pages/message_center_page/reply/replay_view.dart @@ -38,7 +38,9 @@ class _ReplayViewState extends State { itemBuilder: (context, index) { return ReplyCard(model: items[index]); }, - separatorBuilder: (_, __) =>1.w.heightBox, + separatorBuilder: (_, __) =>Container( + color: Color(0xFFF0F0F0),height: 2.w, + ), itemCount: items.length); }); } diff --git a/lib/pages/message_center_page/reply/reply_card.dart b/lib/pages/message_center_page/reply/reply_card.dart index 4fd60235..f9cd58b5 100644 --- a/lib/pages/message_center_page/reply/reply_card.dart +++ b/lib/pages/message_center_page/reply/reply_card.dart @@ -42,7 +42,13 @@ class ReplyCard extends StatelessWidget { children: [ model.sendName.text.size(26.sp).black.bold.make(), 5.heightBox, - model.content.text + model.content==null?''.text + .size(26.sp) + .color(ktextSubColor) + .maxLines(1) + .ellipsis + .make(): + (model.content!).text .size(26.sp) .color(ktextSubColor) .maxLines(1) diff --git a/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart b/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart index bf51df36..8a561478 100644 --- a/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart +++ b/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart @@ -1,5 +1,6 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; +import 'package:aku_new_community/models/message/reply_list_model.dart'; import 'package:aku_new_community/models/message/thumbs_up_list_model.dart'; import 'package:aku_new_community/pages/message_center_page/message_func.dart'; import 'package:aku_new_community/widget/beeImageNetwork.dart'; @@ -8,7 +9,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; class ThumbsUpCard extends StatelessWidget { - final ThumbsUpListModel model; + final ReplyListModel model; const ThumbsUpCard({Key? key, required this.model}) : super(key: key); @@ -36,8 +37,10 @@ class ThumbsUpCard extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ model.sendName.text.size(26.sp).black.bold.make(), + 5.heightBox, Assets.icons.communityLikeIs .image(width: 28.w, height: 28.w, fit: BoxFit.contain), + 5.heightBox, model.sendDate.text.size(24.sp).color(ktextSubColor).make(), ], ), diff --git a/lib/pages/personal/personal_page.dart b/lib/pages/personal/personal_page.dart index f5fe8bd1..6137d26b 100644 --- a/lib/pages/personal/personal_page.dart +++ b/lib/pages/personal/personal_page.dart @@ -109,7 +109,7 @@ class _PersonalIndexState extends State height: 40.w, alignment: Alignment.center, child: Image.asset( - R.ASSETS_ICONS_ICON_MY_SETTING_PNG, + Assets.newIcon.imgShezhi.path, width: 40.w, height: 40.w), ), @@ -402,13 +402,13 @@ class _PersonalIndexState extends State ), 24.hb, _function('我的积分', Assets.newIcon.icJifen.path, - () => ClockInPage(), ''), + () => Get.to(() => ClockInPage()), ''), _function( '我的房屋', - R.ASSETS_ICONS_ICON_MY_HOUSE_PNG, - (){ - Get.to(() => MyHousePage()); - }, + Assets.newIcon.icWdfw.path, + () { + Get.to(() => MyHousePage()); + }, // () => HouseOwnersPage( // identify: 4, // ), @@ -417,39 +417,26 @@ class _PersonalIndexState extends State '${UserTool.userProvider.defaultHouse?.unitName ?? ''}' '${UserTool.userProvider.defaultHouse?.estateName ?? ''}', ), - 36.hb, - _function( - '我的家庭', - R.ASSETS_ICONS_ICON_MY_HOUSE_PNG, - (){ - Get.to(() => MyFamilyPage()); - } - - , - ''), - 36.hb, + _function('我的家庭', Assets.newIcon.icWdjt.path, () { + Get.to(() => MyFamilyPage()); + }, ''), // _function('我的车位', R.ASSETS_ICONS_ICON_MY_CARSEAT_PNG, // () => CarParkingPage(), ''), // 36.hb, // _function('我的车', R.ASSETS_ICONS_ICON_MY_CAR_PNG, // () => CarManagePage(), ''), // 36.hb, - _function( - '我的访客', - R.ASSETS_ICONS_ICON_MY_VISITOR_PNG, - (){ - BotToast.showText(text: '当前小区尚未连接设备', align: Alignment(0, 0.5)); - } - - , - ''), - 36.hb, + _function('我的访客', Assets.newIcon.icWdfk.path, () { + BotToast.showText( + text: '当前小区尚未连接设备', + align: Alignment(0, 0.5)); + }, ''), _function( '收货地址', - R.ASSETS_ICONS_ICON_MY_LOCATION_PNG, - () => AddressListPage( + Assets.newIcon.icShdz.path, + () => Get.to(() => AddressListPage( canBack: false, - ), + )), ''), ], ), diff --git a/lib/pages/setting_page/settings_page.dart b/lib/pages/setting_page/settings_page.dart index 3fc428bf..d414cbfe 100644 --- a/lib/pages/setting_page/settings_page.dart +++ b/lib/pages/setting_page/settings_page.dart @@ -1,12 +1,9 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; -import 'package:aku_new_community/pages/setting_page/about_page/about_page.dart'; -import 'package:aku_new_community/pages/setting_page/account_manager_page.dart'; import 'package:aku_new_community/pages/setting_page/agreement_page/agreement_page.dart'; import 'package:aku_new_community/pages/setting_page/agreement_page/privacy_page.dart'; -import 'package:aku_new_community/pages/setting_page/feedback_page/feedback_page.dart'; -import 'package:aku_new_community/pages/tab_navigator.dart'; +import 'package:aku_new_community/pages/sign/login/other_login_page.dart'; import 'package:aku_new_community/provider/user_provider.dart'; import 'package:aku_new_community/utils/developer_util.dart'; import 'package:aku_new_community/utils/websocket/web_socket_util.dart'; @@ -81,7 +78,7 @@ class _SettingsPageState extends State { ), onPressed: () { userProvider.logout(); - Get.offAll(() => TabNavigator()); + Get.to(() => OtherLoginPage()); }, ), ], @@ -106,7 +103,7 @@ class _SettingsPageState extends State { body: ListView( padding: EdgeInsets.zero, children: [ - ...[ + ...[ // _buildTile( // title: '是否接受信息通知', // suffix: CupertinoSwitch( @@ -114,10 +111,10 @@ class _SettingsPageState extends State { // onChanged: (state) {}, // ), // ), - _buildTile( - title: '关于小蜜蜂智慧小区', - onTap: () => Get.to(() => AboutPage()), - ), + // _buildTile( + // title: '关于小蜜蜂智慧小区', + // onTap: () => Get.to(() => AboutPage()), + // ), //TODO 邀请注册 // _buildTile( // title: '邀请注册', @@ -137,14 +134,14 @@ class _SettingsPageState extends State { // title: '清除缓存', // onTap: () {}, // ), - _buildTile( - title: '意见反馈', - onTap: () => Get.to(() => FeedBackPage()), - ), - _buildTile( - title: '账号管理', - onTap: () => Get.to(() => AccountManagerPage()), - ), + // _buildTile( + // title: '意见反馈', + // onTap: () => Get.to(() => FeedBackPage()), + // ), + // _buildTile( + // title: '账号管理', + // onTap: () => Get.to(() => AccountManagerPage()), + // ), _buildTile( title: '小蜜蜂用户协议', onTap: () => Get.to(() => AgreementPage()), diff --git a/lib/pages/sign/login/other_login_page.dart b/lib/pages/sign/login/other_login_page.dart index 92837e46..0071da3a 100644 --- a/lib/pages/sign/login/other_login_page.dart +++ b/lib/pages/sign/login/other_login_page.dart @@ -113,8 +113,10 @@ class _OtherLoginPageState extends State { await UserTool.dataProvider.addHistories(); await UserTool.userProvider.setLogin(response.data['data']); } else { - // BotToast.showText(text: response.data['message']); - BotToast.showText(text: '账号尚未注册，请使用验证码登陆'); + BotToast.showText(text: response.data['msg']); + if (response.data['msg'] == '该账户未设置密码，请使用验证码登录') { + _controller.jumpToPage(0); + } } } catch (e) { print(e.toString()); diff --git a/lib/ui/community/community_views/community_page.dart b/lib/ui/community/community_views/community_page.dart index 3ae3d310..9f30c4db 100644 --- a/lib/ui/community/community_views/community_page.dart +++ b/lib/ui/community/community_views/community_page.dart @@ -97,6 +97,9 @@ class _CommunityPageState extends State child: TabBar( onTap: (index) { setState(() {}); + if (_tabController?.index == 1) { + myKey.currentState?.refresh(); + } }, controller: _tabController, indicatorColor: Color(0xffffc40c), diff --git a/lib/ui/community/community_views/event_detail_page.dart b/lib/ui/community/community_views/event_detail_page.dart index 90513e7a..db1701c8 100644 --- a/lib/ui/community/community_views/event_detail_page.dart +++ b/lib/ui/community/community_views/event_detail_page.dart @@ -300,134 +300,134 @@ class _EventDetailPageState extends State { } Widget _commentWidget(CommentListModel model, int rootIndex) { - return Container( - // key: UniqueKey(), - color: Colors.white, - padding: EdgeInsets.symmetric(vertical: 32.w, horizontal: 32.w), - width: double.infinity, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - [ - Material( - color: Color(0xFFF5F5F5), - borderRadius: BorderRadius.circular(48.w), - clipBehavior: Clip.antiAlias, - child: FadeInImage.assetNetwork( - placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, - image: SAASAPI.image(ImgModel.first(model.avatarImgList)), - height: 96.w, - width: 96.w, - fit: BoxFit.cover, - imageErrorBuilder: (context, error, stackTrace) { - return Image.asset( - R.ASSETS_IMAGES_PLACEHOLDER_WEBP, - height: 86.w, - width: 86.w, - ); - }, - ), - ), - 20.wb, - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - model.createName, - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle( - color: Colors.black.withOpacity(0.85), - fontSize: 30.sp, - fontWeight: FontWeight.w500), + return GestureDetector( + onTap: () { + _rootId = model.id; + _parentId = model.id; + _focusNode.requestFocus(); + _currentCommentIndex = rootIndex; + }, + child: Container( + // key: UniqueKey(), + color: Colors.white, + padding: EdgeInsets.symmetric(vertical: 32.w, horizontal: 32.w), + width: double.infinity, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + [ + Material( + color: Color(0xFFF5F5F5), + borderRadius: BorderRadius.circular(48.w), + clipBehavior: Clip.antiAlias, + child: FadeInImage.assetNetwork( + placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP, + image: SAASAPI.image(ImgModel.first(model.avatarImgList)), + height: 96.w, + width: 96.w, + fit: BoxFit.cover, + imageErrorBuilder: (context, error, stackTrace) { + return Image.asset( + R.ASSETS_IMAGES_PLACEHOLDER_WEBP, + height: 86.w, + width: 86.w, + ); + }, ), - 12.hb, - BeeDateUtil(DateUtil.getDateTime(model.createDate)) - .timeAgoWithHm - .text - .size(24.sp) - .color(Color(0xFF999999)) - .make(), - ], - ), - Spacer(), - CommunityPopButton( - isMyself: _isMyself, - onSelect: (value) async { - if (_isMyself) { - await CommunityFunc.deleteComment(model.id); - _refreshController.callRefresh(); - } - }) - ].row(), - 40.hb, - model.content.text.size(28.sp).color(ktextSubColor).make(), - 30.hb, - GestureDetector( - onTap: () async { - var res = - await NetUtil().get(SAASAPI.community.commentLike, params: { - 'commentId': model.id, - }); - if (res.success) { - _likes[rootIndex] = !_likes[rootIndex]; - setState(() {}); - } - }, - child: Row( - children: [ - Spacer(), - GestureDetector( - onTap: () async { - var base = await NetUtil().get( - SAASAPI.community.commentLike, - params: {'commentId': model.id}); - if (base.success) { - _likes[rootIndex] = !_likes[rootIndex]; - if (_likes[rootIndex]) { - _likeNums[rootIndex] += 1; + ), + 20.wb, + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + model.createName, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + color: Colors.black.withOpacity(0.85), + fontSize: 30.sp, + fontWeight: FontWeight.w500), + ), + 12.hb, + BeeDateUtil(DateUtil.getDateTime(model.createDate)) + .timeAgoWithHm + .text + .size(24.sp) + .color(Color(0xFF999999)) + .make(), + ], + ), + Spacer(), + CommunityPopButton( + isMyself: _isMyself, + onSelect: (value) async { + if (_isMyself) { + await CommunityFunc.deleteComment(model.id); + _refreshController.callRefresh(); + } + }) + ].row(), + 40.hb, + model.content.text.size(28.sp).color(ktextSubColor).make(), + 30.hb, + GestureDetector( + onTap: () async { + var res = + await NetUtil().get(SAASAPI.community.commentLike, params: { + 'commentId': model.id, + }); + if (res.success) { + _likes[rootIndex] = !_likes[rootIndex]; + setState(() {}); + } + }, + child: Row( + children: [ + Spacer(), + GestureDetector( + onTap: () async { + var base = await NetUtil().get( + SAASAPI.community.commentLike, + params: {'commentId': model.id}); + if (base.success) { + _likes[rootIndex] = !_likes[rootIndex]; + if (_likes[rootIndex]) { + _likeNums[rootIndex] += 1; + } else { + _likeNums[rootIndex] -= 1; + } + BotToast.showText( + text: _likes[rootIndex] ? '点赞成功' : '取消点赞成功'); } else { - _likeNums[rootIndex] -= 1; + BotToast.showText(text: base.msg); } - BotToast.showText( - text: _likes[rootIndex] ? '点赞成功' : '取消点赞成功'); - } else { - BotToast.showText(text: base.msg); - } - setState(() {}); - }, - child: Material( - color: Colors.transparent, - child: Row( - children: [ - Image.asset( - R.ASSETS_ICONS_COMMUNITY_LIKE_PNG, - width: 32.w, - height: 32.w, - color: !_likes[rootIndex] - ? Colors.black.withOpacity(0.45) - : kPrimaryColor, - ), - 5.wb, - '${_likeNums[rootIndex]}' - .text - .size(24.sp) - .color(Color(0xFF999999)) - .make(), - ], + setState(() {}); + }, + child: Material( + color: Colors.transparent, + child: Row( + children: [ + Image.asset( + R.ASSETS_ICONS_COMMUNITY_LIKE_PNG, + width: 32.w, + height: 32.w, + color: !_likes[rootIndex] + ? Colors.black.withOpacity(0.45) + : kPrimaryColor, + ), + 5.wb, + '${_likeNums[rootIndex]}' + .text + .size(24.sp) + .color(Color(0xFF999999)) + .make(), + ], + ), ), ), - ), - 32.wb, - GestureDetector( - onTap: () { - _rootId = model.id; - _parentId = model.id; - _focusNode.requestFocus(); - _currentCommentIndex = rootIndex; - }, - child: Row( + 32.wb, + Row( children: [ Image.asset( R.ASSETS_ICONS_COMMUNITY_COMMENT_PNG, @@ -436,46 +436,46 @@ class _EventDetailPageState extends State { ), ], ), - ), - 5.wb, - '${model.commentNum}' - .text - .size(24.sp) - .color(Color(0xFF999999)) - .make(), - ], + 5.wb, + '${model.commentNum}' + .text + .size(24.sp) + .color(Color(0xFF999999)) + .make(), + ], + ), ), - ), - 40.hb, - model.commentTwoList.isEmpty - ? SizedBox.shrink() - : Container( - alignment: Alignment.topLeft, - decoration: BoxDecoration( - color: Colors.black.withOpacity(0.06), - borderRadius: BorderRadius.circular(16.w)), - margin: EdgeInsets.only(left: 125.w), - width: 600.w, - padding: - EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - ...List.generate( - model.commentTwoList.length < 3 - ? model.commentTwoList.length - : 3, - (index) => _subCommentWidget( - model.commentTwoList[index], - model.createId, - model.id, - rootIndex)), - if (model.commentTwoList.length > 3) - _foldComment(model, rootIndex) - ].sepWidget(separate: 24.hb), + 40.hb, + model.commentTwoList.isEmpty + ? SizedBox.shrink() + : Container( + alignment: Alignment.topLeft, + decoration: BoxDecoration( + color: Colors.black.withOpacity(0.06), + borderRadius: BorderRadius.circular(16.w)), + margin: EdgeInsets.only(left: 125.w), + width: 600.w, + padding: + EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ...List.generate( + model.commentTwoList.length < 3 + ? model.commentTwoList.length + : 3, + (index) => _subCommentWidget( + model.commentTwoList[index], + model.createId, + model.id, + rootIndex)), + if (model.commentTwoList.length > 3) + _foldComment(model, rootIndex) + ].sepWidget(separate: 24.hb), + ), ), - ), - ], + ], + ), ), ); } diff --git a/lib/ui/community/community_views/my_community_view.dart b/lib/ui/community/community_views/my_community_view.dart index 3605f060..b10b7d9e 100644 --- a/lib/ui/community/community_views/my_community_view.dart +++ b/lib/ui/community/community_views/my_community_view.dart @@ -131,6 +131,7 @@ class MyCommunityViewState extends State return EasyRefresh( firstRefresh: true, header: MaterialHeader(), + footer: MaterialFooter(), controller: _refreshController, onRefresh: () async { BaseListModel model = await NetUtil().getList( diff --git a/lib/ui/function_and_service/task/hall/hall_card.dart b/lib/ui/function_and_service/task/hall/hall_card.dart index b0732b5e..9bd9404a 100644 --- a/lib/ui/function_and_service/task/hall/hall_card.dart +++ b/lib/ui/function_and_service/task/hall/hall_card.dart @@ -122,7 +122,7 @@ class HallCard extends StatelessWidget { 24.w.heightBox, Row( children: [ - Assets.icons.environment.image(width: 36.w, height: 36.w), + Assets.icons.environment.image(width: 40.w, height: 40.w), 24.w.widthBox, '${model.accessAddress}' .text diff --git a/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart b/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart index 5d336015..f41d66e4 100644 --- a/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart +++ b/lib/ui/function_and_service/task/my_take_task/my_take_task_card.dart @@ -80,29 +80,6 @@ class MyTakeTaskCard extends StatelessWidget { 24.w.heightBox, appointment, 20.w.heightBox, - Row( - children: [ - Assets.icons.clockCircle.image(width: 36.w, height: 36.w), - 24.w.widthBox, - '${DateUtil.formatDateStr(model.readyEndTime)}' - .text - .size(24.sp) - .color(Colors.black.withOpacity(0.65)) - .make(), - ], - ), - 20.w.heightBox, - Row( - children: [ - Assets.icons.environment.image(width: 36.w, height: 36.w), - 24.w.widthBox, - '${model.accessAddress}' - .text - .size(24.sp) - .color(Colors.black.withOpacity(0.65)) - .make(), - ], - ), Row( children: [ Assets.icons.watch.image(width: 40.w, height: 40.w), @@ -120,7 +97,7 @@ class MyTakeTaskCard extends StatelessWidget { 24.w.heightBox, Row( children: [ - Assets.icons.environment.image(width: 36.w, height: 36.w), + Assets.icons.environment.image(width: 40.w, height: 40.w), 24.w.widthBox, '${model.accessAddress}' .text diff --git a/lib/ui/function_and_service/task/task_map.dart b/lib/ui/function_and_service/task/task_map.dart index f6d54ba4..3b95eecf 100644 --- a/lib/ui/function_and_service/task/task_map.dart +++ b/lib/ui/function_and_service/task/task_map.dart @@ -8,15 +8,16 @@ class TaskMap { 9: '其他' }; static Map statusToString = { - 1: '未接单', - 2: '待处理', - 3: '已完成', - 4: '已取消' + 1: '已发布', + 2: '服务中', + 3: '待确认', + 4: '已完成', + 5: '已评价', + 9: '已取消' }; static Map typeToString = {1: '跑腿', 2: '代驾', 3: '装修', 4: '陪玩'}; static Map serviceObject = {1: '住户', 2: '物业', 3: '不限'}; static Map rewardType = {1: '赏金', 2: '积分'}; - } diff --git a/lib/widget/bee_scaffold.dart b/lib/widget/bee_scaffold.dart index 932a77e3..1aedb100 100644 --- a/lib/widget/bee_scaffold.dart +++ b/lib/widget/bee_scaffold.dart @@ -73,6 +73,7 @@ class BeeScaffold extends StatelessWidget { actions: actions, bottom: appBarBottom, titleSpacing: titleSpacing, + ); return AnnotatedRegion(