From bfe9b5ea9e9fc81d3824272dd74b3b8d87bcaeb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A0=E6=96=87=E8=BD=A9?= <12812285557@qq.com> Date: Fri, 20 May 2022 15:23:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=B0=E4=BD=8F=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E9=97=AE=E9=A2=98=20=E5=92=8C=20=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=A4=B1=E8=B4=A5=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/provider/data_provider.dart | 1 + lib/provider/user_provider.dart | 1 - lib/ui/settings/settings_page.dart | 5 ++++- lib/utils/hive_store.dart | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/provider/data_provider.dart b/lib/provider/data_provider.dart index 9de2835..877e856 100644 --- a/lib/provider/data_provider.dart +++ b/lib/provider/data_provider.dart @@ -50,6 +50,7 @@ class DataProvider extends ChangeNotifier { _loginHistories.removeAt(_loginHistories.length - 1); } HiveStore.dataBox!.put('historyLogin', _loginHistories); + } } } diff --git a/lib/provider/user_provider.dart b/lib/provider/user_provider.dart index 5588b72..b7ea307 100644 --- a/lib/provider/user_provider.dart +++ b/lib/provider/user_provider.dart @@ -36,7 +36,6 @@ class UserProvider extends ChangeNotifier { ///注销登录 logout() async { - await NetUtil().post(SAASAPI.login.logOut, showMessage: true); WebSocketUtil().closeWebSocket(); NetUtil().logout(); _isLogin = false; diff --git a/lib/ui/settings/settings_page.dart b/lib/ui/settings/settings_page.dart index a6dd007..9389cdf 100644 --- a/lib/ui/settings/settings_page.dart +++ b/lib/ui/settings/settings_page.dart @@ -1,5 +1,6 @@ // Flutter imports: // Project imports: +import 'package:aku_new_community_manager/const/saas_api.dart'; import 'package:aku_new_community_manager/new_ui/auth/other_login_page.dart'; import 'package:aku_new_community_manager/provider/user_provider.dart'; import 'package:aku_new_community_manager/style/app_style.dart'; @@ -10,6 +11,7 @@ import 'package:aku_new_community_manager/ui/agreements/privacy_page.dart'; import 'package:aku_new_community_manager/ui/widgets/common/aku_material_button.dart'; import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_new_community_manager/ui/widgets/common/aku_tile.dart'; +import 'package:aku_new_community_manager/utils/network/net_util.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; @@ -85,7 +87,8 @@ class _SettingsPageState extends State { child: AkuMaterialButton( radius: 8.w, color: AppStyle.primaryColor, - onPressed: () { + onPressed: ()async { + await NetUtil().post(SAASAPI.login.logOut, showMessage: true); userProvider.logout(); Get.offAll(() => OtherLoginPage()); }, diff --git a/lib/utils/hive_store.dart b/lib/utils/hive_store.dart index 2cc295e..8adb0d1 100644 --- a/lib/utils/hive_store.dart +++ b/lib/utils/hive_store.dart @@ -1,5 +1,6 @@ // Package imports: import 'package:aku_new_community_manager/saas_models/login/china_region_model.dart'; +import 'package:aku_new_community_manager/saas_models/login/community_model.dart'; import 'package:aku_new_community_manager/saas_models/login/history_login_model.dart'; import 'package:aku_new_community_manager/saas_models/login/picked_city_model.dart'; import 'package:flutter/foundation.dart'; @@ -21,6 +22,8 @@ class HiveStore { Hive.registerAdapter(ChinaRegionModelAdapter()); //HiveTypeId:3 Hive.registerAdapter(HistoryLoginModelAdapter()); //HiveTypeId:4 Hive.registerAdapter(PickedCityModelAdapter()); //HiveTypeId:6 + Hive.registerAdapter(CommunityModelAdapter());//HiveTypeId:7 + Hive.init(dir.path); _appBox = await Hive.openBox('app'); _dataBox = await Hive.openBox('dataBox'); From 46d7348743659b699fbe894f6d4ab1ef7cb2e860 Mon Sep 17 00:00:00 2001 From: datang Date: Mon, 23 May 2022 17:07:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=9A=E5=8A=A0=E8=BD=BD=E5=87=BA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=89=E6=8B=A9=E5=88=B7=E6=96=B0=EF=BC=8C?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=B9=E6=98=93=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../household_audio_agree.dart | 75 ++++++ .../household_audit/household_audio_all.dart | 78 ++++++ .../household_audio_reject.dart | 75 ++++++ .../household_audio_verify.dart | 75 ++++++ .../household_audit/household_audit_card.dart | 184 ++++++++++++++ .../household_audit/household_audit_page.dart | 226 +----------------- pubspec.lock | 9 +- 7 files changed, 506 insertions(+), 216 deletions(-) create mode 100644 lib/new_ui/household_audit/household_audio_agree.dart create mode 100644 lib/new_ui/household_audit/household_audio_all.dart create mode 100644 lib/new_ui/household_audit/household_audio_reject.dart create mode 100644 lib/new_ui/household_audit/household_audio_verify.dart create mode 100644 lib/new_ui/household_audit/household_audit_card.dart diff --git a/lib/new_ui/household_audit/household_audio_agree.dart b/lib/new_ui/household_audit/household_audio_agree.dart new file mode 100644 index 0000000..ef705e5 --- /dev/null +++ b/lib/new_ui/household_audit/household_audio_agree.dart @@ -0,0 +1,75 @@ +import 'package:aku_new_community_manager/style/app_style.dart'; +import 'package:aku_new_community_manager/tools/extensions/list_extension_tool.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:velocity_x/velocity_x.dart'; + +import '../../const/saas_api.dart'; +import '../../saas_models/household_audit/household_audit_list_model.dart'; +import '../../utils/network/net_util.dart'; +import 'household_audit_card.dart'; + +class HouseholdAudioAgree extends StatefulWidget { + final EasyRefreshController refreshController; + const HouseholdAudioAgree({Key? key, required this.refreshController}) : super(key: key); + + @override + _HouseholdAudioAgreeState createState() => _HouseholdAudioAgreeState(); +} + +class _HouseholdAudioAgreeState extends State { + List _models = []; + int _page = 1; + int _size = 10; + + @override + Widget build(BuildContext context) { + return EasyRefresh( + controller: widget.refreshController, + firstRefresh: true, + header: MaterialHeader(), + footer: MaterialFooter(), + onRefresh: () async { + _models = []; + _page = 1; + var base = + await NetUtil().getList(SAASAPI.householdAudit.list, params: { + 'pageNum': _page, + 'size': _size, + 'status': 3 + }); + _models = base.rows + .map((e) => HouseholdAuditListModel.fromJson(e)) + .toList(); + setState(() {}); + }, + onLoad: () async { + _page++; + var base = + await NetUtil().getList(SAASAPI.householdAudit.list, params: { + 'pageNum': _page, + 'size': _size, + 'status': 3 + }); + if (_models.length < base.total) { + _models.addAll(base.rows + .map((e) => HouseholdAuditListModel.fromJson(e)) + .toList()); + setState(() {}); + } else { + widget.refreshController.finishLoad(); + } + }, + child: ListView( + padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 24.w), + children: _models + .mapIndexed((currentValue, index) => HouseholdAuditCard( + index: index, + refresh: () => widget.refreshController.callRefresh(), + model: currentValue, + )) + .toList() + .sepWidget(separate: 24.w.heightBox), + )); + } +} diff --git a/lib/new_ui/household_audit/household_audio_all.dart b/lib/new_ui/household_audit/household_audio_all.dart new file mode 100644 index 0000000..2a9f62b --- /dev/null +++ b/lib/new_ui/household_audit/household_audio_all.dart @@ -0,0 +1,78 @@ +import 'package:aku_new_community_manager/new_ui/household_audit/household_audit_card.dart'; +import 'package:aku_new_community_manager/style/app_style.dart'; +import 'package:aku_new_community_manager/tools/extensions/list_extension_tool.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:velocity_x/velocity_x.dart'; + +import '../../const/saas_api.dart'; +import '../../saas_models/household_audit/household_audit_list_model.dart'; +import '../../utils/network/net_util.dart'; + +class HouseholdAudioAll extends StatefulWidget { + final EasyRefreshController refreshController; + + HouseholdAudioAll( + {Key? key,required this.refreshController}) + : super(key: key); + + @override + _HouseholdAudioAllState createState() => _HouseholdAudioAllState(); +} + +class _HouseholdAudioAllState extends State { + List _models = []; + int _page = 1; + int _size = 10; + + @override + Widget build(BuildContext context) { + return EasyRefresh( + controller: widget.refreshController, + firstRefresh: true, + header: MaterialHeader(), + footer: MaterialFooter(), + onRefresh: () async { + _models = []; + _page = 1; + var base = + await NetUtil().getList(SAASAPI.householdAudit.list, params: { + 'pageNum': _page, + 'size': _size, + + }); + _models = base.rows + .map((e) => HouseholdAuditListModel.fromJson(e)) + .toList(); + setState(() {}); + }, + onLoad: () async { + _page++; + var base = + await NetUtil().getList(SAASAPI.householdAudit.list, params: { + 'pageNum': _page, + 'size': _size, + }); + if (_models.length < base.total) { + _models.addAll(base.rows + .map((e) => HouseholdAuditListModel.fromJson(e)) + .toList()); + setState(() {}); + } else { + widget.refreshController.finishLoad(); + } + }, + child: ListView( + padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 24.w), + children: _models + .mapIndexed((currentValue, index) => HouseholdAuditCard( + index: index, + refresh: () => widget.refreshController.callRefresh(), + model: currentValue, + )) + .toList() + .sepWidget(separate: 24.w.heightBox), + )); + } +} diff --git a/lib/new_ui/household_audit/household_audio_reject.dart b/lib/new_ui/household_audit/household_audio_reject.dart new file mode 100644 index 0000000..3f24150 --- /dev/null +++ b/lib/new_ui/household_audit/household_audio_reject.dart @@ -0,0 +1,75 @@ +import 'package:aku_new_community_manager/style/app_style.dart'; +import 'package:aku_new_community_manager/tools/extensions/list_extension_tool.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:velocity_x/velocity_x.dart'; + +import '../../const/saas_api.dart'; +import '../../saas_models/household_audit/household_audit_list_model.dart'; +import '../../utils/network/net_util.dart'; +import 'household_audit_card.dart'; + +class HouseholdAudioReject extends StatefulWidget { + final EasyRefreshController refreshController; + const HouseholdAudioReject({Key? key, required this.refreshController}) : super(key: key); + + @override + _HouseholdAudioRejectState createState() => _HouseholdAudioRejectState(); +} + +class _HouseholdAudioRejectState extends State { + List _models = []; + int _page = 1; + int _size = 10; + + @override + Widget build(BuildContext context) { + return EasyRefresh( + controller: widget.refreshController, + firstRefresh: true, + header: MaterialHeader(), + footer: MaterialFooter(), + onRefresh: () async { + _models = []; + _page = 1; + var base = + await NetUtil().getList(SAASAPI.householdAudit.list, params: { + 'pageNum': _page, + 'size': _size, + 'status': 2 + }); + _models = base.rows + .map((e) => HouseholdAuditListModel.fromJson(e)) + .toList(); + setState(() {}); + }, + onLoad: () async { + _page++; + var base = + await NetUtil().getList(SAASAPI.householdAudit.list, params: { + 'pageNum': _page, + 'size': _size, + 'status': 2 + }); + if (_models.length < base.total) { + _models.addAll(base.rows + .map((e) => HouseholdAuditListModel.fromJson(e)) + .toList()); + setState(() {}); + } else { + widget.refreshController.finishLoad(); + } + }, + child: ListView( + padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 24.w), + children: _models + .mapIndexed((currentValue, index) => HouseholdAuditCard( + index: index, + refresh: () => widget.refreshController.callRefresh(), + model: currentValue, + )) + .toList() + .sepWidget(separate: 24.w.heightBox), + )); + } +} diff --git a/lib/new_ui/household_audit/household_audio_verify.dart b/lib/new_ui/household_audit/household_audio_verify.dart new file mode 100644 index 0000000..5f59114 --- /dev/null +++ b/lib/new_ui/household_audit/household_audio_verify.dart @@ -0,0 +1,75 @@ +import 'package:aku_new_community_manager/style/app_style.dart'; +import 'package:aku_new_community_manager/tools/extensions/list_extension_tool.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:velocity_x/velocity_x.dart'; + +import '../../const/saas_api.dart'; +import '../../saas_models/household_audit/household_audit_list_model.dart'; +import '../../utils/network/net_util.dart'; +import 'household_audit_card.dart'; + +class HouseholdAudioVerify extends StatefulWidget { + final EasyRefreshController refreshController; + const HouseholdAudioVerify({Key? key, required this.refreshController}) : super(key: key); + + @override + _HouseholdAudioVerifyState createState() => _HouseholdAudioVerifyState(); +} + +class _HouseholdAudioVerifyState extends State { + List _models = []; + int _page = 1; + int _size = 10; + + @override + Widget build(BuildContext context) { + return EasyRefresh( + controller: widget.refreshController, + firstRefresh: true, + header: MaterialHeader(), + footer: MaterialFooter(), + onRefresh: () async { + _models = []; + _page = 1; + var base = + await NetUtil().getList(SAASAPI.householdAudit.list, params: { + 'pageNum': _page, + 'size': _size, + 'status': 1 + }); + _models = base.rows + .map((e) => HouseholdAuditListModel.fromJson(e)) + .toList(); + setState(() {}); + }, + onLoad: () async { + _page++; + var base = + await NetUtil().getList(SAASAPI.householdAudit.list, params: { + 'pageNum': _page, + 'size': _size, + 'status': 1 + }); + if (_models.length < base.total) { + _models.addAll(base.rows + .map((e) => HouseholdAuditListModel.fromJson(e)) + .toList()); + setState(() {}); + } else { + widget.refreshController.finishLoad(); + } + }, + child: ListView( + padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 24.w), + children: _models + .mapIndexed((currentValue, index) => HouseholdAuditCard( + index: index, + refresh: () => widget.refreshController.callRefresh(), + model: currentValue, + )) + .toList() + .sepWidget(separate: 24.w.heightBox), + )); + } +} diff --git a/lib/new_ui/household_audit/household_audit_card.dart b/lib/new_ui/household_audit/household_audit_card.dart new file mode 100644 index 0000000..9fb6fa9 --- /dev/null +++ b/lib/new_ui/household_audit/household_audit_card.dart @@ -0,0 +1,184 @@ +import 'package:aku_new_community_manager/style/app_style.dart'; +import 'package:flutter/material.dart'; +import 'package:velocity_x/velocity_x.dart'; + +import '../../const/saas_api.dart'; +import '../../gen/assets.gen.dart'; +import '../../saas_models/household_audit/household_audit_list_model.dart'; +import '../../ui/widgets/common/bee_divider.dart'; +import '../../ui/widgets/common/car_bottom_button.dart'; +import '../../utils/network/net_util.dart'; + +class HouseholdAuditCard extends StatelessWidget { + final int index; + final HouseholdAuditListModel model; + final VoidCallback refresh; + + HouseholdAuditCard({Key? key, required this.model, required this.refresh, required this.index}) + : super(key: key); + + @override + Widget build(BuildContext context) { + return Stack( + children: [ + Container( + width: double.infinity, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(16.w), color: Colors.white), + child: Column( + children: [ + Container( + padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 16.w), + height: 77.w, + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.centerLeft, + end: Alignment.centerRight, + // stops: [ + // 0.4, + // 0.6, + // 0.8 + // ], + colors: [ + Color(0xFFFFEAC3).withOpacity(0.31), + Color(0xFFFEE1AE).withOpacity(0.24), + Color(0xFFFFFFFF), + ])), + child: Row( + children: [ + '${model.houseName}' + .text + .size(32.sp) + .color(Colors.black.withOpacity(0.85)) + .make(), + Spacer(), + '类型:${model.estateTypeName}' + .text + .size(24.sp) + .color(Colors.black.withOpacity(0.45)) + .make(), + ], + ), + ), + Padding( + padding: EdgeInsets.symmetric(horizontal: 24.w, vertical: 24.w), + child: Column( + children: [ + Row( + mainAxisSize: MainAxisSize.max, + children: [ + SizedBox( + width: 160.w, + child: '申请人' + .text + .size(28.sp) + .color(Colors.black.withOpacity(0.45)) + .make()), + model.name.text + .size(28.sp) + .color(Colors.black.withOpacity(0.85)) + .make(), + ], + ), + 24.w.heightBox, + Row( + children: [ + SizedBox( + width: 160.w, + child: '联系方式' + .text + .size(28.sp) + .color(Colors.black.withOpacity(0.45)) + .make()), + model.tel.text + .size(28.sp) + .color(Colors.black.withOpacity(0.85)) + .make(), + ], + ), + 24.w.heightBox, + Row( + children: [ + SizedBox( + width: 160.w, + child: '申请身份' + .text + .size(28.sp) + .color(Colors.black.withOpacity(0.45)) + .make()), + _identity[model.identity]! + .text + .size(28.sp) + .color(Colors.black.withOpacity(0.85)) + .make(), + ], + ), + ], + ), + ), + Offstage( + offstage: model.status != 1, + child: Column( + children: [ + BeeDivider.horizontal(), + Padding( + padding: EdgeInsets.symmetric( + horizontal: 32.w, vertical: 24.w), + child: Row( + children: [ + Spacer(), + CardBottomButton.yellow( + text: '通过', + onPressed: () async { + var base = await NetUtil().post( + SAASAPI.householdAudit.review, + params: { + 'operate': 1, + 'estateReviewId': model.estateReviewId + }); + if (base.success) { + refresh(); + } + }), + 24.w.widthBox, + CardBottomButton.white( + text: '驳回', + onPressed: () async { + var base = await NetUtil().post( + SAASAPI.householdAudit.review, + params: { + 'operate': 2, + 'estateReviewId': model.estateReviewId + }); + if (base.success) { + refresh(); + } + }), + ], + ), + ), + ], + ), + ), + ], + ), + ), + Positioned( + right: 24.w, + bottom: 24.w, + child: Offstage( + offstage: model.status == 1, + child: Image.asset( + model.status == 2 + ? Assets.manage.rejected.path + : Assets.manage.passed.path, + width: 160.w, + height: 160.w, + ), + ), + ), + ], + ); + } + Map _identity = {1: '业主', 2: '业主亲属', 3: '租户', 4: '租户亲属'}; +} diff --git a/lib/new_ui/household_audit/household_audit_page.dart b/lib/new_ui/household_audit/household_audit_page.dart index 8dbbca5..3498563 100644 --- a/lib/new_ui/household_audit/household_audit_page.dart +++ b/lib/new_ui/household_audit/household_audit_page.dart @@ -1,5 +1,9 @@ import 'package:aku_new_community_manager/const/saas_api.dart'; import 'package:aku_new_community_manager/gen/assets.gen.dart'; +import 'package:aku_new_community_manager/new_ui/household_audit/household_audio_agree.dart'; +import 'package:aku_new_community_manager/new_ui/household_audit/household_audio_all.dart'; +import 'package:aku_new_community_manager/new_ui/household_audit/household_audio_reject.dart'; +import 'package:aku_new_community_manager/new_ui/household_audit/household_audio_verify.dart'; import 'package:aku_new_community_manager/saas_models/household_audit/household_audit_list_model.dart'; import 'package:aku_new_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_new_community_manager/ui/widgets/common/bee_divider.dart'; @@ -26,9 +30,6 @@ class _HouseholdAuditPageState extends State List _tabs = ['全部', '待审核', '已驳回', '已同意']; List _refreshControllers = []; late TabController _tabController; - List _models = []; - int _page = 1; - int _size = 10; @override void initState() { @@ -58,218 +59,13 @@ class _HouseholdAuditPageState extends State )), body: TabBarView( controller: _tabController, - children: List.generate(_tabs.length, (index) => _getView(index))), + children: [ + HouseholdAudioAll(refreshController: _refreshControllers[0]), + HouseholdAudioVerify(refreshController: _refreshControllers[1]), + HouseholdAudioReject(refreshController: _refreshControllers[2]), + HouseholdAudioAgree(refreshController: _refreshControllers[3]), + ], + ), ); } - - Widget _getView(int index) { - return EasyRefresh( - controller: _refreshControllers[index], - firstRefresh: true, - header: MaterialHeader(), - footer: MaterialFooter(), - onRefresh: () async { - _models = []; - _page = 1; - var base = await NetUtil().getList(SAASAPI.householdAudit.list, - params: { - 'pageNum': _page, - 'size': _size, - 'status': index == 0 ? null : index - }); - _models = base.rows - .map((e) => HouseholdAuditListModel.fromJson(e)) - .toList(); - setState(() {}); - }, - onLoad: () async { - _page++; - var base = await NetUtil().getList(SAASAPI.householdAudit.list, - params: { - 'pageNum': _page, - 'size': _size, - 'status': index == 0 ? null : index - }); - if (_models.length < base.total) { - _models.addAll(base.rows - .map((e) => HouseholdAuditListModel.fromJson(e)) - .toList()); - setState(() {}); - } else { - _refreshControllers[index].finishLoad(); - } - }, - child: ListView( - padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 24.w), - children: _models - .mapIndexed((currentValue, index) => _card(currentValue, index)) - .toList() - .sepWidget(separate: 24.w.heightBox), - )); - } - - Widget _card(HouseholdAuditListModel model, int index) { - return Stack( - children: [ - Container( - width: double.infinity, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(16.w), color: Colors.white), - child: Column( - children: [ - Container( - padding: EdgeInsets.symmetric(horizontal: 32.w, vertical: 16.w), - height: 77.w, - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.centerLeft, - end: Alignment.centerRight, - // stops: [ - // 0.4, - // 0.6, - // 0.8 - // ], - colors: [ - Color(0xFFFFEAC3).withOpacity(0.31), - Color(0xFFFEE1AE).withOpacity(0.24), - Color(0xFFFFFFFF), - ])), - child: Row( - children: [ - '${model.houseName}' - .text - .size(32.sp) - .color(Colors.black.withOpacity(0.85)) - .make(), - Spacer(), - '类型:${model.estateTypeName}' - .text - .size(24.sp) - .color(Colors.black.withOpacity(0.45)) - .make(), - ], - ), - ), - Padding( - padding: EdgeInsets.symmetric(horizontal: 24.w, vertical: 24.w), - child: Column( - children: [ - Row( - mainAxisSize: MainAxisSize.max, - children: [ - SizedBox( - width: 160.w, - child: '申请人' - .text - .size(28.sp) - .color(Colors.black.withOpacity(0.45)) - .make()), - model.name.text - .size(28.sp) - .color(Colors.black.withOpacity(0.85)) - .make(), - ], - ), - 24.w.heightBox, - Row( - children: [ - SizedBox( - width: 160.w, - child: '联系方式' - .text - .size(28.sp) - .color(Colors.black.withOpacity(0.45)) - .make()), - model.tel.text - .size(28.sp) - .color(Colors.black.withOpacity(0.85)) - .make(), - ], - ), - 24.w.heightBox, - Row( - children: [ - SizedBox( - width: 160.w, - child: '申请身份' - .text - .size(28.sp) - .color(Colors.black.withOpacity(0.45)) - .make()), - _identity[model.identity]! - .text - .size(28.sp) - .color(Colors.black.withOpacity(0.85)) - .make(), - ], - ) - ], - ), - ), - Offstage( - offstage: model.status != 1, - child: Column( - children: [ - BeeDivider.horizontal(), - Padding( - padding: EdgeInsets.symmetric( - horizontal: 32.w, vertical: 24.w), - child: Row( - children: [ - Spacer(), - CardBottomButton.yellow( - text: '通过', - onPressed: () async { - var base = await NetUtil().post( - SAASAPI.householdAudit.review, - params: { - 'operate': 1, - 'estateReviewId': model.estateReviewId - }); - if (base.success) { - _refreshControllers[index].callRefresh(); - } - }), - 24.w.widthBox, - CardBottomButton.white( - text: '驳回', - onPressed: () async { - var base = await NetUtil().post( - SAASAPI.householdAudit.review, - params: { - 'operate': 2, - 'estateReviewId': model.estateReviewId - }); - if (base.success) { - _refreshControllers[index].callRefresh(); - } - }), - ], - ), - ), - ], - ), - ) - ], - ), - ), - Positioned( - right: 24.w, - bottom: 24.w, - child: Offstage( - offstage: model.status == 1, - child: Image.asset( - model.status == 2 - ? Assets.manage.rejected.path - : Assets.manage.passed.path, - width: 160.w, - height: 160.w, - ), - ), - ) - ], - ); - } - - Map _identity = {1: '业主', 2: '业主亲属', 3: '租户', 4: '租户亲属'}; } diff --git a/pubspec.lock b/pubspec.lock index 7036f2a..b6a3240 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -618,6 +618,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" meta: dependency: transitive description: @@ -958,7 +965,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" time: dependency: transitive description: From 70251be997be25c233591a2d30ec063f2d626847 Mon Sep 17 00:00:00 2001 From: datang Date: Wed, 25 May 2022 17:54:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=8D=E5=8F=AF=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/ui/widgets/common/bee_picker_box.dart | 12 ++++++++---- pubspec.lock | 9 +-------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/lib/ui/widgets/common/bee_picker_box.dart b/lib/ui/widgets/common/bee_picker_box.dart index 95aefb8..0d7d666 100644 --- a/lib/ui/widgets/common/bee_picker_box.dart +++ b/lib/ui/widgets/common/bee_picker_box.dart @@ -42,9 +42,11 @@ class BeePickerBox extends StatelessWidget { SizedBox( height: 88.w, child: NavigationToolbar( - leading: _buildButton( - title: '取消', + leading: TextButton( onPressed: () => Navigator.pop(context), + child: Text( + '取消', + ), ), middle: Text( title ?? '', @@ -53,9 +55,11 @@ class BeePickerBox extends StatelessWidget { fontSize: 28.sp, ), ), - trailing: _buildButton( - title: confirmString, + trailing: TextButton( onPressed: onPressed, + child: Text( + '${confirmString}', + ), ), ), ), diff --git a/pubspec.lock b/pubspec.lock index b6a3240..7036f2a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -618,13 +618,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.3" meta: dependency: transitive description: @@ -965,7 +958,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.3" time: dependency: transitive description: