Commit dedeeff02110cab1cad6cd099e849fb4d5b7c82c

Authored by wdn127929
1 parent 6982e1bb

我的客情跳转一键追回,一键唤醒

@@ -592,6 +592,7 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> { @@ -592,6 +592,7 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> {
592 listen: false) 592 listen: false)
593 .user 593 .user
594 .openid, 594 .openid,
  595 + labels: '流失',
595 fromPage: 596 fromPage:
596 FromPage.FromPageMyCustomer, 597 FromPage.FromPageMyCustomer,
597 homeGid: Utils.listToStringEnglish1( 598 homeGid: Utils.listToStringEnglish1(
@@ -664,6 +665,7 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> { @@ -664,6 +665,7 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> {
664 listen: false) 665 listen: false)
665 .user 666 .user
666 .openid, 667 .openid,
  668 + labels: '沉睡',
667 fromPage: 669 fromPage:
668 FromPage.FromPageMyCustomer, 670 FromPage.FromPageMyCustomer,
669 homeGid: Utils.listToStringEnglish1( 671 homeGid: Utils.listToStringEnglish1(
@@ -40,7 +40,9 @@ class MyCustomerListPage extends StatefulWidget { @@ -40,7 +40,9 @@ class MyCustomerListPage extends StatefulWidget {
40 final FromPage fromPage; 40 final FromPage fromPage;
41 final String index; 41 final String index;
42 42
43 - const MyCustomerListPage({Key key, this.uid, this.fromPage, this.index}) 43 + final String labels;
  44 +
  45 + const MyCustomerListPage({Key key, this.uid, this.fromPage, this.index, this.labels = ''})
44 : super(key: key); 46 : super(key: key);
45 @override 47 @override
46 _MyCustomerListPageState createState() => _MyCustomerListPageState(); 48 _MyCustomerListPageState createState() => _MyCustomerListPageState();
@@ -305,7 +307,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -305,7 +307,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
305 // params['reserve_num'] 时间内预定次数 307 // params['reserve_num'] 时间内预定次数
306 // params['reserve_sort'] 1 等于 2 小于 3 大于 308 // params['reserve_sort'] 1 等于 2 小于 3 大于
307 309
308 - await customerProvider.getCustomerList(context, params, load: load); 310 + await customerProvider.getCustomerList(context, params, load: load,labels:widget.labels);
309 311
310 print(first); 312 print(first);
311 // if (customerProvider.userHistorys.length == 313 // if (customerProvider.userHistorys.length ==
@@ -33,12 +33,14 @@ class MyMakeMarkingPage extends StatefulWidget { @@ -33,12 +33,14 @@ class MyMakeMarkingPage extends StatefulWidget {
33 final FromPage fromPage; 33 final FromPage fromPage;
34 final SelfList selfList; 34 final SelfList selfList;
35 final String homeGid; 35 final String homeGid;
  36 + final String labels;
36 MyMakeMarkingPage( 37 MyMakeMarkingPage(
37 {Key key, 38 {Key key,
38 this.fromPage = FromPage.FromPageCustomerList, 39 this.fromPage = FromPage.FromPageCustomerList,
39 this.selfList, 40 this.selfList,
40 this.homeGid, 41 this.homeGid,
41 - this.uid}) 42 + this.uid,
  43 + this.labels})
42 : super(key: key); 44 : super(key: key);
43 45
44 @override 46 @override
@@ -65,6 +67,8 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { @@ -65,6 +67,8 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> {
65 void initState() { 67 void initState() {
66 super.initState(); 68 super.initState();
67 69
  70 + print(widget.fromPage);
  71 +
68 // UserModel userModel = Provider.of<UserModel>(context, listen: false); 72 // UserModel userModel = Provider.of<UserModel>(context, listen: false);
69 73
70 // data = [ 74 // data = [
@@ -151,7 +155,12 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { @@ -151,7 +155,12 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> {
151 ); 155 );
152 print('''object'''); 156 print('''object''');
153 gid = gidtemp; 157 gid = gidtemp;
  158 +
  159 + if (widget.labels != '' && widget.labels != null) {
  160 + customerProvider.labels = widget.labels;
  161 + }
154 customerMakingProvider.labels = customerProvider.labels; 162 customerMakingProvider.labels = customerProvider.labels;
  163 +
155 customerMakingProvider.selectCustomer = customerProvider.selectCustomer; 164 customerMakingProvider.selectCustomer = customerProvider.selectCustomer;
156 _getPhoneAndGid(); 165 _getPhoneAndGid();
157 // customerMakingProvider.fromPage = widget.fromPage; 166 // customerMakingProvider.fromPage = widget.fromPage;
@@ -618,7 +627,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { @@ -618,7 +627,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> {
618 children: [ 627 children: [
619 Expanded( 628 Expanded(
620 child: Text( 629 child: Text(
621 - '已选[${customerMakingProvider.labels}]${customerMakingProvider.selectCustomer.length}位顾客', 630 + '已选[${customerMakingProvider.labels??''}]${customerMakingProvider.selectCustomer.length}位顾客',
622 style: TextStyle( 631 style: TextStyle(
623 color: MyColours.color_ffffff, 632 color: MyColours.color_ffffff,
624 fontSize: ScreenUtil().setSp(32)), 633 fontSize: ScreenUtil().setSp(32)),
@@ -639,6 +648,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { @@ -639,6 +648,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> {
639 context, 648 context,
640 FromPage.FromPageMakeRecord, 649 FromPage.FromPageMakeRecord,
641 widget.uid, 650 widget.uid,
  651 + labels: widget.labels
642 ); 652 );
643 653
644 customerProvider.labels = 654 customerProvider.labels =
@@ -424,7 +424,8 @@ class CustomerProvider extends ChangeNotifier { @@ -424,7 +424,8 @@ class CustomerProvider extends ChangeNotifier {
424 BuildContext context, Map<String, String> params, 424 BuildContext context, Map<String, String> params,
425 {isShowLoading = true}) async { 425 {isShowLoading = true}) async {
426 BaseResp<dynamic> baseResp = await DioUtil() 426 BaseResp<dynamic> baseResp = await DioUtil()
427 - .request<dynamic>(context, Method.post, HttpUrl.create_activity_url_link, 427 + .request<dynamic>(
  428 + context, Method.post, HttpUrl.create_activity_url_link,
428 data: params, showLoading: isShowLoading) 429 data: params, showLoading: isShowLoading)
429 .catchError((error) { 430 .catchError((error) {
430 print(error.toString()); 431 print(error.toString());
@@ -610,7 +611,7 @@ class CustomerProvider extends ChangeNotifier { @@ -610,7 +611,7 @@ class CustomerProvider extends ChangeNotifier {
610 611
611 //我的客情 --- 用来获取客户列表 612 //我的客情 --- 用来获取客户列表
612 getCustomerList(BuildContext context, Map<String, String> params, 613 getCustomerList(BuildContext context, Map<String, String> params,
613 - {bool load = false}) async { 614 + {bool load = false, String labels = ''}) async {
614 BaseResp<List> baseResp = await DioUtil() 615 BaseResp<List> baseResp = await DioUtil()
615 .request<List>(context, Method.post, HttpUrl.get_customer_list, 616 .request<List>(context, Method.post, HttpUrl.get_customer_list,
616 data: params, showLoading: load) 617 data: params, showLoading: load)
@@ -644,8 +645,12 @@ class CustomerProvider extends ChangeNotifier { @@ -644,8 +645,12 @@ class CustomerProvider extends ChangeNotifier {
644 selectCustomer = []; 645 selectCustomer = [];
645 List<CustomerListSunModel> temp = 646 List<CustomerListSunModel> temp =
646 CustomerListModel.fromJson(baseResp.responseData).data; 647 CustomerListModel.fromJson(baseResp.responseData).data;
647 - List<CustomerListSunModel> temp1 = await addDataSelectMy(temp);  
648 - userHistorys = temp1; 648 + if (labels == '流失' || labels == '沉睡') {
  649 + userHistorys = temp;
  650 + } else {
  651 + List<CustomerListSunModel> temp1 = await addDataSelectMy(temp);
  652 + userHistorys = temp1;
  653 + }
649 654
650 getCheckValueMy(); 655 getCheckValueMy();
651 labelsValueMy(); 656 labelsValueMy();
@@ -660,8 +665,13 @@ class CustomerProvider extends ChangeNotifier { @@ -660,8 +665,13 @@ class CustomerProvider extends ChangeNotifier {
660 // .addAll(CustomerListModel.fromJson(baseResp.responseData).data); 665 // .addAll(CustomerListModel.fromJson(baseResp.responseData).data);
661 List<CustomerListSunModel> temp = 666 List<CustomerListSunModel> temp =
662 CustomerListModel.fromJson(baseResp.responseData).data; 667 CustomerListModel.fromJson(baseResp.responseData).data;
663 - List<CustomerListSunModel> temp1 = await addDataSelectMy(temp);  
664 - userHistorys.addAll(temp1); 668 +
  669 + if (labels == '流失' || labels == '沉睡') {
  670 + userHistorys.addAll(temp);
  671 + } else {
  672 + List<CustomerListSunModel> temp1 = await addDataSelectMy(temp);
  673 + userHistorys.addAll(temp1);
  674 + }
665 675
666 getCheckValueMy(); 676 getCheckValueMy();
667 labelsValueMy(); 677 labelsValueMy();
@@ -2098,7 +2108,8 @@ class CustomerProvider extends ChangeNotifier { @@ -2098,7 +2108,8 @@ class CustomerProvider extends ChangeNotifier {
2098 BuildContext context, Map<String, String> params, 2108 BuildContext context, Map<String, String> params,
2099 {bool showLoading = false}) async { 2109 {bool showLoading = false}) async {
2100 BaseResp<dynamic> baseResp = await DioUtil() 2110 BaseResp<dynamic> baseResp = await DioUtil()
2101 - .request<dynamic>(context, Method.post, HttpUrl.create_label_by_sellerid, 2111 + .request<dynamic>(
  2112 + context, Method.post, HttpUrl.create_label_by_sellerid,
2102 data: params, showLoading: showLoading) 2113 data: params, showLoading: showLoading)
2103 .catchError((error) { 2114 .catchError((error) {
2104 print(error.toString()); 2115 print(error.toString());
@@ -841,9 +841,10 @@ class NavigatorUtil { @@ -841,9 +841,10 @@ class NavigatorUtil {
841 /// 我的客情列表 841 /// 我的客情列表
842 static Future<dynamic> goMyCustomerListPage( 842 static Future<dynamic> goMyCustomerListPage(
843 BuildContext context, FromPage fromPage, String uid, 843 BuildContext context, FromPage fromPage, String uid,
844 - {replace = false, bool needBtn = false, String index = '0'}) { 844 + {replace = false, bool needBtn = false, String index = '0',String labels = ''}) {
  845 +
845 return _navigateTo(context, 846 return _navigateTo(context,
846 - "${Routes.my_customer_list_page}?fromPage=${FluroConvertUtils.enumToString(fromPage)}&index=${index}&uid=${uid}", 847 + "${Routes.my_customer_list_page}?fromPage=${FluroConvertUtils.enumToString(fromPage)}&index=${index}&uid=${uid}&labels=${Uri.encodeComponent(labels)}",
847 replace: replace); 848 replace: replace);
848 } 849 }
849 850
@@ -889,9 +890,10 @@ class NavigatorUtil { @@ -889,9 +890,10 @@ class NavigatorUtil {
889 SelfList selfList, 890 SelfList selfList,
890 FromPage fromPage, 891 FromPage fromPage,
891 String homeGid = '', 892 String homeGid = '',
  893 + String labels = ''
892 }) { 894 }) {
893 return _navigateTo(context, 895 return _navigateTo(context,
894 - "${Routes.my_make_marketing_page}?selfList=${FluroConvertUtils.object2string(selfList)}&fromPage=${FluroConvertUtils.enumToString(fromPage)}&homeGid=$homeGid&uid=$uid", 896 + "${Routes.my_make_marketing_page}?selfList=${FluroConvertUtils.object2string(selfList)}&fromPage=${FluroConvertUtils.enumToString(fromPage)}&homeGid=$homeGid&uid=$uid&labels=${Uri.encodeComponent(labels)}",
895 replace: replace); 897 replace: replace);
896 } 898 }
897 899
@@ -1406,12 +1406,13 @@ var myCustomerListPageHandle = new Handler( @@ -1406,12 +1406,13 @@ var myCustomerListPageHandle = new Handler(
1406 print(fromPage); 1406 print(fromPage);
1407 String index = params["index"].first; 1407 String index = params["index"].first;
1408 String uid = params["uid"].first; 1408 String uid = params["uid"].first;
  1409 + String labels = params["labels"].first;
1409 return ChangeNotifierProvider<CustomerProvider>( 1410 return ChangeNotifierProvider<CustomerProvider>(
1410 create: (_) => CustomerProvider(), 1411 create: (_) => CustomerProvider(),
1411 child: ChangeNotifierProvider<CollectStoreProvider>( 1412 child: ChangeNotifierProvider<CollectStoreProvider>(
1412 create: (_) => CollectStoreProvider(), 1413 create: (_) => CollectStoreProvider(),
1413 child: 1414 child:
1414 - MyCustomerListPage(fromPage: fromPage, index: index, uid: uid))); 1415 + MyCustomerListPage(fromPage: fromPage, index: index, uid: uid,labels:labels)));
1415 }); 1416 });
1416 1417
1417 ///我的客情列表 1418 ///我的客情列表
@@ -1550,6 +1551,8 @@ var myMakeMarkingPageHandle = new Handler( @@ -1550,6 +1551,8 @@ var myMakeMarkingPageHandle = new Handler(
1550 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1551 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
1551 String uid = params["uid"].first; 1552 String uid = params["uid"].first;
1552 1553
  1554 + String labels = params["labels"].first;
  1555 +
1553 FromPage fromPage = FluroConvertUtils.enumFromString<FromPage>( 1556 FromPage fromPage = FluroConvertUtils.enumFromString<FromPage>(
1554 FromPage.values, params["fromPage"].first); 1557 FromPage.values, params["fromPage"].first);
1555 if (fromPage == FromPage.FromPageMakeRecordDetail) { 1558 if (fromPage == FromPage.FromPageMakeRecordDetail) {
@@ -1558,13 +1561,13 @@ var myMakeMarkingPageHandle = new Handler( @@ -1558,13 +1561,13 @@ var myMakeMarkingPageHandle = new Handler(
1558 return ChangeNotifierProvider<CustomerProvider>( 1561 return ChangeNotifierProvider<CustomerProvider>(
1559 create: (_) => CustomerProvider(), 1562 create: (_) => CustomerProvider(),
1560 child: MyMakeMarkingPage( 1563 child: MyMakeMarkingPage(
1561 - selfList: selfList, fromPage: fromPage, uid: uid)); 1564 + selfList: selfList, fromPage: fromPage, uid: uid,labels:labels));
1562 } 1565 }
1563 1566
1564 String homeGid = params["homeGid"].first; 1567 String homeGid = params["homeGid"].first;
1565 return ChangeNotifierProvider<CustomerProvider>( 1568 return ChangeNotifierProvider<CustomerProvider>(
1566 create: (_) => CustomerProvider(), 1569 create: (_) => CustomerProvider(),
1567 - child: MyMakeMarkingPage(fromPage: fromPage, homeGid: homeGid, uid: uid)); 1570 + child: MyMakeMarkingPage(fromPage: fromPage, homeGid: homeGid, uid: uid,labels:labels));
1568 }); 1571 });
1569 1572
1570 ///我的创建营销 ---- 完成全店营销 1573 ///我的创建营销 ---- 完成全店营销