xt / Flutter-ReserveApp · Commits

Go to a project

Commit 1809c4d03b0418af89245176819dd194ead67a43

Authored by weixin_45529955
1 parent a366ea84
build: skipped

纪念日OK

Inline Side-by-side
Showing 2 changed files with 51 additions and 36 deletions
1 -  
2 import 'package:common_utils/common_utils.dart'; 1 import 'package:common_utils/common_utils.dart';
3 import 'package:flutter/material.dart'; 2 import 'package:flutter/material.dart';
4 import 'package:flutter_native_contact_picker/flutter_native_contact_picker.dart'; 3 import 'package:flutter_native_contact_picker/flutter_native_contact_picker.dart';
@@ -135,8 +134,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -135,8 +134,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
135 .guestInfoSunModel!.guest!.attr == 134 .guestInfoSunModel!.guest!.attr ==
136 '沉睡' 135 '沉睡'
137 ? Color.fromRGBO(223, 33, 81, 1) 136 ? Color.fromRGBO(223, 33, 81, 1)
138 - : customerProvider  
139 - .guestInfoSunModel!.guest!.attr == 137 + : customerProvider.guestInfoSunModel!.guest!
  138 + .attr ==
140 '活跃' 139 '活跃'
141 ? Color.fromRGBO(81, 170, 94, 1) 140 ? Color.fromRGBO(81, 170, 94, 1)
142 : customerProvider.guestInfoSunModel! 141 : customerProvider.guestInfoSunModel!
@@ -183,7 +182,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -183,7 +182,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
183 EdgeInsets.only(bottom: ScreenUtil().setWidth(8)), 182 EdgeInsets.only(bottom: ScreenUtil().setWidth(8)),
184 alignment: Alignment.bottomLeft, 183 alignment: Alignment.bottomLeft,
185 child: Text( 184 child: Text(
186 - customerProvider.guestInfoSunModel!.guest!.sexStr != '' && 185 + customerProvider.guestInfoSunModel!.guest!.sexStr !=
  186 + '' &&
187 customerProvider 187 customerProvider
188 .guestInfoSunModel!.guest!.sexStr != 188 .guestInfoSunModel!.guest!.sexStr !=
189 null 189 null
@@ -283,7 +283,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -283,7 +283,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
283 ? MyColours.color_999999 283 ? MyColours.color_999999
284 : customerProvider.guestInfoSunModel!.guest!.attr == '活跃' 284 : customerProvider.guestInfoSunModel!.guest!.attr == '活跃'
285 ? MyColours.color_00715F 285 ? MyColours.color_00715F
286 - : customerProvider.guestInfoSunModel!.guest!.attr == '流失' 286 + : customerProvider.guestInfoSunModel!.guest!.attr ==
  287 + '流失'
287 ? MyColours.color_E34D59 288 ? MyColours.color_E34D59
288 : Color.fromRGBO(239, 143, 49, 1) 289 : Color.fromRGBO(239, 143, 49, 1)
289 : Colors.transparent, 290 : Colors.transparent,
@@ -406,21 +407,25 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -406,21 +407,25 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
406 Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ 407 Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
407 Row( 408 Row(
408 children: [ 409 children: [
409 - if (customerProvider.guestInfoSunModel!.guest!.rnameStr != '') 410 + if (customerProvider.guestInfoSunModel!.guest!.rnameStr !=
  411 + '')
410 Container( 412 Container(
411 constraints: BoxConstraints( 413 constraints: BoxConstraints(
412 maxWidth: ScreenUtil().setWidth(260)), 414 maxWidth: ScreenUtil().setWidth(260)),
413 child: Text( 415 child: Text(
414 - customerProvider.guestInfoSunModel!.guest!.rnameStr!, 416 + customerProvider
  417 + .guestInfoSunModel!.guest!.rnameStr!,
415 overflow: TextOverflow.ellipsis, 418 overflow: TextOverflow.ellipsis,
416 style: TextStyle( 419 style: TextStyle(
417 color: MyColours.color_515151, 420 color: MyColours.color_515151,
418 fontWeight: FontWeight.bold, 421 fontWeight: FontWeight.bold,
419 fontSize: ScreenUtil().setSp(36)), 422 fontSize: ScreenUtil().setSp(36)),
420 )), 423 )),
421 - if (customerProvider.guestInfoSunModel!.guest!.rnameStr != '') 424 + if (customerProvider.guestInfoSunModel!.guest!.rnameStr !=
  425 + '')
422 HEmptyView(10), 426 HEmptyView(10),
423 - if (customerProvider.guestInfoSunModel!.guest!.rnameStr != '') 427 + if (customerProvider.guestInfoSunModel!.guest!.rnameStr !=
  428 + '')
424 Container( 429 Container(
425 child: Text( 430 child: Text(
426 customerProvider.guestInfoSunModel!.guest!.sexStr != '' 431 customerProvider.guestInfoSunModel!.guest!.sexStr != ''
@@ -432,7 +437,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -432,7 +437,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
432 fontSize: ScreenUtil().setSp(20), 437 fontSize: ScreenUtil().setSp(20),
433 ), 438 ),
434 )), 439 )),
435 - if (customerProvider.guestInfoSunModel!.guest!.rnameStr != '') 440 + if (customerProvider.guestInfoSunModel!.guest!.rnameStr !=
  441 + '')
436 HEmptyView(6), 442 HEmptyView(6),
437 Text( 443 Text(
438 customerProvider.guestInfoSunModel!.guest!.phone!, 444 customerProvider.guestInfoSunModel!.guest!.phone!,
@@ -590,8 +596,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -590,8 +596,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
590 Text( 596 Text(
591 customerProvider.guestInfoSunModel!.last?.ddate == null 597 customerProvider.guestInfoSunModel!.last?.ddate == null
592 ? '' 598 ? ''
593 - : Utils.formatFromMill(  
594 - (customerProvider.guestInfoSunModel!.last?.ddate)!), 599 + : Utils.formatFromMill((customerProvider
  600 + .guestInfoSunModel!.last?.ddate)!),
595 overflow: TextOverflow.ellipsis, 601 overflow: TextOverflow.ellipsis,
596 style: TextStyle( 602 style: TextStyle(
597 fontSize: ScreenUtil().setSp(20), 603 fontSize: ScreenUtil().setSp(20),
@@ -624,9 +630,11 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -624,9 +630,11 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
624 color: MyColours.color_515151), 630 color: MyColours.color_515151),
625 ), 631 ),
626 Text( 632 Text(
627 - customerProvider.guestInfoSunModel!.last!.actualPum == null 633 + customerProvider.guestInfoSunModel!.last!.actualPum ==
  634 + null
628 ? '未记录' 635 ? '未记录'
629 - : customerProvider.guestInfoSunModel!.last!.actualPum!, 636 + : customerProvider
  637 + .guestInfoSunModel!.last!.actualPum!,
630 style: TextStyle( 638 style: TextStyle(
631 fontSize: ScreenUtil().setSp(20), 639 fontSize: ScreenUtil().setSp(20),
632 color: MyColours.color_438E93), 640 color: MyColours.color_438E93),
@@ -742,8 +750,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -742,8 +750,8 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
742 isBold: true, 750 isBold: true,
743 height: w(22), 751 height: w(22),
744 onPressed: () { 752 onPressed: () {
745 - NavigatorUtil.goWineDetailPage(  
746 - context, customerProvider.guestInfoSunModel!.store!.id, 753 + NavigatorUtil.goWineDetailPage(context,
  754 + customerProvider.guestInfoSunModel!.store!.id,
747 onlyShow: true); 755 onlyShow: true);
748 }, 756 },
749 ) 757 )
@@ -1066,12 +1074,12 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -1066,12 +1074,12 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
1066 ), 1074 ),
1067 ListView.builder( 1075 ListView.builder(
1068 shrinkWrap: true, 1076 shrinkWrap: true,
1069 - itemCount:  
1070 - customerProvider.guestInfoSunModel!.guest!.cDay !=  
1071 - null  
1072 - ? customerProvider  
1073 - .guestInfoSunModel!.guest!.cDay!.length  
1074 - : 0, 1077 + itemCount: customerProvider
  1078 + .guestInfoSunModel!.guest!.cDay !=
  1079 + null
  1080 + ? customerProvider
  1081 + .guestInfoSunModel!.guest!.cDay!.length
  1082 + : 0,
1075 controller: controller, 1083 controller: controller,
1076 itemBuilder: (BuildContext context, int index) { 1084 itemBuilder: (BuildContext context, int index) {
1077 Cday cday = customerProvider 1085 Cday cday = customerProvider
@@ -1105,17 +1113,26 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -1105,17 +1113,26 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
1105 (cday.type == '1' ? '(公历)' : '(农历)'); 1113 (cday.type == '1' ? '(公历)' : '(农历)');
1106 } 1114 }
1107 } 1115 }
1108 - return Center(  
1109 - child: Padding(  
1110 - padding: EdgeInsets.symmetric(  
1111 - vertical: ScreenUtil().setWidth(10)),  
1112 - child: Text(  
1113 - show!,  
1114 - style: TextStyle(  
1115 - fontSize: ScreenUtil().setSp(26),  
1116 - color: MyColours.color_333333),  
1117 - ),  
1118 - )); 1116 + return Padding(
  1117 + padding: EdgeInsets.only(top: w(12)),
  1118 + child: Row(
  1119 + mainAxisAlignment:
  1120 + MainAxisAlignment.spaceBetween,
  1121 + children: [
  1122 + Text(
  1123 + cday.desc ?? '',
  1124 + style: TextStyle(
  1125 + fontSize: font(16),
  1126 + color: MyColours.color_438E93),
  1127 + ),
  1128 + Text(
  1129 + show ?? '',
  1130 + style: TextStyle(
  1131 + fontSize: font(14),
  1132 + color: MyColours.color_000000),
  1133 + ),
  1134 + ],
  1135 + ));
1119 }, 1136 },
1120 ) 1137 )
1121 ])), 1138 ])),
@@ -251,9 +251,7 @@ class _MyFestivalEditPageState extends State<MyFestivalEditPage> { @@ -251,9 +251,7 @@ class _MyFestivalEditPageState extends State<MyFestivalEditPage> {
251 title: "", 251 title: "",
252 content: "是否删除该纪念日", 252 content: "是否删除该纪念日",
253 rTitle: "删除", rCallback: () { 253 rTitle: "删除", rCallback: () {
254 - if (Navigator.canPop(context)) {  
255 - Navigator.pop(context);  
256 - } 254 +
257 _delGuestInfocDay(model.cday![index].id); 255 _delGuestInfocDay(model.cday![index].id);
258 }); 256 });
259 }, onTapEdit: () { 257 }, onTapEdit: () {