xt / Flutter-ReserveApp · Commits

Go to a project

Commit c92d78e714c7ea6da034b64cf8b70ddd62ee4914

Authored by wdn127929
1 parent d53c7578
build: skipped

定金去向

Inline Side-by-side
Showing 23 changed files with 116 additions and 19 deletions
@@ -110,6 +110,7 @@ class NotebookDetail { @@ -110,6 +110,7 @@ class NotebookDetail {
110 dynamic is_user_comments; //是否评价过 110 dynamic is_user_comments; //是否评价过
111 111
112 String up_date; //订单修改时间 112 String up_date; //订单修改时间
  113 + String deposit_cancel; //订金走向
113 114
114 String get statuImgAssets { 115 String get statuImgAssets {
115 switch (status) { 116 switch (status) {
@@ -305,7 +306,7 @@ class NotebookDetail { @@ -305,7 +306,7 @@ class NotebookDetail {
305 306
306 @override 307 @override
307 String toString() { 308 String toString() {
308 - return 'NotebookDetail{id: $id, uid: $uid ,con_amount:$con_amount,abolition: $abolition, tableinfo: $tableinfo,actual_pum:$actual_pum, pnum: $pnum, rname: $rname, sex: $sex, phone: $phone, cusdem: $cusdem, cusman: $cusman, ddate: $ddate, is_set_ddate: $is_set_ddate, ddate_solt: $ddate_solt, status: $status, action: $action, type: $type, note_name: $note_name, seller_user_phone:$seller_user_phone, nick_name: $nick_name,channel: $channel, cdate: $cdate, demands: $demands, tables: $tables, cancel: $cancel, gid: $gid,guest_uid:$guest_uid,reserve_type:$reserve_type,place_order_name:$place_order_name,is_user_comments:$is_user_comments,up_date:$up_date}'; 309 + return 'NotebookDetail{id: $id, uid: $uid ,con_amount:$con_amount,abolition: $abolition, tableinfo: $tableinfo,actual_pum:$actual_pum, pnum: $pnum, rname: $rname, sex: $sex, phone: $phone, cusdem: $cusdem, cusman: $cusman, ddate: $ddate, is_set_ddate: $is_set_ddate, ddate_solt: $ddate_solt, status: $status, action: $action, type: $type, note_name: $note_name, seller_user_phone:$seller_user_phone, nick_name: $nick_name,channel: $channel, cdate: $cdate, demands: $demands, tables: $tables, cancel: $cancel, gid: $gid,guest_uid:$guest_uid,reserve_type:$reserve_type,place_order_name:$place_order_name,is_user_comments:$is_user_comments,deposit_cancel:$deposit_cancel,up_date:$up_date}';
309 } 310 }
310 } 311 }
311 312
@@ -50,13 +50,12 @@ NotebookDetail _$NotebookDetailFromJson(Map<String, dynamic> json) { @@ -50,13 +50,12 @@ NotebookDetail _$NotebookDetailFromJson(Map<String, dynamic> json) {
50 ? null 50 ? null
51 : OrderInfo.fromJson(json['order_info'] as Map<String, dynamic>) 51 : OrderInfo.fromJson(json['order_info'] as Map<String, dynamic>)
52 ..gid = json['gid'] as String 52 ..gid = json['gid'] as String
53 - ..guest_uid=json['guest_uid'] as String 53 + ..guest_uid = json['guest_uid'] as String
54 ..reserve_type = json['reserve_type'] as String 54 ..reserve_type = json['reserve_type'] as String
55 ..place_order_name = json['place_order_name'] as String 55 ..place_order_name = json['place_order_name'] as String
56 ..is_user_comments = json['is_user_comments'] as dynamic 56 ..is_user_comments = json['is_user_comments'] as dynamic
57 - ..up_date = json['up_date'] as String;  
58 -  
59 - 57 + ..up_date = json['up_date'] as String
  58 + ..deposit_cancel = json['deposit_cancel'] as String;
60 } 59 }
61 60
62 Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) => 61 Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) =>
@@ -91,11 +90,12 @@ Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) => @@ -91,11 +90,12 @@ Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) =>
91 'order': instance.order, 90 'order': instance.order,
92 'order_info': instance.orderInfo, 91 'order_info': instance.orderInfo,
93 'gid': instance.gid, 92 'gid': instance.gid,
94 - 'guest_uid':instance.guest_uid,  
95 - 'reserve_type':instance.reserve_type, 93 + 'guest_uid': instance.guest_uid,
  94 + 'reserve_type': instance.reserve_type,
96 'place_order_name': instance.place_order_name, 95 'place_order_name': instance.place_order_name,
97 'is_user_comments': instance.is_user_comments, 96 'is_user_comments': instance.is_user_comments,
98 - 'up_date':instance.up_date, 97 + 'up_date': instance.up_date,
  98 + 'deposit_cancel': instance.deposit_cancel,
99 }; 99 };
100 OrderInfo _$OrderInfoFromJson(Map<String, dynamic> json) { 100 OrderInfo _$OrderInfoFromJson(Map<String, dynamic> json) {
101 return OrderInfo( 101 return OrderInfo(
@@ -498,4 +498,7 @@ class HttpUrl { @@ -498,4 +498,7 @@ class HttpUrl {
498 static const String get_reserve_type_field = 498 static const String get_reserve_type_field =
499 "?service=App.Seller.GetReserveTypeField"; // 获取用餐类型 499 "?service=App.Seller.GetReserveTypeField"; // 获取用餐类型
500 500
  501 + static const String set_reserve_deposit =
  502 + "?service=App.Reserve.SetReserveDeposit"; // 取消订单设置定金走向
  503 +
501 } 504 }
@@ -725,7 +725,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -725,7 +725,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
725 }).toList(), 725 }).toList(),
726 )), 726 )),
727 VEmptyView(34), 727 VEmptyView(34),
728 - MyDivider(double.infinity, w(1), color: MyColours.color_E7E7E7) 728 + // MyDivider(double.infinity, w(1), color: MyColours.color_E7E7E7)
729 ], 729 ],
730 ); 730 );
731 } 731 }
@@ -912,7 +912,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -912,7 +912,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
912 }).toList(), 912 }).toList(),
913 )), 913 )),
914 VEmptyView(34), 914 VEmptyView(34),
915 - _depositWidget(), 915 + if (detailModel.reserveDepositList.length >
  916 + 0)
  917 + _depositWidget(),
916 MyDivider(double.infinity, w(1), 918 MyDivider(double.infinity, w(1),
917 color: MyColours.color_E7E7E7) 919 color: MyColours.color_E7E7E7)
918 ], 920 ],
@@ -953,7 +955,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -953,7 +955,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
953 gradientEnd: Colors.transparent, 955 gradientEnd: Colors.transparent,
954 textColor: MyColours.color_438E93, 956 textColor: MyColours.color_438E93,
955 fontSize: 34, 957 fontSize: 34,
956 - onPressed: () { 958 + onPressed: () async {
957 String desc = ''; 959 String desc = '';
958 for (var value in cancelReasonList) { 960 for (var value in cancelReasonList) {
959 if (value['select'] == true) { 961 if (value['select'] == true) {
@@ -962,7 +964,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -962,7 +964,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
962 desc = 964 desc =
963 _cancelController.text.trim(); 965 _cancelController.text.trim();
964 if (desc.isEmpty) { 966 if (desc.isEmpty) {
965 - Utils.showToast("请填写原因"); 967 + Utils.showToast("请填写取消原因");
966 return; 968 return;
967 } 969 }
968 } 970 }
@@ -970,7 +972,27 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -970,7 +972,27 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
970 } 972 }
971 973
972 if (desc == '') { 974 if (desc == '') {
973 - Utils.showToast('请选择原因'); 975 + Utils.showToast('请选择取消原因');
  976 + return;
  977 + }
  978 +
  979 + String desc2 = '';
  980 + for (var value in depositReasonList) {
  981 + if (value['select'] == true) {
  982 + desc2 = value['title'];
  983 + if (value['title'] == '其他原因') {
  984 + desc2 =
  985 + _depositController.text.trim();
  986 + if (desc2.isEmpty) {
  987 + Utils.showToast("请填写预订订金走向");
  988 + return;
  989 + }
  990 + }
  991 + }
  992 + }
  993 +
  994 + if (desc2 == '') {
  995 + Utils.showToast('请选择预订订金走向');
974 return; 996 return;
975 } 997 }
976 998
@@ -979,6 +1001,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -979,6 +1001,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
979 1001
980 setReserveStatus('4', 1002 setReserveStatus('4',
981 desc: desc, phone: phone); 1003 desc: desc, phone: phone);
  1004 +
  1005 + Map<String, String> pramas = {
  1006 + 'rid': widget.rid,
  1007 + 'cancel': desc2
  1008 + };
  1009 +
  1010 + await detailModel.setReserveDeposit(
  1011 + context, pramas);
982 }), 1012 }),
983 ], 1013 ],
984 ), 1014 ),
@@ -1706,7 +1736,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1706,7 +1736,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1706 )) 1736 ))
1707 ]))); 1737 ])));
1708 }), 1738 }),
1709 - // VEmptyView(20), 1739 + if (detailEntity.deposit_cancel != null &&
  1740 + detailEntity.deposit_cancel != '')
  1741 + VEmptyView(10),
  1742 + Padding(
  1743 + padding: EdgeInsets.only(left: w(16)),
  1744 + child: Text(
  1745 + '${detailEntity.deposit_cancel ?? ''}',
  1746 + style: TextStyle(color: MyColours.color_515151, fontSize: font(14)),
  1747 + ))
1710 // MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4), 1748 // MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4),
1711 ]); 1749 ]);
1712 } 1750 }
@@ -86,6 +86,7 @@ class _MonthItemState extends State<MonthItem> { @@ -86,6 +86,7 @@ class _MonthItemState extends State<MonthItem> {
86 crossAxisAlignment: CrossAxisAlignment.start, 86 crossAxisAlignment: CrossAxisAlignment.start,
87 children: [ 87 children: [
88 Wrap( 88 Wrap(
  89 + crossAxisAlignment: WrapCrossAlignment.center,
89 runSpacing: w(6), 90 runSpacing: w(6),
90 children: [ 91 children: [
91 Text( 92 Text(
@@ -115,7 +116,7 @@ class _MonthItemState extends State<MonthItem> { @@ -115,7 +116,7 @@ class _MonthItemState extends State<MonthItem> {
115 ), 116 ),
116 HEmptyView(10), 117 HEmptyView(10),
117 Text( 118 Text(
118 - '${widget.countsListSunModel.totalPnum??0}人', 119 + '${widget.countsListSunModel.totalPnum ?? 0}人',
119 style: TextStyle( 120 style: TextStyle(
120 color: MyColours.color_515151, 121 color: MyColours.color_515151,
121 fontSize: font(12)), 122 fontSize: font(12)),
@@ -150,6 +151,7 @@ class _MonthItemState extends State<MonthItem> { @@ -150,6 +151,7 @@ class _MonthItemState extends State<MonthItem> {
150 ), 151 ),
151 VEmptyView(12), 152 VEmptyView(12),
152 Wrap( 153 Wrap(
  154 + crossAxisAlignment: WrapCrossAlignment.center,
153 // crossAxisAlignment: WrapCrossAlignment.start, 155 // crossAxisAlignment: WrapCrossAlignment.start,
154 // runAlignment: WrapAlignment.center, 156 // runAlignment: WrapAlignment.center,
155 // alignment: WrapAlignment.center, 157 // alignment: WrapAlignment.center,
@@ -182,6 +184,7 @@ class _MonthItemState extends State<MonthItem> { @@ -182,6 +184,7 @@ class _MonthItemState extends State<MonthItem> {
182 ), 184 ),
183 VEmptyView(12), 185 VEmptyView(12),
184 Wrap( 186 Wrap(
  187 + crossAxisAlignment: WrapCrossAlignment.center,
185 // crossAxisAlignment: WrapCrossAlignment.start, 188 // crossAxisAlignment: WrapCrossAlignment.start,
186 // runAlignment: WrapAlignment.center, 189 // runAlignment: WrapAlignment.center,
187 // alignment: WrapAlignment.center, 190 // alignment: WrapAlignment.center,
@@ -214,6 +217,7 @@ class _MonthItemState extends State<MonthItem> { @@ -214,6 +217,7 @@ class _MonthItemState extends State<MonthItem> {
214 ), 217 ),
215 VEmptyView(12), 218 VEmptyView(12),
216 Wrap( 219 Wrap(
  220 + crossAxisAlignment: WrapCrossAlignment.center,
217 // crossAxisAlignment: WrapCrossAlignment.start, 221 // crossAxisAlignment: WrapCrossAlignment.start,
218 // runAlignment: WrapAlignment.center, 222 // runAlignment: WrapAlignment.center,
219 // alignment: WrapAlignment.center, 223 // alignment: WrapAlignment.center,
@@ -290,6 +290,7 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -290,6 +290,7 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
290 padding: EdgeInsets.only( 290 padding: EdgeInsets.only(
291 left: w(20), right: w(20 + 72), bottom: w(12), top: w(12)), 291 left: w(20), right: w(20 + 72), bottom: w(12), top: w(12)),
292 child: Wrap( 292 child: Wrap(
  293 + crossAxisAlignment: WrapCrossAlignment.center,
293 children: [ 294 children: [
294 Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ 295 Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
295 Row( 296 Row(
@@ -468,6 +469,7 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -468,6 +469,7 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
468 ), 469 ),
469 VEmptyView(20), 470 VEmptyView(20),
470 Wrap( 471 Wrap(
  472 + crossAxisAlignment: WrapCrossAlignment.center,
471 children: [ 473 children: [
472 Text( 474 Text(
473 Utils.formatFromMill( 475 Utils.formatFromMill(
@@ -908,6 +908,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -908,6 +908,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
908 Padding( 908 Padding(
909 padding: EdgeInsets.only(left: w(10)), 909 padding: EdgeInsets.only(left: w(10)),
910 child: Wrap( 910 child: Wrap(
  911 + crossAxisAlignment: WrapCrossAlignment.center,
911 spacing: ScreenUtil().setWidth(20), 912 spacing: ScreenUtil().setWidth(20),
912 runSpacing: ScreenUtil().setWidth(20), 913 runSpacing: ScreenUtil().setWidth(20),
913 children: 914 children:
@@ -977,6 +978,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -977,6 +978,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
977 Padding( 978 Padding(
978 padding: EdgeInsets.only(left: w(10)), 979 padding: EdgeInsets.only(left: w(10)),
979 child: Wrap( 980 child: Wrap(
  981 + crossAxisAlignment: WrapCrossAlignment.center,
980 spacing: ScreenUtil().setWidth(20), 982 spacing: ScreenUtil().setWidth(20),
981 runSpacing: ScreenUtil().setWidth(20), 983 runSpacing: ScreenUtil().setWidth(20),
982 children: 984 children:
@@ -1194,6 +1196,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1194,6 +1196,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1194 _textWidget('或', MyColours.color_000000, FontWeight.normal, 24), 1196 _textWidget('或', MyColours.color_000000, FontWeight.normal, 24),
1195 HEmptyView(20), 1197 HEmptyView(20),
1196 Wrap( 1198 Wrap(
  1199 + crossAxisAlignment: WrapCrossAlignment.center,
1197 spacing: ScreenUtil().setWidth(20), 1200 spacing: ScreenUtil().setWidth(20),
1198 runSpacing: ScreenUtil().setWidth(20), 1201 runSpacing: ScreenUtil().setWidth(20),
1199 children: _buildFilterItem( 1202 children: _buildFilterItem(
@@ -134,6 +134,7 @@ class _MyCustomerOrderPageState extends State<MyCustomerOrderPage> { @@ -134,6 +134,7 @@ class _MyCustomerOrderPageState extends State<MyCustomerOrderPage> {
134 children: [ 134 children: [
135 VEmptyView(20), 135 VEmptyView(20),
136 Wrap( 136 Wrap(
  137 + crossAxisAlignment: WrapCrossAlignment.center,
137 children: [ 138 children: [
138 Text( 139 Text(
139 '全年累计', 140 '全年累计',
@@ -176,6 +177,7 @@ class _MyCustomerOrderPageState extends State<MyCustomerOrderPage> { @@ -176,6 +177,7 @@ class _MyCustomerOrderPageState extends State<MyCustomerOrderPage> {
176 ), 177 ),
177 VEmptyView(20), 178 VEmptyView(20),
178 Wrap( 179 Wrap(
  180 + crossAxisAlignment: WrapCrossAlignment.center,
179 children: [ 181 children: [
180 Text( 182 Text(
181 '记录全额订单：', 183 '记录全额订单：',
@@ -218,6 +220,7 @@ class _MyCustomerOrderPageState extends State<MyCustomerOrderPage> { @@ -218,6 +220,7 @@ class _MyCustomerOrderPageState extends State<MyCustomerOrderPage> {
218 ), 220 ),
219 VEmptyView(20), 221 VEmptyView(20),
220 Wrap( 222 Wrap(
  223 + crossAxisAlignment: WrapCrossAlignment.center,
221 children: [ 224 children: [
222 Text( 225 Text(
223 '总消费：', 226 '总消费：',
@@ -439,6 +439,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { @@ -439,6 +439,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> {
439 Padding( 439 Padding(
440 padding: EdgeInsets.only(left: w(10)), 440 padding: EdgeInsets.only(left: w(10)),
441 child: Wrap( 441 child: Wrap(
  442 + crossAxisAlignment: WrapCrossAlignment.center,
442 spacing: w(10), 443 spacing: w(10),
443 runSpacing: w(5), 444 runSpacing: w(5),
444 children: _templateUI(), 445 children: _templateUI(),
@@ -352,6 +352,7 @@ class _MyShowCustomerListPageState extends State<MyShowCustomerListPage> @@ -352,6 +352,7 @@ class _MyShowCustomerListPageState extends State<MyShowCustomerListPage>
352 ), 352 ),
353 VEmptyView(30), 353 VEmptyView(30),
354 Wrap( 354 Wrap(
  355 + crossAxisAlignment: WrapCrossAlignment.center,
355 spacing: ScreenUtil().setWidth(20), 356 spacing: ScreenUtil().setWidth(20),
356 runSpacing: ScreenUtil().setWidth(20), 357 runSpacing: ScreenUtil().setWidth(20),
357 children: _buildFilterItem([ 358 children: _buildFilterItem([
@@ -388,6 +389,7 @@ class _MyShowCustomerListPageState extends State<MyShowCustomerListPage> @@ -388,6 +389,7 @@ class _MyShowCustomerListPageState extends State<MyShowCustomerListPage>
388 ), 389 ),
389 VEmptyView(30), 390 VEmptyView(30),
390 Wrap( 391 Wrap(
  392 + crossAxisAlignment: WrapCrossAlignment.center,
391 spacing: ScreenUtil().setWidth(20), 393 spacing: ScreenUtil().setWidth(20),
392 runSpacing: ScreenUtil().setWidth(20), 394 runSpacing: ScreenUtil().setWidth(20),
393 children: _buildFilterItem([ 395 children: _buildFilterItem([
@@ -424,6 +426,7 @@ class _MyShowCustomerListPageState extends State<MyShowCustomerListPage> @@ -424,6 +426,7 @@ class _MyShowCustomerListPageState extends State<MyShowCustomerListPage>
424 ), 426 ),
425 VEmptyView(30), 427 VEmptyView(30),
426 Wrap( 428 Wrap(
  429 + crossAxisAlignment: WrapCrossAlignment.center,
427 spacing: ScreenUtil().setWidth(20), 430 spacing: ScreenUtil().setWidth(20),
428 runSpacing: ScreenUtil().setWidth(20), 431 runSpacing: ScreenUtil().setWidth(20),
429 children: _buildFilterItem([ 432 children: _buildFilterItem([
@@ -523,6 +526,7 @@ class _MyShowCustomerListPageState extends State<MyShowCustomerListPage> @@ -523,6 +526,7 @@ class _MyShowCustomerListPageState extends State<MyShowCustomerListPage>
523 ), 526 ),
524 VEmptyView(30), 527 VEmptyView(30),
525 Wrap( 528 Wrap(
  529 + crossAxisAlignment: WrapCrossAlignment.center,
526 spacing: ScreenUtil().setWidth(20), 530 spacing: ScreenUtil().setWidth(20),
527 runSpacing: ScreenUtil().setWidth(20), 531 runSpacing: ScreenUtil().setWidth(20),
528 children: _buildFilterItem([ 532 children: _buildFilterItem([
@@ -305,6 +305,7 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> { @@ -305,6 +305,7 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
305 padding: EdgeInsets.only( 305 padding: EdgeInsets.only(
306 left: w(20), right: w(20 + 72), bottom: w(12), top: w(12)), 306 left: w(20), right: w(20 + 72), bottom: w(12), top: w(12)),
307 child: Wrap( 307 child: Wrap(
  308 + crossAxisAlignment: WrapCrossAlignment.center,
308 children: [ 309 children: [
309 Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ 310 Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
310 Row( 311 Row(
@@ -479,6 +480,7 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> { @@ -479,6 +480,7 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
479 ), 480 ),
480 VEmptyView(20), 481 VEmptyView(20),
481 Wrap( 482 Wrap(
  483 + crossAxisAlignment: WrapCrossAlignment.center,
482 children: [ 484 children: [
483 Text( 485 Text(
484 Utils.formatFromMill( 486 Utils.formatFromMill(
@@ -1009,6 +1009,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1009,6 +1009,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1009 Padding( 1009 Padding(
1010 padding: EdgeInsets.only(left: w(10)), 1010 padding: EdgeInsets.only(left: w(10)),
1011 child: Wrap( 1011 child: Wrap(
  1012 + crossAxisAlignment: WrapCrossAlignment.center,
1012 spacing: ScreenUtil().setWidth(20), 1013 spacing: ScreenUtil().setWidth(20),
1013 runSpacing: ScreenUtil().setWidth(20), 1014 runSpacing: ScreenUtil().setWidth(20),
1014 children: 1015 children:
@@ -1066,6 +1067,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1066,6 +1067,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1066 child: Wrap( 1067 child: Wrap(
1067 spacing: ScreenUtil().setWidth(20), 1068 spacing: ScreenUtil().setWidth(20),
1068 runSpacing: ScreenUtil().setWidth(20), 1069 runSpacing: ScreenUtil().setWidth(20),
  1070 + crossAxisAlignment: WrapCrossAlignment.center,
1069 children: 1071 children:
1070 _buildFilterItem(customerProvider.filterHydList, false, 1072 _buildFilterItem(customerProvider.filterHydList, false,
1071 (FilterBtnModel item) { 1073 (FilterBtnModel item) {
@@ -1138,6 +1140,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1138,6 +1140,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1138 child: Wrap( 1140 child: Wrap(
1139 spacing: ScreenUtil().setWidth(20), 1141 spacing: ScreenUtil().setWidth(20),
1140 runSpacing: ScreenUtil().setWidth(20), 1142 runSpacing: ScreenUtil().setWidth(20),
  1143 + crossAxisAlignment: WrapCrossAlignment.center,
1141 children: 1144 children:
1142 _buildFilterItem(customerProvider.filterLabelList, false, 1145 _buildFilterItem(customerProvider.filterLabelList, false,
1143 (FilterBtnModel item) { 1146 (FilterBtnModel item) {
@@ -1353,6 +1356,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1353,6 +1356,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1353 Wrap( 1356 Wrap(
1354 spacing: ScreenUtil().setWidth(20), 1357 spacing: ScreenUtil().setWidth(20),
1355 runSpacing: ScreenUtil().setWidth(20), 1358 runSpacing: ScreenUtil().setWidth(20),
  1359 + crossAxisAlignment: WrapCrossAlignment.center,
1356 children: 1360 children:
1357 _buildFilterItem(customerProvider.filterDayList, false, 1361 _buildFilterItem(customerProvider.filterDayList, false,
1358 (FilterBtnModel item) { 1362 (FilterBtnModel item) {
@@ -134,6 +134,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> { @@ -134,6 +134,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> {
134 children: [ 134 children: [
135 VEmptyView(20), 135 VEmptyView(20),
136 Wrap( 136 Wrap(
  137 + crossAxisAlignment: WrapCrossAlignment.center,
137 children: [ 138 children: [
138 Text( 139 Text(
139 '全年累计', 140 '全年累计',
@@ -176,6 +177,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> { @@ -176,6 +177,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> {
176 ), 177 ),
177 VEmptyView(20), 178 VEmptyView(20),
178 Wrap( 179 Wrap(
  180 + crossAxisAlignment: WrapCrossAlignment.center,
179 children: [ 181 children: [
180 Text( 182 Text(
181 '记录全额订单：', 183 '记录全额订单：',
@@ -218,6 +220,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> { @@ -218,6 +220,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> {
218 ), 220 ),
219 VEmptyView(20), 221 VEmptyView(20),
220 Wrap( 222 Wrap(
  223 + crossAxisAlignment: WrapCrossAlignment.center,
221 children: [ 224 children: [
222 Text( 225 Text(
223 '总消费：', 226 '总消费：',
@@ -226,7 +229,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> { @@ -226,7 +229,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> {
226 color: MyColours.color_353535), 229 color: MyColours.color_353535),
227 ), 230 ),
228 Text( 231 Text(
229 - '${customerProvider.guestReserveSunModel.count.countMoney} ', 232 + '${customerProvider.guestReserveSunModel.count.countMoney ?? 0} ',
230 style: TextStyle( 233 style: TextStyle(
231 fontSize: ScreenUtil().setSp(24), 234 fontSize: ScreenUtil().setSp(24),
232 color: MyColours.color_353535), 235 color: MyColours.color_353535),
@@ -245,7 +248,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> { @@ -245,7 +248,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> {
245 color: MyColours.color_353535), 248 color: MyColours.color_353535),
246 ), 249 ),
247 Text( 250 Text(
248 - '${customerProvider.guestReserveSunModel.count.countPnum} ', 251 + '${customerProvider.guestReserveSunModel.count.countPnum ?? 0} ',
249 style: TextStyle( 252 style: TextStyle(
250 fontSize: ScreenUtil().setSp(24), 253 fontSize: ScreenUtil().setSp(24),
251 color: MyColours.color_353535), 254 color: MyColours.color_353535),
@@ -330,6 +330,7 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> { @@ -330,6 +330,7 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> {
330 child: Wrap( 330 child: Wrap(
331 spacing: ScreenUtil().setWidth(20), 331 spacing: ScreenUtil().setWidth(20),
332 runSpacing: ScreenUtil().setWidth(10), 332 runSpacing: ScreenUtil().setWidth(10),
  333 + crossAxisAlignment: WrapCrossAlignment.center,
333 children: _buildLabelItem(customerProvider.labelList))), 334 children: _buildLabelItem(customerProvider.labelList))),
334 Padding( 335 Padding(
335 padding: EdgeInsets.only(left: w(14), right: w(10)), 336 padding: EdgeInsets.only(left: w(14), right: w(10)),
@@ -220,6 +220,7 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> { @@ -220,6 +220,7 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
220 EdgeInsets.symmetric(horizontal: w(10)), 220 EdgeInsets.symmetric(horizontal: w(10)),
221 child: Wrap( 221 child: Wrap(
222 runSpacing: w(6), 222 runSpacing: w(6),
  223 + crossAxisAlignment: WrapCrossAlignment.center,
223 children: [ 224 children: [
224 if (dsoltListModel.nickName != null && 225 if (dsoltListModel.nickName != null &&
225 dsoltListModel.nickName != '') 226 dsoltListModel.nickName != '')
@@ -273,6 +274,7 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> { @@ -273,6 +274,7 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
273 horizontal: w(10)), 274 horizontal: w(10)),
274 child: Wrap( 275 child: Wrap(
275 runSpacing: w(6), 276 runSpacing: w(6),
  277 + crossAxisAlignment: WrapCrossAlignment.center,
276 children: [ 278 children: [
277 Text( 279 Text(
278 '${dsoltListModel.pnum ?? '0'}人', 280 '${dsoltListModel.pnum ?? '0'}人',
@@ -165,7 +165,8 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -165,7 +165,8 @@ class _DayOrderPageState extends State<DayOrderPage>
165 ), 165 ),
166 VEmptyView(20), 166 VEmptyView(20),
167 Wrap( 167 Wrap(
168 - crossAxisAlignment: WrapCrossAlignment.start, 168 + // crossAxisAlignment: WrapCrossAlignment.start,
  169 + crossAxisAlignment: WrapCrossAlignment.center,
169 runSpacing: w(5), 170 runSpacing: w(5),
170 children: [ 171 children: [
171 Text( 172 Text(
@@ -245,7 +246,8 @@ class _DayOrderPageState extends State<DayOrderPage> @@ -245,7 +246,8 @@ class _DayOrderPageState extends State<DayOrderPage>
245 VEmptyView(20), 246 VEmptyView(20),
246 Wrap( 247 Wrap(
247 runSpacing: w(6), 248 runSpacing: w(6),
248 - crossAxisAlignment: WrapCrossAlignment.start, 249 + // crossAxisAlignment: WrapCrossAlignment.start,
  250 + crossAxisAlignment: WrapCrossAlignment.center,
249 children: [ 251 children: [
250 Text( 252 Text(
251 '有金额订单数 ${widget.daylist.totalPrice}', 253 '有金额订单数 ${widget.daylist.totalPrice}',
@@ -496,6 +496,7 @@ class _ExportBookDataPageState extends State<ExportBookDataPage> { @@ -496,6 +496,7 @@ class _ExportBookDataPageState extends State<ExportBookDataPage> {
496 Wrap( 496 Wrap(
497 runSpacing: w(10), 497 runSpacing: w(10),
498 spacing: w(10), 498 spacing: w(10),
  499 + crossAxisAlignment: WrapCrossAlignment.center,
499 children: itemWidget(), 500 children: itemWidget(),
500 ), 501 ),
501 VEmptyView(30), 502 VEmptyView(30),
@@ -421,6 +421,7 @@ class _MakeMarkingPageState extends State<MakeMarkingPage> { @@ -421,6 +421,7 @@ class _MakeMarkingPageState extends State<MakeMarkingPage> {
421 child: Wrap( 421 child: Wrap(
422 spacing: w(10), 422 spacing: w(10),
423 runSpacing: w(5), 423 runSpacing: w(5),
  424 + crossAxisAlignment: WrapCrossAlignment.center,
424 children: _templateUI(), 425 children: _templateUI(),
425 ), 426 ),
426 ) 427 )
@@ -325,6 +325,7 @@ class _MarketingRecordsDetailPageState @@ -325,6 +325,7 @@ class _MarketingRecordsDetailPageState
325 child: Wrap( 325 child: Wrap(
326 spacing: ScreenUtil().setWidth(20), 326 spacing: ScreenUtil().setWidth(20),
327 runSpacing: ScreenUtil().setWidth(10), 327 runSpacing: ScreenUtil().setWidth(10),
  328 + crossAxisAlignment: WrapCrossAlignment.center,
328 children: _buildLabelItem( 329 children: _buildLabelItem(
329 model.marketingByIdSunModel.sellerUser))), 330 model.marketingByIdSunModel.sellerUser))),
330 ]))), 331 ]))),
@@ -386,6 +386,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> { @@ -386,6 +386,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
386 // crossAxisAlignment: WrapCrossAlignment.start, 386 // crossAxisAlignment: WrapCrossAlignment.start,
387 // runAlignment: WrapAlignment.center, 387 // runAlignment: WrapAlignment.center,
388 // alignment: WrapAlignment.center, 388 // alignment: WrapAlignment.center,
  389 + crossAxisAlignment: WrapCrossAlignment.center,
389 runSpacing: w(5), 390 runSpacing: w(5),
390 children: [ 391 children: [
391 Text( 392 Text(
@@ -353,6 +353,7 @@ class _ShowCustomerListPageState extends State<ShowCustomerListPage> @@ -353,6 +353,7 @@ class _ShowCustomerListPageState extends State<ShowCustomerListPage>
353 Wrap( 353 Wrap(
354 spacing: ScreenUtil().setWidth(20), 354 spacing: ScreenUtil().setWidth(20),
355 runSpacing: ScreenUtil().setWidth(20), 355 runSpacing: ScreenUtil().setWidth(20),
  356 + crossAxisAlignment: WrapCrossAlignment.center,
356 children: _buildFilterItem([ 357 children: _buildFilterItem([
357 {'title': 'kkkk', 'select': false}, 358 {'title': 'kkkk', 'select': false},
358 {'title': 'kkkk', 'select': true}, 359 {'title': 'kkkk', 'select': true},
@@ -389,6 +390,7 @@ class _ShowCustomerListPageState extends State<ShowCustomerListPage> @@ -389,6 +390,7 @@ class _ShowCustomerListPageState extends State<ShowCustomerListPage>
389 Wrap( 390 Wrap(
390 spacing: ScreenUtil().setWidth(20), 391 spacing: ScreenUtil().setWidth(20),
391 runSpacing: ScreenUtil().setWidth(20), 392 runSpacing: ScreenUtil().setWidth(20),
  393 + crossAxisAlignment: WrapCrossAlignment.center,
392 children: _buildFilterItem([ 394 children: _buildFilterItem([
393 {'title': 'kkkk', 'select': false}, 395 {'title': 'kkkk', 'select': false},
394 {'title': 'kkkk', 'select': true}, 396 {'title': 'kkkk', 'select': true},
@@ -425,6 +427,7 @@ class _ShowCustomerListPageState extends State<ShowCustomerListPage> @@ -425,6 +427,7 @@ class _ShowCustomerListPageState extends State<ShowCustomerListPage>
425 Wrap( 427 Wrap(
426 spacing: ScreenUtil().setWidth(20), 428 spacing: ScreenUtil().setWidth(20),
427 runSpacing: ScreenUtil().setWidth(20), 429 runSpacing: ScreenUtil().setWidth(20),
  430 + crossAxisAlignment: WrapCrossAlignment.center,
428 children: _buildFilterItem([ 431 children: _buildFilterItem([
429 {'title': 'kkkk', 'select': false}, 432 {'title': 'kkkk', 'select': false},
430 {'title': 'kkkk', 'select': true}, 433 {'title': 'kkkk', 'select': true},
@@ -524,6 +527,7 @@ class _ShowCustomerListPageState extends State<ShowCustomerListPage> @@ -524,6 +527,7 @@ class _ShowCustomerListPageState extends State<ShowCustomerListPage>
524 Wrap( 527 Wrap(
525 spacing: ScreenUtil().setWidth(20), 528 spacing: ScreenUtil().setWidth(20),
526 runSpacing: ScreenUtil().setWidth(20), 529 runSpacing: ScreenUtil().setWidth(20),
  530 + crossAxisAlignment: WrapCrossAlignment.center,
527 children: _buildFilterItem([ 531 children: _buildFilterItem([
528 {'title': '7天', 'select': true}, 532 {'title': '7天', 'select': true},
529 {'title': '30天', 'select': true}, 533 {'title': '30天', 'select': true},
@@ -529,6 +529,7 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> { @@ -529,6 +529,7 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
529 // runAlignment: WrapAlignment.center, 529 // runAlignment: WrapAlignment.center,
530 // alignment: WrapAlignment.center, 530 // alignment: WrapAlignment.center,
531 runSpacing: w(5), 531 runSpacing: w(5),
  532 + crossAxisAlignment: WrapCrossAlignment.center,
532 children: [ 533 children: [
533 Text( 534 Text(
534 '到店', 535 '到店',
@@ -621,6 +622,7 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> { @@ -621,6 +622,7 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
621 // crossAxisAlignment: WrapCrossAlignment.start, 622 // crossAxisAlignment: WrapCrossAlignment.start,
622 // runAlignment: WrapAlignment.center, 623 // runAlignment: WrapAlignment.center,
623 // alignment: WrapAlignment.center, 624 // alignment: WrapAlignment.center,
  625 + crossAxisAlignment: WrapCrossAlignment.center,
624 runSpacing: w(5), 626 runSpacing: w(5),
625 children: [ 627 children: [
626 Text( 628 Text(
@@ -367,6 +367,20 @@ class NotebookDetailModel extends ChangeNotifier { @@ -367,6 +367,20 @@ class NotebookDetailModel extends ChangeNotifier {
367 return false; 367 return false;
368 } 368 }
369 369
  370 + // 取消订单设置定金走向
  371 + setReserveDeposit(BuildContext context, Map<String, String> params) async {
  372 + BaseResp<dynamic> baseResp = await DioUtil()
  373 + .request<dynamic>(context, Method.get, HttpUrl.set_reserve_deposit,
  374 + data: params, showLoading: false)
  375 + .catchError((error) {
  376 + print(error.toString());
  377 + });
  378 + if (baseResp.code == Constant.status_success) {
  379 + } else {
  380 + Utils.showToast(baseResp.msg);
  381 + }
  382 + }
  383 +
370 //设置消息状态 384 //设置消息状态
371 setMessageStatus(BuildContext context, Map<String, String> params) async { 385 setMessageStatus(BuildContext context, Map<String, String> params) async {
372 BaseResp<dynamic> baseResp = await DioUtil() 386 BaseResp<dynamic> baseResp = await DioUtil()