xt / Flutter-ReserveApp · Commits

Go to a project

Commit fe8ecc4007e5138dedeaca9f5e4a2fc07573b62e

Authored by wdn127929
1 parent 8d552c2f
build: skipped

创建营销任务页面键盘点击空白处回弹、桌位页面返回导航栏、选中用户后标签bug

Inline Side-by-side
Showing 10 changed files with 398 additions and 302 deletions
@@ -12,14 +12,14 @@ if (flutterRoot == null) { @@ -12,14 +12,14 @@ if (flutterRoot == null) {
12 } 12 }
13 13
14 14
15 -def flutterVersionCode = "325" 15 +def flutterVersionCode = "331"
16 if (flutterVersionCode == null) { 16 if (flutterVersionCode == null) {
17 - flutterVersionCode = '325' 17 + flutterVersionCode = '331'
18 } 18 }
19 19
20 -def flutterVersionName = "3.2.5" 20 +def flutterVersionName = "3.3.1"
21 if (flutterVersionName == null) { 21 if (flutterVersionName == null) {
22 - flutterVersionName = '3.2.5' 22 + flutterVersionName = '3.3.1'
23 } 23 }
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
25 apply plugin: 'kotlin-android' 25 apply plugin: 'kotlin-android'
@@ -487,7 +487,7 @@ @@ -487,7 +487,7 @@
487 CODE_SIGN_IDENTITY = "iPhone Developer"; 487 CODE_SIGN_IDENTITY = "iPhone Developer";
488 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 488 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
489 CODE_SIGN_STYLE = Automatic; 489 CODE_SIGN_STYLE = Automatic;
490 - CURRENT_PROJECT_VERSION = 317; 490 + CURRENT_PROJECT_VERSION = 325;
491 DEVELOPMENT_TEAM = 8J59HM8B82; 491 DEVELOPMENT_TEAM = 8J59HM8B82;
492 ENABLE_BITCODE = NO; 492 ENABLE_BITCODE = NO;
493 FLUTTER_BUILD_MODE = release; 493 FLUTTER_BUILD_MODE = release;
@@ -502,7 +502,7 @@ @@ -502,7 +502,7 @@
502 "$(inherited)", 502 "$(inherited)",
503 "$(PROJECT_DIR)/Flutter", 503 "$(PROJECT_DIR)/Flutter",
504 ); 504 );
505 - MARKETING_VERSION = 3.1.7; 505 + MARKETING_VERSION = 3.3.0;
506 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 506 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
507 PRODUCT_NAME = Runner; 507 PRODUCT_NAME = Runner;
508 PROVISIONING_PROFILE_SPECIFIER = ""; 508 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -632,10 +632,10 @@ @@ -632,10 +632,10 @@
632 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 632 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
633 CODE_SIGN_IDENTITY = "iPhone Developer"; 633 CODE_SIGN_IDENTITY = "iPhone Developer";
634 CODE_SIGN_STYLE = Automatic; 634 CODE_SIGN_STYLE = Automatic;
635 - CURRENT_PROJECT_VERSION = 317; 635 + CURRENT_PROJECT_VERSION = 325;
636 DEVELOPMENT_TEAM = 8J59HM8B82; 636 DEVELOPMENT_TEAM = 8J59HM8B82;
637 ENABLE_BITCODE = NO; 637 ENABLE_BITCODE = NO;
638 - FLUTTER_BUILD_MODE = debug; 638 + FLUTTER_BUILD_MODE = release;
639 FRAMEWORK_SEARCH_PATHS = ( 639 FRAMEWORK_SEARCH_PATHS = (
640 "$(inherited)", 640 "$(inherited)",
641 "$(PROJECT_DIR)/Flutter", 641 "$(PROJECT_DIR)/Flutter",
@@ -647,7 +647,7 @@ @@ -647,7 +647,7 @@
647 "$(inherited)", 647 "$(inherited)",
648 "$(PROJECT_DIR)/Flutter", 648 "$(PROJECT_DIR)/Flutter",
649 ); 649 );
650 - MARKETING_VERSION = 3.1.7; 650 + MARKETING_VERSION = 3.3.0;
651 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 651 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
652 PRODUCT_NAME = Runner; 652 PRODUCT_NAME = Runner;
653 PROVISIONING_PROFILE_SPECIFIER = ""; 653 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -667,7 +667,7 @@ @@ -667,7 +667,7 @@
667 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 667 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
668 CODE_SIGN_IDENTITY = "iPhone Developer"; 668 CODE_SIGN_IDENTITY = "iPhone Developer";
669 CODE_SIGN_STYLE = Automatic; 669 CODE_SIGN_STYLE = Automatic;
670 - CURRENT_PROJECT_VERSION = 317; 670 + CURRENT_PROJECT_VERSION = 325;
671 DEVELOPMENT_TEAM = 8J59HM8B82; 671 DEVELOPMENT_TEAM = 8J59HM8B82;
672 ENABLE_BITCODE = NO; 672 ENABLE_BITCODE = NO;
673 FLUTTER_BUILD_MODE = release; 673 FLUTTER_BUILD_MODE = release;
@@ -682,7 +682,7 @@ @@ -682,7 +682,7 @@
682 "$(inherited)", 682 "$(inherited)",
683 "$(PROJECT_DIR)/Flutter", 683 "$(PROJECT_DIR)/Flutter",
684 ); 684 );
685 - MARKETING_VERSION = 3.1.7; 685 + MARKETING_VERSION = 3.3.0;
686 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 686 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
687 PRODUCT_NAME = Runner; 687 PRODUCT_NAME = Runner;
688 PROVISIONING_PROFILE_SPECIFIER = ""; 688 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -52,6 +52,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -52,6 +52,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
52 int dropValue = 0; 52 int dropValue = 0;
53 bool showDrop = true; 53 bool showDrop = true;
54 List<String> timeTilte = ['等于', '小于', '大于']; 54 List<String> timeTilte = ['等于', '小于', '大于'];
  55 + int filterHydIndex = 0;
55 56
56 @override 57 @override
57 void initState() { 58 void initState() {
@@ -79,7 +80,8 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -79,7 +80,8 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
79 } else if (customerProvider.index == 0) { 80 } else if (customerProvider.index == 0) {
80 customerProvider.hydSelAll = true; 81 customerProvider.hydSelAll = true;
81 for (FilterBtnModel item in customerProvider.filterHydList) { 82 for (FilterBtnModel item in customerProvider.filterHydList) {
82 - item.select = true; 83 + // item.select = true;
  84 + item.select = false;
83 } 85 }
84 } 86 }
85 _getContantData(); 87 _getContantData();
@@ -88,7 +90,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -88,7 +90,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
88 WidgetsBinding.instance.addPostFrameCallback((_) async { 90 WidgetsBinding.instance.addPostFrameCallback((_) async {
89 bool first = true; 91 bool first = true;
90 customerProvider.index = tabController.index; 92 customerProvider.index = tabController.index;
91 - if (widget.fromPage == FromPage.FromPageMakeRecord ) { 93 + if (widget.fromPage == FromPage.FromPageMakeRecord) {
92 customerProvider.selectCustomer = customerMakingProvider.selectCustomer; 94 customerProvider.selectCustomer = customerMakingProvider.selectCustomer;
93 customerProvider.labels = customerMakingProvider.labels; 95 customerProvider.labels = customerMakingProvider.labels;
94 first = false; 96 first = false;
@@ -97,7 +99,8 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -97,7 +99,8 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
97 if (tabController.index == 0) { 99 if (tabController.index == 0) {
98 customerProvider.hydSelAll = true; 100 customerProvider.hydSelAll = true;
99 for (FilterBtnModel item in customerProvider.filterHydList) { 101 for (FilterBtnModel item in customerProvider.filterHydList) {
100 - item.select = true; 102 + // item.select = true;
  103 + item.select = false;
101 } 104 }
102 } 105 }
103 _getContantData(first: first); 106 _getContantData(first: first);
@@ -513,6 +516,21 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -513,6 +516,21 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
513 }); 516 });
514 }, onPressedComplete: () { 517 }, onPressedComplete: () {
515 Navigator.of(context).pop(); 518 Navigator.of(context).pop();
  519 + for (FilterBtnModel value
  520 + in customerProvider.filterHydList) {
  521 + if (value.select) {
  522 + if (value.title == '活跃') {
  523 + tabController.index = 1;
  524 + customerProvider.index = 1;
  525 + } else if (value.title == '沉睡') {
  526 + tabController.index = 2;
  527 + customerProvider.index = 2;
  528 + } else if (value.title == '流失') {
  529 + tabController.index = 3;
  530 + customerProvider.index = 3;
  531 + }
  532 + }
  533 + }
516 setState(() { 534 setState(() {
517 showFilter = false; 535 showFilter = false;
518 }); 536 });
@@ -634,34 +652,34 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -634,34 +652,34 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
634 crossAxisAlignment: CrossAxisAlignment.start, 652 crossAxisAlignment: CrossAxisAlignment.start,
635 children: [ 653 children: [
636 Row( 654 Row(
637 - mainAxisAlignment: MainAxisAlignment.spaceBetween, 655 + // mainAxisAlignment: MainAxisAlignment.spaceBetween,
638 children: [ 656 children: [
639 _textWidget('活跃度', MyColours.color_333333, FontWeight.bold, 28), 657 _textWidget('活跃度', MyColours.color_333333, FontWeight.bold, 28),
640 - GestureDetector(  
641 - onTap: () {  
642 - state(() {  
643 - customerProvider.hydSelAll = !customerProvider.hydSelAll;  
644 - if (customerProvider.hydSelAll) {  
645 - for (FilterBtnModel item  
646 - in customerProvider.filterHydList) {  
647 - item.select = true;  
648 - }  
649 - } else {  
650 - for (FilterBtnModel item  
651 - in customerProvider.filterHydList) {  
652 - item.select = false;  
653 - }  
654 - }  
655 - });  
656 - },  
657 - child: Container(  
658 - color: Colors.white,  
659 - height: ScreenUtil().setWidth(40),  
660 - alignment: Alignment.center,  
661 - padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),  
662 - child: _textWidget(customerProvider.hydSelAll ? '全不选' : '全选',  
663 - MyColours.color_199095, FontWeight.normal, 24)),  
664 - ) 658 + // GestureDetector(
  659 + // onTap: () {
  660 + // state(() {
  661 + // customerProvider.hydSelAll = !customerProvider.hydSelAll;
  662 + // if (customerProvider.hydSelAll) {
  663 + // for (FilterBtnModel item
  664 + // in customerProvider.filterHydList) {
  665 + // item.select = true;
  666 + // }
  667 + // } else {
  668 + // for (FilterBtnModel item
  669 + // in customerProvider.filterHydList) {
  670 + // item.select = false;
  671 + // }
  672 + // }
  673 + // });
  674 + // },
  675 + // child: Container(
  676 + // color: Colors.white,
  677 + // height: ScreenUtil().setWidth(40),
  678 + // alignment: Alignment.center,
  679 + // padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
  680 + // child: _textWidget(customerProvider.hydSelAll ? '全不选' : '全选',
  681 + // MyColours.color_199095, FontWeight.normal, 24)),
  682 + // )
665 ], 683 ],
666 ), 684 ),
667 VEmptyView(30), 685 VEmptyView(30),
@@ -670,9 +688,21 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -670,9 +688,21 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
670 runSpacing: ScreenUtil().setWidth(20), 688 runSpacing: ScreenUtil().setWidth(20),
671 children: _buildFilterItem(customerProvider.filterHydList, false, 689 children: _buildFilterItem(customerProvider.filterHydList, false,
672 (FilterBtnModel item) { 690 (FilterBtnModel item) {
673 - state(() {  
674 - item.select = !item.select;  
675 - }); 691 + // state(() {
  692 + // item.select = !item.select;
  693 +
  694 + // }
  695 + // });
  696 + for (FilterBtnModel value in customerProvider.filterHydList) {
  697 + value.select = false;
  698 + }
  699 + for (FilterBtnModel value in customerProvider.filterHydList) {
  700 + if (item.id == value.id) {
  701 + state(() {
  702 + value.select = true;
  703 + });
  704 + }
  705 + }
676 })), 706 })),
677 ], 707 ],
678 ); 708 );
@@ -84,7 +84,7 @@ class _MyCustomerPageState extends State<MyCustomerPage> { @@ -84,7 +84,7 @@ class _MyCustomerPageState extends State<MyCustomerPage> {
84 Map<String, String> params = { 84 Map<String, String> params = {
85 "uid": Provider.of<UserModel>(context, listen: false).user.openid 85 "uid": Provider.of<UserModel>(context, listen: false).user.openid
86 }; 86 };
87 - await customerProvider.getMarketingByUid(context, params); 87 + // await customerProvider.getMarketingByUid(context, params);
88 88
89 MarketingByUidsSunModel myRecordData = 89 MarketingByUidsSunModel myRecordData =
90 await customerProvider.getMarketingByUid(context, params); 90 await customerProvider.getMarketingByUid(context, params);
@@ -438,7 +438,12 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { @@ -438,7 +438,12 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> {
438 customerProvider = Provider.of<CustomerProvider>(context, listen: true); 438 customerProvider = Provider.of<CustomerProvider>(context, listen: true);
439 customerMakingProvider = 439 customerMakingProvider =
440 Provider.of<CustomerMakingProvider>(context, listen: true); 440 Provider.of<CustomerMakingProvider>(context, listen: true);
441 - return Scaffold( 441 + return Material(
  442 + child: InkWell(
  443 + onTap: () {
  444 + FocusScope.of(context).requestFocus(new FocusNode());
  445 + },
  446 + child:Scaffold(
442 backgroundColor: Color.fromRGBO(246, 248, 250, 1), 447 backgroundColor: Color.fromRGBO(246, 248, 250, 1),
443 key: scaffoldKey, 448 key: scaffoldKey,
444 appBar: SystemAppBar( 449 appBar: SystemAppBar(
@@ -560,7 +565,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { @@ -560,7 +565,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> {
560 ), 565 ),
561 VEmptyView(40), 566 VEmptyView(40),
562 ], 567 ],
563 - ),  
564 - ); 568 + )),
  569 + ));
565 } 570 }
566 } 571 }
@@ -481,103 +481,108 @@ class _MyMakeMarkingPageOnlyShowState extends State<MyMakeMarkingPageOnlyShow> @@ -481,103 +481,108 @@ class _MyMakeMarkingPageOnlyShowState extends State<MyMakeMarkingPageOnlyShow>
481 customerProvider = Provider.of<CustomerProvider>(context, listen: true); 481 customerProvider = Provider.of<CustomerProvider>(context, listen: true);
482 customerMakingProvider = 482 customerMakingProvider =
483 Provider.of<CustomerMakingProvider>(context, listen: true); 483 Provider.of<CustomerMakingProvider>(context, listen: true);
484 - return Scaffold(  
485 - backgroundColor: Color.fromRGBO(246, 248, 250, 1),  
486 - key: scaffoldKey,  
487 - appBar: SystemAppBar(  
488 - '创建营销任务',  
489 - onTap: () {  
490 - customerMakingProvider.clearData();  
491 - Navigator.pop(context);  
492 - },  
493 - ),  
494 - body: Column(  
495 - children: [  
496 - Expanded(  
497 - child: SingleChildScrollView(  
498 - child: Column(  
499 - children: [  
500 - VEmptyView(10),  
501 - Container(  
502 - color: MyColours.color_199095,  
503 - padding: EdgeInsets.symmetric(  
504 - horizontal: ScreenUtil().setWidth(30),  
505 - vertical: ScreenUtil().setWidth(30)),  
506 - child: Row(  
507 - children: [  
508 - Expanded(  
509 - child: Text(  
510 - '已选[全店任务]${widget.sellerList.guestCount}位顾客',  
511 - style: TextStyle(  
512 - color: MyColours.color_ffffff,  
513 - fontSize: ScreenUtil().setSp(32)),  
514 - )),  
515 - HEmptyView(10),  
516 - InkWell(  
517 - onTap: () {  
518 - needClear = false;  
519 - NavigatorUtil.goMyShowCustomerListPage(  
520 - context,  
521 - FromPage.FromPageMakeRecordDetail,  
522 - widget.sellerList.gid);  
523 - // NavigatorUtil.goMarketingRecordsDetailPage(context);  
524 - },  
525 - child: Text('仅查看',  
526 - style: TextStyle(  
527 - decoration: TextDecoration.underline,  
528 - color: MyColours.color_ffffff,  
529 - fontSize: ScreenUtil().setSp(26)))),  
530 - ],  
531 - ),  
532 - ),  
533 - Padding(  
534 - padding: EdgeInsets.symmetric(  
535 - horizontal: ScreenUtil().setWidth(30),  
536 - ),  
537 - child: Column(  
538 - children: [VEmptyView(50), _contentWidget('输入营销短信内容')],  
539 - ),  
540 - )  
541 - ],  
542 - ),  
543 - )),  
544 - RoundButton(  
545 - text: '群发短信',  
546 - gradientStart: MyColours.color_199095,  
547 - gradientEnd: MyColours.color_199095,  
548 - // borderColor: MyColours.color_999999,  
549 - radius: ScreenUtil().setWidth(40),  
550 - height: ScreenUtil().setWidth(80),  
551 - fontSize: 26,  
552 - margin:  
553 - EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(230)),  
554 - isBold: false,  
555 - onPressed: () {  
556 - //群发短信  
557 - _setMarketingStatusByUid();  
558 - },  
559 - ),  
560 - VEmptyView(30),  
561 - RoundButton(  
562 - text: '取消',  
563 - gradientStart: MyColours.color_ffffff,  
564 - gradientEnd: MyColours.color_ffffff,  
565 - textColor: MyColours.color_199095,  
566 - borderColor: MyColours.color_199095,  
567 - radius: ScreenUtil().setWidth(40),  
568 - height: ScreenUtil().setWidth(80),  
569 - fontSize: 26,  
570 - margin:  
571 - EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(230)),  
572 - isBold: false,  
573 - onPressed: () { 484 + return Material(
  485 + child: InkWell(
  486 + onTap: () {
  487 + FocusScope.of(context).requestFocus(new FocusNode());
  488 + },
  489 + child: Scaffold(
  490 + backgroundColor: Color.fromRGBO(246, 248, 250, 1),
  491 + key: scaffoldKey,
  492 + appBar: SystemAppBar(
  493 + '创建营销任务',
  494 + onTap: () {
574 customerMakingProvider.clearData(); 495 customerMakingProvider.clearData();
575 Navigator.pop(context); 496 Navigator.pop(context);
576 }, 497 },
577 ), 498 ),
578 - VEmptyView(40),  
579 - ],  
580 - ),  
581 - ); 499 + body: Column(
  500 + children: [
  501 + Expanded(
  502 + child: SingleChildScrollView(
  503 + child: Column(
  504 + children: [
  505 + VEmptyView(10),
  506 + Container(
  507 + color: MyColours.color_199095,
  508 + padding: EdgeInsets.symmetric(
  509 + horizontal: ScreenUtil().setWidth(30),
  510 + vertical: ScreenUtil().setWidth(30)),
  511 + child: Row(
  512 + children: [
  513 + Expanded(
  514 + child: Text(
  515 + '已选[全店任务]${widget.sellerList.guestCount}位顾客',
  516 + style: TextStyle(
  517 + color: MyColours.color_ffffff,
  518 + fontSize: ScreenUtil().setSp(32)),
  519 + )),
  520 + HEmptyView(10),
  521 + InkWell(
  522 + onTap: () {
  523 + needClear = false;
  524 + NavigatorUtil.goMyShowCustomerListPage(
  525 + context,
  526 + FromPage.FromPageMakeRecordDetail,
  527 + widget.sellerList.gid);
  528 + // NavigatorUtil.goMarketingRecordsDetailPage(context);
  529 + },
  530 + child: Text('仅查看',
  531 + style: TextStyle(
  532 + decoration: TextDecoration.underline,
  533 + color: MyColours.color_ffffff,
  534 + fontSize: ScreenUtil().setSp(26)))),
  535 + ],
  536 + ),
  537 + ),
  538 + Padding(
  539 + padding: EdgeInsets.symmetric(
  540 + horizontal: ScreenUtil().setWidth(30),
  541 + ),
  542 + child: Column(
  543 + children: [VEmptyView(50), _contentWidget('输入营销短信内容')],
  544 + ),
  545 + )
  546 + ],
  547 + ),
  548 + )),
  549 + RoundButton(
  550 + text: '群发短信',
  551 + gradientStart: MyColours.color_199095,
  552 + gradientEnd: MyColours.color_199095,
  553 + // borderColor: MyColours.color_999999,
  554 + radius: ScreenUtil().setWidth(40),
  555 + height: ScreenUtil().setWidth(80),
  556 + fontSize: 26,
  557 + margin: EdgeInsets.symmetric(
  558 + horizontal: ScreenUtil().setWidth(230)),
  559 + isBold: false,
  560 + onPressed: () {
  561 + //群发短信
  562 + _setMarketingStatusByUid();
  563 + },
  564 + ),
  565 + VEmptyView(30),
  566 + RoundButton(
  567 + text: '取消',
  568 + gradientStart: MyColours.color_ffffff,
  569 + gradientEnd: MyColours.color_ffffff,
  570 + textColor: MyColours.color_199095,
  571 + borderColor: MyColours.color_199095,
  572 + radius: ScreenUtil().setWidth(40),
  573 + height: ScreenUtil().setWidth(80),
  574 + fontSize: 26,
  575 + margin: EdgeInsets.symmetric(
  576 + horizontal: ScreenUtil().setWidth(230)),
  577 + isBold: false,
  578 + onPressed: () {
  579 + customerMakingProvider.clearData();
  580 + Navigator.pop(context);
  581 + },
  582 + ),
  583 + VEmptyView(40),
  584 + ],
  585 + )),
  586 + ));
582 } 587 }
583 } 588 }
@@ -80,7 +80,8 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -80,7 +80,8 @@ class _CustomerListPageState extends State<CustomerListPage>
80 } else if (customerProvider.index == 0) { 80 } else if (customerProvider.index == 0) {
81 customerProvider.hydSelAll = true; 81 customerProvider.hydSelAll = true;
82 for (FilterBtnModel item in customerProvider.filterHydList) { 82 for (FilterBtnModel item in customerProvider.filterHydList) {
83 - item.select = true; 83 + // item.select = true;
  84 + item.select = false;
84 } 85 }
85 } 86 }
86 _getContantData(); 87 _getContantData();
@@ -101,7 +102,8 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -101,7 +102,8 @@ class _CustomerListPageState extends State<CustomerListPage>
101 if (tabController.index == 0) { 102 if (tabController.index == 0) {
102 customerProvider.hydSelAll = true; 103 customerProvider.hydSelAll = true;
103 for (FilterBtnModel item in customerProvider.filterHydList) { 104 for (FilterBtnModel item in customerProvider.filterHydList) {
104 - item.select = true; 105 + // item.select = true;
  106 + item.select = false;
105 } 107 }
106 } 108 }
107 _getContantData(first: first); 109 _getContantData(first: first);
@@ -569,6 +571,21 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -569,6 +571,21 @@ class _CustomerListPageState extends State<CustomerListPage>
569 }); 571 });
570 }, onPressedComplete: () { 572 }, onPressedComplete: () {
571 Navigator.of(context).pop(); 573 Navigator.of(context).pop();
  574 + for (FilterBtnModel value
  575 + in customerProvider.filterHydList) {
  576 + if (value.select) {
  577 + if (value.title == '活跃') {
  578 + tabController.index = 1;
  579 + customerProvider.index = 1;
  580 + } else if (value.title == '沉睡') {
  581 + tabController.index = 2;
  582 + customerProvider.index = 2;
  583 + } else if (value.title == '流失') {
  584 + tabController.index = 3;
  585 + customerProvider.index = 3;
  586 + }
  587 + }
  588 + }
572 setState(() { 589 setState(() {
573 showFilter = false; 590 showFilter = false;
574 }); 591 });
@@ -711,31 +728,31 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -711,31 +728,31 @@ class _CustomerListPageState extends State<CustomerListPage>
711 mainAxisAlignment: MainAxisAlignment.spaceBetween, 728 mainAxisAlignment: MainAxisAlignment.spaceBetween,
712 children: [ 729 children: [
713 _textWidget('活跃度', MyColours.color_333333, FontWeight.bold, 28), 730 _textWidget('活跃度', MyColours.color_333333, FontWeight.bold, 28),
714 - GestureDetector(  
715 - onTap: () {  
716 - state(() {  
717 - customerProvider.hydSelAll = !customerProvider.hydSelAll;  
718 - if (customerProvider.hydSelAll) {  
719 - for (FilterBtnModel item  
720 - in customerProvider.filterHydList) {  
721 - item.select = true;  
722 - }  
723 - } else {  
724 - for (FilterBtnModel item  
725 - in customerProvider.filterHydList) {  
726 - item.select = false;  
727 - }  
728 - }  
729 - });  
730 - },  
731 - child: Container(  
732 - color: Colors.white,  
733 - height: ScreenUtil().setWidth(40),  
734 - alignment: Alignment.center,  
735 - padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),  
736 - child: _textWidget(customerProvider.hydSelAll ? '全不选' : '全选',  
737 - MyColours.color_199095, FontWeight.normal, 24)),  
738 - ) 731 + // GestureDetector(
  732 + // onTap: () {
  733 + // state(() {
  734 + // customerProvider.hydSelAll = !customerProvider.hydSelAll;
  735 + // if (customerProvider.hydSelAll) {
  736 + // for (FilterBtnModel item
  737 + // in customerProvider.filterHydList) {
  738 + // item.select = true;
  739 + // }
  740 + // } else {
  741 + // for (FilterBtnModel item
  742 + // in customerProvider.filterHydList) {
  743 + // item.select = false;
  744 + // }
  745 + // }
  746 + // });
  747 + // },
  748 + // child: Container(
  749 + // color: Colors.white,
  750 + // height: ScreenUtil().setWidth(40),
  751 + // alignment: Alignment.center,
  752 + // padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
  753 + // child: _textWidget(customerProvider.hydSelAll ? '全不选' : '全选',
  754 + // MyColours.color_199095, FontWeight.normal, 24)),
  755 + // )
739 ], 756 ],
740 ), 757 ),
741 VEmptyView(30), 758 VEmptyView(30),
@@ -744,9 +761,19 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -744,9 +761,19 @@ class _CustomerListPageState extends State<CustomerListPage>
744 runSpacing: ScreenUtil().setWidth(20), 761 runSpacing: ScreenUtil().setWidth(20),
745 children: _buildFilterItem(customerProvider.filterHydList, false, 762 children: _buildFilterItem(customerProvider.filterHydList, false,
746 (FilterBtnModel item) { 763 (FilterBtnModel item) {
747 - state(() {  
748 - item.select = !item.select;  
749 - }); 764 + // state(() {
  765 + // item.select = !item.select;
  766 + // });
  767 + for (FilterBtnModel value in customerProvider.filterHydList) {
  768 + value.select = false;
  769 + }
  770 + for (FilterBtnModel value in customerProvider.filterHydList) {
  771 + if (item.id == value.id) {
  772 + state(() {
  773 + value.select = true;
  774 + });
  775 + }
  776 + }
750 })), 777 })),
751 ], 778 ],
752 ); 779 );
@@ -520,140 +520,146 @@ class _MakeMarkingPageState extends State<MakeMarkingPage> { @@ -520,140 +520,146 @@ class _MakeMarkingPageState extends State<MakeMarkingPage> {
520 customerProvider = Provider.of<CustomerProvider>(context, listen: true); 520 customerProvider = Provider.of<CustomerProvider>(context, listen: true);
521 customerMakingProvider = 521 customerMakingProvider =
522 Provider.of<CustomerMakingProvider>(context, listen: true); 522 Provider.of<CustomerMakingProvider>(context, listen: true);
523 - return Scaffold(  
524 - backgroundColor: Color.fromRGBO(246, 248, 250, 1),  
525 - key: scaffoldKey,  
526 - appBar: SystemAppBar(  
527 - '创建营销任务',  
528 - onTap: () {  
529 - customerMakingProvider.clearData();  
530 - Navigator.pop(context);  
531 - },  
532 - ),  
533 - body: Column(  
534 - children: [  
535 - Expanded(  
536 - child: SingleChildScrollView(  
537 - child: Column(  
538 - children: [  
539 - VEmptyView(10),  
540 - Container(  
541 - color: MyColours.color_199095,  
542 - padding: EdgeInsets.symmetric(  
543 - horizontal: ScreenUtil().setWidth(30),  
544 - vertical: ScreenUtil().setWidth(30)),  
545 - child: Row(  
546 - children: [  
547 - Expanded(  
548 - child: Text(  
549 - '已选[${customerMakingProvider.labels}]${customerMakingProvider.selectCustomerSeller.length}位顾客',  
550 - style: TextStyle(  
551 - color: MyColours.color_ffffff,  
552 - fontSize: ScreenUtil().setSp(32)),  
553 - )),  
554 - HEmptyView(10),  
555 - InkWell(  
556 - onTap: () async {  
557 - needClear = false;  
558 - if (widget.fromPage ==  
559 - FromPage.FromPageMakeRecordDetail) {  
560 - customerMakingProvider.selectCustomerSeller =  
561 - customerProvider.selectCustomerSeller; 523 + return Material(
  524 + child: InkWell(
  525 + onTap: () {
  526 + FocusScope.of(context).requestFocus(new FocusNode());
  527 + },
  528 + child: Scaffold(
  529 + backgroundColor: Color.fromRGBO(246, 248, 250, 1),
  530 + key: scaffoldKey,
  531 + appBar: SystemAppBar(
  532 + '创建营销任务',
  533 + onTap: () {
  534 + customerMakingProvider.clearData();
  535 + Navigator.pop(context);
  536 + },
  537 + ),
  538 + body: Column(
  539 + children: [
  540 + Expanded(
  541 + child: SingleChildScrollView(
  542 + child: Column(
  543 + children: [
  544 + VEmptyView(10),
  545 + Container(
  546 + color: MyColours.color_199095,
  547 + padding: EdgeInsets.symmetric(
  548 + horizontal: ScreenUtil().setWidth(30),
  549 + vertical: ScreenUtil().setWidth(30)),
  550 + child: Row(
  551 + children: [
  552 + Expanded(
  553 + child: Text(
  554 + '已选[${customerMakingProvider.labels}]${customerMakingProvider.selectCustomerSeller.length}位顾客',
  555 + style: TextStyle(
  556 + color: MyColours.color_ffffff,
  557 + fontSize: ScreenUtil().setSp(32)),
  558 + )),
  559 + HEmptyView(10),
  560 + InkWell(
  561 + onTap: () async {
  562 + needClear = false;
  563 + if (widget.fromPage ==
  564 + FromPage.FromPageMakeRecordDetail) {
  565 + customerMakingProvider.selectCustomerSeller =
  566 + customerProvider.selectCustomerSeller;
562 567
563 - await NavigatorUtil.goCustomerListPage(  
564 - context, FromPage.FromPageMakeRecord, ''); 568 + await NavigatorUtil.goCustomerListPage(
  569 + context, FromPage.FromPageMakeRecord, '');
565 570
566 - // Map temp = 571 + // Map temp =
567 572
568 - customerProvider.labels =  
569 - customerMakingProvider.labels;  
570 - customerProvider.selectCustomerSeller =  
571 - customerMakingProvider.selectCustomerSeller;  
572 - gid = '';  
573 - for (CustomerBySellerSunModel item  
574 - in customerMakingProvider  
575 - .selectCustomerSeller) {  
576 - gid += '${item.gid},';  
577 - }  
578 - if (gid.endsWith(',')) {  
579 - gid = gid.substring(0, gid.length - 1);  
580 - } 573 + customerProvider.labels =
  574 + customerMakingProvider.labels;
  575 + customerProvider.selectCustomerSeller =
  576 + customerMakingProvider
  577 + .selectCustomerSeller;
  578 + gid = '';
  579 + for (CustomerBySellerSunModel item
  580 + in customerMakingProvider
  581 + .selectCustomerSeller) {
  582 + gid += '${item.gid},';
  583 + }
  584 + if (gid.endsWith(',')) {
  585 + gid = gid.substring(0, gid.length - 1);
  586 + }
581 587
582 - // {  
583 - // 'labels': customerProvider.labels,  
584 - // 'selectCustomer': customerProvider.selectCustomer  
585 - // };  
586 - // customerProvider.labels = temp['labels'];  
587 - // customerProvider.selectCustomer =  
588 - // temp['selectCustomer'];  
589 - // customerMakingProvider.labels = temp['labels'];  
590 - // customerMakingProvider.selectCustomer =  
591 - // temp['selectCustomer'];  
592 - setState(() {});  
593 - } else {  
594 - Navigator.pop(context);  
595 - } 588 + // {
  589 + // 'labels': customerProvider.labels,
  590 + // 'selectCustomer': customerProvider.selectCustomer
  591 + // };
  592 + // customerProvider.labels = temp['labels'];
  593 + // customerProvider.selectCustomer =
  594 + // temp['selectCustomer'];
  595 + // customerMakingProvider.labels = temp['labels'];
  596 + // customerMakingProvider.selectCustomer =
  597 + // temp['selectCustomer'];
  598 + setState(() {});
  599 + } else {
  600 + Navigator.pop(context);
  601 + }
596 602
597 - // NavigatorUtil.goMarketingRecordsDetailPage(context);  
598 - },  
599 - child: Text('查看',  
600 - style: TextStyle(  
601 - decoration: TextDecoration.underline,  
602 - color: MyColours.color_ffffff,  
603 - fontSize: ScreenUtil().setSp(26)))),  
604 - ],  
605 - ), 603 + // NavigatorUtil.goMarketingRecordsDetailPage(context);
  604 + },
  605 + child: Text('查看',
  606 + style: TextStyle(
  607 + decoration: TextDecoration.underline,
  608 + color: MyColours.color_ffffff,
  609 + fontSize: ScreenUtil().setSp(26)))),
  610 + ],
  611 + ),
  612 + ),
  613 + Padding(
  614 + padding: EdgeInsets.symmetric(
  615 + horizontal: ScreenUtil().setWidth(30),
  616 + ),
  617 + child: Column(
  618 + children: [VEmptyView(50), _contentWidget('输入营销短信内容')],
  619 + ),
  620 + )
  621 + ],
606 ), 622 ),
607 - Padding(  
608 - padding: EdgeInsets.symmetric(  
609 - horizontal: ScreenUtil().setWidth(30),  
610 - ),  
611 - child: Column(  
612 - children: [VEmptyView(50), _contentWidget('输入营销短信内容')],  
613 - ),  
614 - )  
615 - ],  
616 - ),  
617 - )),  
618 - RoundButton(  
619 - text: '确认下发任务',  
620 - gradientStart: MyColours.color_199095,  
621 - gradientEnd: MyColours.color_199095,  
622 - // borderColor: MyColours.color_999999,  
623 - radius: ScreenUtil().setWidth(40),  
624 - height: ScreenUtil().setWidth(80),  
625 - fontSize: 26,  
626 - margin:  
627 - EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(230)),  
628 - isBold: false,  
629 - onPressed: () {  
630 - // NavigatorUtil.goEnterStoreEnvironmentPage(context); 623 + )),
  624 + RoundButton(
  625 + text: '确认下发任务',
  626 + gradientStart: MyColours.color_199095,
  627 + gradientEnd: MyColours.color_199095,
  628 + // borderColor: MyColours.color_999999,
  629 + radius: ScreenUtil().setWidth(40),
  630 + height: ScreenUtil().setWidth(80),
  631 + fontSize: 26,
  632 + margin: EdgeInsets.symmetric(
  633 + horizontal: ScreenUtil().setWidth(230)),
  634 + isBold: false,
  635 + onPressed: () {
  636 + // NavigatorUtil.goEnterStoreEnvironmentPage(context);
631 637
632 - //确认下发任务  
633 - _createMarketingBySeller();  
634 - },  
635 - ),  
636 - VEmptyView(30),  
637 - RoundButton(  
638 - text: '取消',  
639 - gradientStart: MyColours.color_ffffff,  
640 - gradientEnd: MyColours.color_ffffff,  
641 - textColor: MyColours.color_199095,  
642 - borderColor: MyColours.color_199095,  
643 - radius: ScreenUtil().setWidth(40),  
644 - height: ScreenUtil().setWidth(80),  
645 - fontSize: 26,  
646 - margin:  
647 - EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(230)),  
648 - isBold: false,  
649 - onPressed: () {  
650 - customerMakingProvider.clearData();  
651 - Navigator.pop(context);  
652 - },  
653 - ),  
654 - VEmptyView(40),  
655 - ],  
656 - ),  
657 - ); 638 + //确认下发任务
  639 + _createMarketingBySeller();
  640 + },
  641 + ),
  642 + VEmptyView(30),
  643 + RoundButton(
  644 + text: '取消',
  645 + gradientStart: MyColours.color_ffffff,
  646 + gradientEnd: MyColours.color_ffffff,
  647 + textColor: MyColours.color_199095,
  648 + borderColor: MyColours.color_199095,
  649 + radius: ScreenUtil().setWidth(40),
  650 + height: ScreenUtil().setWidth(80),
  651 + fontSize: 26,
  652 + margin: EdgeInsets.symmetric(
  653 + horizontal: ScreenUtil().setWidth(230)),
  654 + isBold: false,
  655 + onPressed: () {
  656 + customerMakingProvider.clearData();
  657 + Navigator.pop(context);
  658 + },
  659 + ),
  660 + VEmptyView(40),
  661 + ],
  662 + )),
  663 + ));
658 } 664 }
659 } 665 }
@@ -843,10 +843,17 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -843,10 +843,17 @@ class TableManagerPageState extends State<TableManagerPage> {
843 Widget build(BuildContext context) { 843 Widget build(BuildContext context) {
844 tableManagerModel = Provider.of<TableManagerModel>(context, listen: true); 844 tableManagerModel = Provider.of<TableManagerModel>(context, listen: true);
845 return Scaffold( 845 return Scaffold(
  846 + appBar: widget.guest == null
  847 + ? null
  848 + : SystemAppBar(
  849 + "桌位",
  850 + showLeading: true,
  851 + onTap: () {
  852 + Navigator.pop(context);
  853 + },
  854 + ),
846 backgroundColor: MyColours.color_ffffff, 855 backgroundColor: MyColours.color_ffffff,
847 - body: SafeArea(child:  
848 - // appBar: SystemAppBar("桌位", showLeading: false),  
849 - Consumer<TableManagerModel>( 856 + body: SafeArea(child: Consumer<TableManagerModel>(
850 builder: (context, model, child) { 857 builder: (context, model, child) {
851 int sum = 3; 858 int sum = 3;
852 int hide = 0; 859 int hide = 0;
@@ -325,6 +325,14 @@ class CustomerProvider extends ChangeNotifier { @@ -325,6 +325,14 @@ class CustomerProvider extends ChangeNotifier {
325 } 325 }
326 } 326 }
327 selectCustomer = temp; //把选中的列表，剔除掉现在结果里没有的 327 selectCustomer = temp; //把选中的列表，剔除掉现在结果里没有的
  328 + List<String> tempLabel = [];
  329 + for (CustomerListSunModel item in selectCustomer) {
  330 + if (item.select && item.attr != null) {
  331 + tempLabel.add(item.attr);
  332 + }
  333 + }
  334 + tempLabel = tempLabel.toSet().toList();
  335 + labels = Utils.listToStringEnglish(tempLabel);
328 getCheckValueMy(); 336 getCheckValueMy();
329 //对于以前有选中的数据，接口请求后，继续赋值 337 //对于以前有选中的数据，接口请求后，继续赋值
330 338
@@ -1400,6 +1408,14 @@ class CustomerProvider extends ChangeNotifier { @@ -1400,6 +1408,14 @@ class CustomerProvider extends ChangeNotifier {
1400 1408
1401 customerBySellerList[i] = item; 1409 customerBySellerList[i] = item;
1402 } 1410 }
  1411 + List<String> tempLabel = [];
  1412 + for (CustomerBySellerSunModel item in selectCustomerSeller) {
  1413 + if (item.select && item.attr != null) {
  1414 + tempLabel.add(item.attr);
  1415 + }
  1416 + }
  1417 + tempLabel = tempLabel.toSet().toList();
  1418 + labels = Utils.listToStringEnglish(tempLabel);
1403 1419
1404 handleList(customerBySellerList, needRefresh: true); 1420 handleList(customerBySellerList, needRefresh: true);
1405 } 1421 }