From 59f8aa50b36d0a2bccbb025b8a7baa215bf3dbaa Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Wed, 6 Apr 2022 18:58:57 +0800 Subject: [PATCH] fix bugs --- lib/constants/saas_api.dart | 19 +++++----- .../community/dynamic_my_list_body.dart | 4 ++ lib/pages/personal/item_my_address.dart | 15 +++----- lib/pages/personal/user_func.dart | 2 +- .../community_views/community_page.dart | 20 ++++++---- .../community_views/my_community_view.dart | 37 +++++++++++++++---- .../topic/topic_detail_page.dart | 2 + .../task/add_appointment_address_page.dart | 4 +- .../task/hall/hall_view.dart | 3 +- .../task/my_take_task/my_take_task_view.dart | 2 +- .../task/my_task/my_task_card.dart | 4 +- .../task/my_task/my_task_detail_page.dart | 10 ++++- .../task/my_task/my_task_view.dart | 2 +- .../function_and_service/task/task_page.dart | 2 +- lib/ui/profile/new_house/add_house_page.dart | 4 +- 15 files changed, 86 insertions(+), 44 deletions(-) diff --git a/lib/constants/saas_api.dart b/lib/constants/saas_api.dart index 9b599f46..7f5d0c9a 100644 --- a/lib/constants/saas_api.dart +++ b/lib/constants/saas_api.dart @@ -155,6 +155,9 @@ class _Community { } class _Task { + ///催促服务（发布者） + String get urgeService => '/app/user/taskRelease/urgeService'; + ///取消任务（发布者,接单者） String get cancel => '/app/user/taskRelease/cancel'; @@ -267,19 +270,19 @@ class _Pay { String get createPrepaymentOrder => '/app/user/alipay/createPrepaymentOrder'; ///创建预缴费订单 向支付宝发起订单查询请求 - String get prepaymentOrderCheckAlipay => '/app/user/alipay/prepaymentOrderCheckAlipay'; + String get prepaymentOrderCheckAlipay => + '/app/user/alipay/prepaymentOrderCheckAlipay'; ///创建缴费订单 - String get createLivingExpensesOrder => '/app/user/alipay/createLivingExpensesOrder'; + String get createLivingExpensesOrder => + '/app/user/alipay/createLivingExpensesOrder'; ///创建缴费订单 向支付宝发起订单查询请求 - String get livingExpensesOrderCheckAlipay => '/app/user/alipay/livingExpensesOrderCheckAlipay'; - - + String get livingExpensesOrderCheckAlipay => + '/app/user/alipay/livingExpensesOrderCheckAlipay'; } - -class _LifePay{ +class _LifePay { ///查询该房屋下所有的未缴费的订单 String get livingExpensesList => '/app/user/livingExpenses/list'; @@ -288,6 +291,4 @@ class _LifePay{ ///查询预交余额 String get findEstateBalance => '/app/user/livingExpenses/findEstateBalance'; - - } diff --git a/lib/models/community/dynamic_my_list_body.dart b/lib/models/community/dynamic_my_list_body.dart index ba71c126..f9b12092 100644 --- a/lib/models/community/dynamic_my_list_body.dart +++ b/lib/models/community/dynamic_my_list_body.dart @@ -1,5 +1,6 @@ import 'package:aku_new_community/model/common/img_model.dart'; import 'package:aku_new_community/models/community/all_dynamic_list_model.dart'; +import 'package:common_utils/common_utils.dart'; import 'package:json_annotation/json_annotation.dart'; part 'dynamic_my_list_body.g.dart'; @@ -17,9 +18,12 @@ class DynamicMyListBody { final List dynamicImgList; final List topicTags; final bool isLike; + factory DynamicMyListBody.fromJson(Map json) => _$DynamicMyListBodyFromJson(json); + DateTime? get createDT => DateUtil.getDateTime(createDate); + const DynamicMyListBody({ required this.id, this.content, diff --git a/lib/pages/personal/item_my_address.dart b/lib/pages/personal/item_my_address.dart index b7922763..403ebb28 100644 --- a/lib/pages/personal/item_my_address.dart +++ b/lib/pages/personal/item_my_address.dart @@ -7,18 +7,17 @@ * ==================================================== */ +import 'package:aku_new_community/base/base_style.dart'; +import 'package:aku_new_community/model/user/adress_model.dart'; +import 'package:aku_new_community/pages/personal/user_func.dart'; +import 'package:aku_new_community/provider/app_provider.dart'; +import 'package:aku_new_community/utils/headers.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; - import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; -import 'package:aku_new_community/base/base_style.dart'; -import 'package:aku_new_community/model/user/adress_model.dart'; -import 'package:aku_new_community/pages/personal/user_func.dart'; -import 'package:aku_new_community/provider/app_provider.dart'; -import 'package:aku_new_community/utils/headers.dart'; import 'address/new_address_page.dart'; // ignore: must_be_immutable @@ -196,9 +195,7 @@ class _MyAddressItemState extends State { if (result == true) { bool? result = await Userfunc.deleteAddress(widget.addressModel.id!); - if (result != null) { - if (result) widget.refreshController!.callRefresh(); - } + if (result) widget.refreshController!.callRefresh(); } ; }, diff --git a/lib/pages/personal/user_func.dart b/lib/pages/personal/user_func.dart index ea5ea7d9..ef17f696 100644 --- a/lib/pages/personal/user_func.dart +++ b/lib/pages/personal/user_func.dart @@ -63,7 +63,7 @@ class Userfunc { ///删除收货地址 static Future deleteAddress(int addressId) async { - BaseModel model = await NetUtil().post(SAASAPI.market.address.delete, + BaseModel model = await NetUtil().get(SAASAPI.market.address.delete, params: {'id': addressId}, showMessage: false); if (model.success) { BotToast.showText(text: '删除成功'); diff --git a/lib/ui/community/community_views/community_page.dart b/lib/ui/community/community_views/community_page.dart index e71a6e0e..192045ca 100644 --- a/lib/ui/community/community_views/community_page.dart +++ b/lib/ui/community/community_views/community_page.dart @@ -1,7 +1,6 @@ import 'dart:math'; import 'package:aku_new_community/base/base_style.dart'; -import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/model/common/img_model.dart'; import 'package:aku_new_community/models/community/all_dynamic_list_model.dart'; @@ -143,14 +142,21 @@ class _CommunityPageState extends State EasyRefresh( firstRefresh: true, header: MaterialHeader(), + footer: MaterialFooter(), controller: _easyRefreshController, onRefresh: () async { + _pageNum = 1; await (getNewInfo()); _gambitModels = await CommunityFunc.getListGambit(); _hotNewsModels = await CommunityFunc.getHotNews(); _onload = false; setState(() {}); }, + onLoad: () async { + _pageNum++; + await loadNewInfo(); + setState(() {}); + }, child: _onload ? SizedBox() : ListView( @@ -191,15 +197,15 @@ class _CommunityPageState extends State } Future loadNewInfo() async { - BaseListModel baseListModel = - await NetUtil().getList(API.market.hotTop, params: { - "pageNum": _pageNum, - "size": _size, - }); - if (baseListModel.rows.isNotEmpty) { + BaseListModel baseListModel = await NetUtil().getList( + SAASAPI.community.dynamicList, + params: {"pageNum": _pageNum, "size": _size, 'type': 1}); + if (baseListModel.total > _newItems.length) { _newItems.addAll((baseListModel.rows) .map((e) => AllDynamicListModel.fromJson(e)) .toList()); + } else { + _easyRefreshController.finishLoadCallBack!(noMore: true); } } diff --git a/lib/ui/community/community_views/my_community_view.dart b/lib/ui/community/community_views/my_community_view.dart index ef635f79..ac23e942 100644 --- a/lib/ui/community/community_views/my_community_view.dart +++ b/lib/ui/community/community_views/my_community_view.dart @@ -8,8 +8,11 @@ import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/ui/community/community_views/widgets/my_event_card.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/login_util.dart'; +import 'package:aku_new_community/utils/network/base_list_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; +import 'package:aku_new_community/widget/bee_avatar_widget.dart'; import 'package:aku_new_community/widget/line/vertical_line_painter.dart'; +import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; import 'package:aku_new_community/widget/views/bee_grid_image_view.dart'; import 'package:flutter/cupertino.dart'; @@ -17,8 +20,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:get/get.dart'; -import '../community_func.dart'; - class MyCommunityView extends StatefulWidget { MyCommunityView({Key? key}) : super(key: key); @@ -32,6 +33,8 @@ class MyCommunityViewState extends State bool _onload = true; List _myEventItems = []; DynamicMyListHead? _head; + int _pageNum = 1; + int _size = 10; refresh() { _refreshController.callRefresh(); @@ -53,10 +56,10 @@ class MyCommunityViewState extends State crossAxisAlignment: CrossAxisAlignment.center, children: [ 12.hb, - Image.asset( - R.ASSETS_ICONS_ICON_LOGISTICS_PNG, + BeeAvatarWidget( width: 132.w, height: 132.w, + imgs: UserTool.userProvider.userInfoModel!.imgList, ), 32.hb, '${_head?.createName}' @@ -132,7 +135,12 @@ class MyCommunityViewState extends State header: MaterialHeader(), controller: _refreshController, onRefresh: () async { - _myEventItems = await CommunityFunc.getMyEventItem(); + BaseListModel model = await NetUtil().getList( + SAASAPI.community.dynamicMyListL, + params: {'pageNum': _pageNum, 'size': _size}, + ); + _myEventItems = + model.rows.map((e) => DynamicMyListBody.fromJson(e)).toList(); var base = await NetUtil().get(SAASAPI.community.dynamicMyListH); if (base.success) { _head = DynamicMyListHead.fromJson(base.data); @@ -140,6 +148,19 @@ class MyCommunityViewState extends State _onload = false; setState(() {}); }, + onLoad: () async { + BaseListModel model = await NetUtil().getList( + SAASAPI.community.dynamicMyListL, + params: {'pageNum': _pageNum, 'size': _size}, + ); + if (model.total > _myEventItems.length) { + _myEventItems.addAll( + model.rows.map((e) => DynamicMyListBody.fromJson(e)).toList()); + setState(() {}); + } else { + _refreshController.finishLoadCallBack!(noMore: true); + } + }, child: _onload ? SizedBox() : ListView( @@ -206,14 +227,14 @@ class MyCommunityViewState extends State mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ - '11.15' + '${item.createDT?.month ?? ''}.${item.createDT?.day ?? ''}' .text .size(32.sp) .color(Color(0xA6000000)) .bold .isIntrinsic .make(), - '2021' + '${item.createDT?.year ?? ''}' .text .size(24.sp) .color(Color(0x73000000)) @@ -232,7 +253,7 @@ class MyCommunityViewState extends State mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - '25.61' + '${item.createDT?.hour ?? ''}.${item.createDT?.second ?? ''}' .text .size(28.sp) .color(Color(0xA6000000)) diff --git a/lib/ui/community/community_views/topic/topic_detail_page.dart b/lib/ui/community/community_views/topic/topic_detail_page.dart index 7e1f8e07..32220799 100644 --- a/lib/ui/community/community_views/topic/topic_detail_page.dart +++ b/lib/ui/community/community_views/topic/topic_detail_page.dart @@ -107,6 +107,8 @@ class _TopicDetailPageState extends State { title: _detailModel?.title, imgPath: ImgModel.first(_detailModel?.imgList), subTitle: _detailModel?.content, + dynamicNum: _detailModel?.dynamicNum, + commentNum: _detailModel?.commentNum, ), pinned: true, floating: true, diff --git a/lib/ui/function_and_service/task/add_appointment_address_page.dart b/lib/ui/function_and_service/task/add_appointment_address_page.dart index 811f3b99..3947c1fb 100644 --- a/lib/ui/function_and_service/task/add_appointment_address_page.dart +++ b/lib/ui/function_and_service/task/add_appointment_address_page.dart @@ -66,7 +66,7 @@ class _AddAppointmentAddressPageState extends State { children: [ SizedBox( width: 170.w, - child: '标志建筑' + child: '目标地点' .text .size(28.sp) .color(Colors.black.withOpacity(0.65)) @@ -78,7 +78,7 @@ class _AddAppointmentAddressPageState extends State { controller: _tagController, decoration: InputDecoration( border: InputBorder.none, - hintText: '请输入标志建筑', + hintText: '请输入目标地点', contentPadding: EdgeInsets.zero, isDense: true, hintStyle: TextStyle( diff --git a/lib/ui/function_and_service/task/hall/hall_view.dart b/lib/ui/function_and_service/task/hall/hall_view.dart index 227c6d85..51d86db7 100644 --- a/lib/ui/function_and_service/task/hall/hall_view.dart +++ b/lib/ui/function_and_service/task/hall/hall_view.dart @@ -11,6 +11,7 @@ import 'hall_card.dart'; class HallView extends StatefulWidget { final EasyRefreshController refreshController; final int type; + const HallView( {Key? key, required this.refreshController, required this.type}) : super(key: key); @@ -32,7 +33,7 @@ class _HallViewState extends State { controller: widget.refreshController, extraParams: { 'taskModel': 1, - 'type': widget.type + 1, + 'type': widget.type == 0 ? null : widget.type, }, convert: (json) => json.rows.map((e) => HallListModel.fromJson(e)).toList(), diff --git a/lib/ui/function_and_service/task/my_take_task/my_take_task_view.dart b/lib/ui/function_and_service/task/my_take_task/my_take_task_view.dart index 8e46a082..90d810b5 100644 --- a/lib/ui/function_and_service/task/my_take_task/my_take_task_view.dart +++ b/lib/ui/function_and_service/task/my_take_task/my_take_task_view.dart @@ -32,7 +32,7 @@ class _MyTakeTaskViewState extends State { controller: widget.refreshController, extraParams: { 'taskModel': 2, - 'type': widget.type + 1, + 'type': widget.type == 0 ? null : widget.type, }, convert: (json) => json.rows.map((e) => MyTakeTaskListModel.fromJson(e)).toList(), diff --git a/lib/ui/function_and_service/task/my_task/my_task_card.dart b/lib/ui/function_and_service/task/my_task/my_task_card.dart index ce65e070..578be827 100644 --- a/lib/ui/function_and_service/task/my_task/my_task_card.dart +++ b/lib/ui/function_and_service/task/my_task/my_task_card.dart @@ -70,8 +70,8 @@ class MyTaskCard extends StatelessWidget { ], ); return GestureDetector( - onTap: () { - Get.to(() => MyTaskDetailPage(model: model)); + onTap: () async { + await Get.to(() => MyTaskDetailPage(model: model)); }, child: Container( width: double.infinity, diff --git a/lib/ui/function_and_service/task/my_task/my_task_detail_page.dart b/lib/ui/function_and_service/task/my_task/my_task_detail_page.dart index 9e7c7ce3..65fcfbcd 100644 --- a/lib/ui/function_and_service/task/my_task/my_task_detail_page.dart +++ b/lib/ui/function_and_service/task/my_task/my_task_detail_page.dart @@ -1,8 +1,10 @@ import 'package:aku_new_community/base/base_style.dart'; +import 'package:aku_new_community/constants/saas_api.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/saas_model/task/my_task_list_model.dart'; import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_cancel_dialog.dart'; import 'package:aku_new_community/ui/function_and_service/task/dialogs/task_evaluation_dialog.dart'; +import 'package:aku_new_community/utils/network/net_util.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/buttons/bee_long_button.dart'; @@ -200,7 +202,13 @@ class _MyTaskDetailPageState extends State { ); case 2: return MaterialButton( - onPressed: () {}, + onPressed: () async { + var base = await NetUtil().get(SAASAPI.task.urgeService, + params: {'taskId': widget.model.id}, showMessage: true); + if (base.success) { + Get.back(); + } + }, minWidth: 330.w, height: 80.w, elevation: 0, diff --git a/lib/ui/function_and_service/task/my_task/my_task_view.dart b/lib/ui/function_and_service/task/my_task/my_task_view.dart index 2c0138da..7ef10623 100644 --- a/lib/ui/function_and_service/task/my_task/my_task_view.dart +++ b/lib/ui/function_and_service/task/my_task/my_task_view.dart @@ -32,7 +32,7 @@ class _MyTaskViewState extends State { controller: widget.refreshController, extraParams: { 'taskModel': 2, - 'type': widget.type + 1, + 'type': widget.type == 0 ? null : widget.type, }, convert: (json) => json.rows.map((e) => MyTaskListModel.fromJson(e)).toList(), diff --git a/lib/ui/function_and_service/task/task_page.dart b/lib/ui/function_and_service/task/task_page.dart index afacfede..a28d7388 100644 --- a/lib/ui/function_and_service/task/task_page.dart +++ b/lib/ui/function_and_service/task/task_page.dart @@ -77,7 +77,7 @@ class _TaskPageState extends State with TickerProviderStateMixin { Padding( padding: EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w), child: Row( - children: TaskMap.taskType.values + children: ['全部', ...TaskMap.taskType.values] .mapIndexed((currentValue, index) => _typeBar(currentValue, index)) .toList(), diff --git a/lib/ui/profile/new_house/add_house_page.dart b/lib/ui/profile/new_house/add_house_page.dart index c740c265..2724c320 100644 --- a/lib/ui/profile/new_house/add_house_page.dart +++ b/lib/ui/profile/new_house/add_house_page.dart @@ -511,7 +511,9 @@ class _AddHousePageState extends State { '${model.house == null ? '请选择楼层房号' : '${model.building!.name}-${model.unit!.name}-${model.floor!.name}-${model.house!.name}'}' .text .size(28.sp) - .color(Colors.black.withOpacity(0.25)) + .color(model.house != null + ? Colors.black.withOpacity(0.5) + : Colors.black.withOpacity(0.25)) .make(), ), Icon(