xt / Flutter-ReserveApp · Commits

Go to a project

Commit 9ef30be7aafcd87e37600cd8e8e47bde6a433f61

Authored by wdn127929
1 parent 3a6a28e5
build: skipped

分经理uid

Inline Side-by-side
Showing 13 changed files with 801 additions and 650 deletions
@@ -45,6 +45,10 @@ class StoreCustomerHomeSunModel extends Object { @@ -45,6 +45,10 @@ class StoreCustomerHomeSunModel extends Object {
45 @JsonKey(name: 'distribution') 45 @JsonKey(name: 'distribution')
46 int distribution; 46 int distribution;
47 47
  48 + @JsonKey(name: 'distributionStr')
  49 + String distributionStr;
  50 +
  51 +
48 StoreCustomerHomeSunModel( 52 StoreCustomerHomeSunModel(
49 this.myCustomer, 53 this.myCustomer,
50 this.active, 54 this.active,
@@ -52,6 +56,7 @@ class StoreCustomerHomeSunModel extends Object { @@ -52,6 +56,7 @@ class StoreCustomerHomeSunModel extends Object {
52 this.drain, 56 this.drain,
53 this.sellerUser, 57 this.sellerUser,
54 this.distribution, 58 this.distribution,
  59 + this.distributionStr
55 ); 60 );
56 61
57 factory StoreCustomerHomeSunModel.fromJson(Map<String, dynamic> srcJson) => 62 factory StoreCustomerHomeSunModel.fromJson(Map<String, dynamic> srcJson) =>
@@ -29,22 +29,22 @@ Map<String, dynamic> _$StoreCustomerHomeModelToJson( @@ -29,22 +29,22 @@ Map<String, dynamic> _$StoreCustomerHomeModelToJson(
29 StoreCustomerHomeSunModel _$StoreCustomerHomeSunModelFromJson( 29 StoreCustomerHomeSunModel _$StoreCustomerHomeSunModelFromJson(
30 Map<String, dynamic> json) { 30 Map<String, dynamic> json) {
31 return StoreCustomerHomeSunModel( 31 return StoreCustomerHomeSunModel(
32 - json['myCustomer'] as int,  
33 - json['active'] == null  
34 - ? null  
35 - : Active.fromJson(json['active'] as Map<String, dynamic>),  
36 - json['sleep'] == null  
37 - ? null  
38 - : Sleep.fromJson(json['sleep'] as Map<String, dynamic>),  
39 - json['drain'] == null  
40 - ? null  
41 - : Drain.fromJson(json['drain'] as Map<String, dynamic>),  
42 - (json['seller_user'] as List)  
43 - ?.map((e) =>  
44 - e == null ? null : SellerUser.fromJson(e as Map<String, dynamic>))  
45 - ?.toList(),  
46 - json['distribution'] as int,  
47 - ); 32 + json['myCustomer'] as int,
  33 + json['active'] == null
  34 + ? null
  35 + : Active.fromJson(json['active'] as Map<String, dynamic>),
  36 + json['sleep'] == null
  37 + ? null
  38 + : Sleep.fromJson(json['sleep'] as Map<String, dynamic>),
  39 + json['drain'] == null
  40 + ? null
  41 + : Drain.fromJson(json['drain'] as Map<String, dynamic>),
  42 + (json['seller_user'] as List)
  43 + ?.map((e) =>
  44 + e == null ? null : SellerUser.fromJson(e as Map<String, dynamic>))
  45 + ?.toList(),
  46 + json['distribution'] as int,
  47 + json['distributionStr'] as String);
48 } 48 }
49 49
50 Map<String, dynamic> _$StoreCustomerHomeSunModelToJson( 50 Map<String, dynamic> _$StoreCustomerHomeSunModelToJson(
@@ -56,6 +56,7 @@ Map<String, dynamic> _$StoreCustomerHomeSunModelToJson( @@ -56,6 +56,7 @@ Map<String, dynamic> _$StoreCustomerHomeSunModelToJson(
56 'drain': instance.drain, 56 'drain': instance.drain,
57 'seller_user': instance.sellerUser, 57 'seller_user': instance.sellerUser,
58 'distribution': instance.distribution, 58 'distribution': instance.distribution,
  59 + 'distributionStr': instance.distributionStr
59 }; 60 };
60 61
61 Active _$ActiveFromJson(Map<String, dynamic> json) { 62 Active _$ActiveFromJson(Map<String, dynamic> json) {
@@ -96,12 +97,11 @@ Map<String, dynamic> _$DrainToJson(Drain instance) => <String, dynamic>{ @@ -96,12 +97,11 @@ Map<String, dynamic> _$DrainToJson(Drain instance) => <String, dynamic>{
96 97
97 SellerUser _$SellerUserFromJson(Map<String, dynamic> json) { 98 SellerUser _$SellerUserFromJson(Map<String, dynamic> json) {
98 return SellerUser( 99 return SellerUser(
99 - json['count'] as String,  
100 - json['nick_name'] as String,  
101 - json['uid'] as String,  
102 - json['account'] as String,  
103 - json['detailStr'] as String  
104 - ); 100 + json['count'] as String,
  101 + json['nick_name'] as String,
  102 + json['uid'] as String,
  103 + json['account'] as String,
  104 + json['detailStr'] as String);
105 } 105 }
106 106
107 Map<String, dynamic> _$SellerUserToJson(SellerUser instance) => 107 Map<String, dynamic> _$SellerUserToJson(SellerUser instance) =>
@@ -109,6 +109,6 @@ Map<String, dynamic> _$SellerUserToJson(SellerUser instance) => @@ -109,6 +109,6 @@ Map<String, dynamic> _$SellerUserToJson(SellerUser instance) =>
109 'count': instance.count, 109 'count': instance.count,
110 'nick_name': instance.nickName, 110 'nick_name': instance.nickName,
111 'uid': instance.uid, 111 'uid': instance.uid,
112 - 'account':instance.account,  
113 - 'detailStr':instance.detailStr 112 + 'account': instance.account,
  113 + 'detailStr': instance.detailStr
114 }; 114 };
@@ -23,6 +23,7 @@ import 'package:intl/date_symbol_data_local.dart'; @@ -23,6 +23,7 @@ import 'package:intl/date_symbol_data_local.dart';
23 23
24 import '../../net/dio_util.dart'; 24 import '../../net/dio_util.dart';
25 import '../../net/http_url.dart'; 25 import '../../net/http_url.dart';
  26 +import '../../utils/screen_util.dart';
26 27
27 class FirstPage extends StatefulWidget { 28 class FirstPage extends StatefulWidget {
28 FirstPage({Key key}) : super(key: key); 29 FirstPage({Key key}) : super(key: key);
@@ -141,12 +142,13 @@ class _FirstPageState extends State<FirstPage> { @@ -141,12 +142,13 @@ class _FirstPageState extends State<FirstPage> {
141 fontSize: ScreenUtil().setSp(28), 142 fontSize: ScreenUtil().setSp(28),
142 ), 143 ),
143 strutStyle: StrutStyle( 144 strutStyle: StrutStyle(
144 - forceStrutHeight: true,  
145 - height: 1, 145 + // forceStrutHeight: true,
  146 + // height: 1,
146 leading: 0.3), 147 leading: 0.3),
147 ), 148 ),
148 VEmptyView(16), 149 VEmptyView(16),
149 Wrap( 150 Wrap(
  151 + runSpacing: w(1),
150 children: [ 152 children: [
151 Text( 153 Text(
152 '我们制定了', 154 '我们制定了',
@@ -155,8 +157,8 @@ class _FirstPageState extends State<FirstPage> { @@ -155,8 +157,8 @@ class _FirstPageState extends State<FirstPage> {
155 fontSize: ScreenUtil().setSp(28), 157 fontSize: ScreenUtil().setSp(28),
156 ), 158 ),
157 strutStyle: StrutStyle( 159 strutStyle: StrutStyle(
158 - forceStrutHeight: true,  
159 - height: 1, 160 + // forceStrutHeight: true,
  161 + // height: 1,
160 leading: 0.3), 162 leading: 0.3),
161 ), 163 ),
162 InkWell( 164 InkWell(
@@ -172,8 +174,8 @@ class _FirstPageState extends State<FirstPage> { @@ -172,8 +174,8 @@ class _FirstPageState extends State<FirstPage> {
172 fontSize: ScreenUtil().setSp(28), 174 fontSize: ScreenUtil().setSp(28),
173 ), 175 ),
174 strutStyle: StrutStyle( 176 strutStyle: StrutStyle(
175 - forceStrutHeight: true,  
176 - height: 1, 177 + // forceStrutHeight: true,
  178 + // height: 1,
177 leading: 0.3), 179 leading: 0.3),
178 ), 180 ),
179 ), 181 ),
@@ -184,8 +186,8 @@ class _FirstPageState extends State<FirstPage> { @@ -184,8 +186,8 @@ class _FirstPageState extends State<FirstPage> {
184 fontSize: ScreenUtil().setSp(28), 186 fontSize: ScreenUtil().setSp(28),
185 ), 187 ),
186 strutStyle: StrutStyle( 188 strutStyle: StrutStyle(
187 - forceStrutHeight: true,  
188 - height: 1, 189 + // forceStrutHeight: true,
  190 + // height: 1,
189 leading: 0.3), 191 leading: 0.3),
190 ), 192 ),
191 InkWell( 193 InkWell(
@@ -201,8 +203,8 @@ class _FirstPageState extends State<FirstPage> { @@ -201,8 +203,8 @@ class _FirstPageState extends State<FirstPage> {
201 fontSize: ScreenUtil().setSp(28), 203 fontSize: ScreenUtil().setSp(28),
202 ), 204 ),
203 strutStyle: StrutStyle( 205 strutStyle: StrutStyle(
204 - forceStrutHeight: true,  
205 - height: 1, 206 + // forceStrutHeight: true,
  207 + // height: 1,
206 leading: 0.3), 208 leading: 0.3),
207 ), 209 ),
208 ), 210 ),
@@ -213,8 +215,8 @@ class _FirstPageState extends State<FirstPage> { @@ -213,8 +215,8 @@ class _FirstPageState extends State<FirstPage> {
213 fontSize: ScreenUtil().setSp(28), 215 fontSize: ScreenUtil().setSp(28),
214 ), 216 ),
215 strutStyle: StrutStyle( 217 strutStyle: StrutStyle(
216 - forceStrutHeight: true,  
217 - height: 1, 218 + // forceStrutHeight: true,
  219 + // height: 1,
218 leading: 0.3), 220 leading: 0.3),
219 ), 221 ),
220 ], 222 ],
@@ -228,8 +230,8 @@ class _FirstPageState extends State<FirstPage> { @@ -228,8 +230,8 @@ class _FirstPageState extends State<FirstPage> {
228 fontSize: ScreenUtil().setSp(28), 230 fontSize: ScreenUtil().setSp(28),
229 ), 231 ),
230 strutStyle: StrutStyle( 232 strutStyle: StrutStyle(
231 - forceStrutHeight: true,  
232 - height: 1, 233 + // forceStrutHeight: true,
  234 + // height: 1,
233 leading: 0.3), 235 leading: 0.3),
234 ), 236 ),
235 ], 237 ],
@@ -68,8 +68,9 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> { @@ -68,8 +68,9 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> {
68 68
69 ///我的客户首页 69 ///我的客户首页
70 _getGuestManageData({bool isShowLoading = true}) async { 70 _getGuestManageData({bool isShowLoading = true}) async {
71 - GuestManageSunModel model = await customerProvider  
72 - .getGuestManageData(context, isShowLoading: isShowLoading); 71 + GuestManageSunModel model = await customerProvider.getGuestManageData(
  72 + context, Provider.of<UserModel>(context, listen: false).user.openid,
  73 + isShowLoading: isShowLoading);
73 // setState(() {}); 74 // setState(() {});
74 } 75 }
75 76
@@ -228,8 +229,11 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> { @@ -228,8 +229,11 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> {
228 index = '3'; 229 index = '3';
229 } 230 }
230 NavigatorUtil.goMyCustomerListPage( 231 NavigatorUtil.goMyCustomerListPage(
231 - context, FromPage.FromPageMyCustomer,  
232 - index: index); 232 + context,
  233 + FromPage.FromPageMyCustomer,
  234 + Provider.of<UserModel>(context, listen: false).user.openid,
  235 + index: index,
  236 + );
233 }, 237 },
234 child: Container( 238 child: Container(
235 color: MyColours.color_ffffff, 239 color: MyColours.color_ffffff,
@@ -273,7 +277,11 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> { @@ -273,7 +277,11 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> {
273 index = '3'; 277 index = '3';
274 } 278 }
275 NavigatorUtil.goMyCustomerListPage( 279 NavigatorUtil.goMyCustomerListPage(
276 - context, FromPage.FromPageMyCustomer, 280 + context,
  281 + FromPage.FromPageMyCustomer,
  282 + Provider.of<UserModel>(context, listen: false)
  283 + .user
  284 + .openid,
277 index: index); 285 index: index);
278 }, 286 },
279 text: btnTitle, 287 text: btnTitle,
@@ -334,7 +342,12 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> { @@ -334,7 +342,12 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> {
334 InkWell( 342 InkWell(
335 onTap: () { 343 onTap: () {
336 NavigatorUtil.goMyCustomerListPage( 344 NavigatorUtil.goMyCustomerListPage(
337 - context, FromPage.FromPageMyCustomer); 345 + context,
  346 + FromPage.FromPageMyCustomer,
  347 + Provider.of<UserModel>(context, listen: false)
  348 + .user
  349 + .openid,
  350 + );
338 }, 351 },
339 child: Container( 352 child: Container(
340 height: w(80), 353 height: w(80),
@@ -578,6 +591,10 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> { @@ -578,6 +591,10 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> {
578 onPressed: () { 591 onPressed: () {
579 NavigatorUtil.goMyMakeMarkingPage( 592 NavigatorUtil.goMyMakeMarkingPage(
580 context, 593 context,
  594 + Provider.of<UserModel>(context,
  595 + listen: false)
  596 + .user
  597 + .openid,
581 fromPage: 598 fromPage:
582 FromPage.FromPageMyCustomer, 599 FromPage.FromPageMyCustomer,
583 homeGid: Utils.listToStringEnglish1( 600 homeGid: Utils.listToStringEnglish1(
@@ -646,6 +663,10 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> { @@ -646,6 +663,10 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> {
646 onPressed: () { 663 onPressed: () {
647 NavigatorUtil.goMyMakeMarkingPage( 664 NavigatorUtil.goMyMakeMarkingPage(
648 context, 665 context,
  666 + Provider.of<UserModel>(context,
  667 + listen: false)
  668 + .user
  669 + .openid,
649 fromPage: 670 fromPage:
650 FromPage.FromPageMyCustomer, 671 FromPage.FromPageMyCustomer,
651 homeGid: Utils.listToStringEnglish1( 672 homeGid: Utils.listToStringEnglish1(
@@ -695,7 +716,11 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> { @@ -695,7 +716,11 @@ class _MyCustomerHomePageState extends State<MyCustomerHomePage> {
695 RoundButton( 716 RoundButton(
696 onPressed: () { 717 onPressed: () {
697 NavigatorUtil.goMyMarketingRecordsPage( 718 NavigatorUtil.goMyMarketingRecordsPage(
698 - context, FromPage.FromPageMyCustomer); 719 + context,
  720 + FromPage.FromPageMyCustomer,
  721 + Provider.of<UserModel>(context, listen: false)
  722 + .user
  723 + .openid);
699 }, 724 },
700 text: '历史营销记录', 725 text: '历史营销记录',
701 fontSize: 32, 726 fontSize: 32,
@@ -31,10 +31,11 @@ typedef ClickCall = void Function(FilterBtnModel value); @@ -31,10 +31,11 @@ typedef ClickCall = void Function(FilterBtnModel value);
31 typedef ClickCallState = void Function(StateSetter state); 31 typedef ClickCallState = void Function(StateSetter state);
32 32
33 class MyCustomerListPage extends StatefulWidget { 33 class MyCustomerListPage extends StatefulWidget {
  34 + final String uid;
34 final FromPage fromPage; 35 final FromPage fromPage;
35 final String index; 36 final String index;
36 37
37 - const MyCustomerListPage({Key key, this.fromPage, this.index}) 38 + const MyCustomerListPage({Key key, this.uid, this.fromPage, this.index})
38 : super(key: key); 39 : super(key: key);
39 @override 40 @override
40 _MyCustomerListPageState createState() => _MyCustomerListPageState(); 41 _MyCustomerListPageState createState() => _MyCustomerListPageState();
@@ -194,7 +195,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -194,7 +195,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
194 } 195 }
195 customerProvider.notifyListeners(); 196 customerProvider.notifyListeners();
196 Map<String, String> params = { 197 Map<String, String> params = {
197 - "uid": Provider.of<UserModel>(context, listen: false).user.openid, 198 + "uid": widget.uid,
198 "page": page.toString(), 199 "page": page.toString(),
199 "offset": '10' 200 "offset": '10'
200 }; 201 };
@@ -366,7 +367,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -366,7 +367,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
366 customerMakingProvider.selectCustomer = 367 customerMakingProvider.selectCustomer =
367 customerProvider.selectCustomer; 368 customerProvider.selectCustomer;
368 customerMakingProvider.fromPage = widget.fromPage; 369 customerMakingProvider.fromPage = widget.fromPage;
369 - NavigatorUtil.goMyMakeMarkingPage(context); 370 + NavigatorUtil.goMyMakeMarkingPage(context, widget.uid);
370 } else { 371 } else {
371 customerMakingProvider.labels = customerProvider.labels; 372 customerMakingProvider.labels = customerProvider.labels;
372 customerMakingProvider.selectCustomer = 373 customerMakingProvider.selectCustomer =
@@ -26,6 +26,7 @@ import 'package:sendsms/sendsms.dart'; @@ -26,6 +26,7 @@ import 'package:sendsms/sendsms.dart';
26 typedef ClickCallback = void Function(dynamic value); 26 typedef ClickCallback = void Function(dynamic value);
27 27
28 class MyMakeMarkingPage extends StatefulWidget { 28 class MyMakeMarkingPage extends StatefulWidget {
  29 + final String uid;
29 final FromPage fromPage; 30 final FromPage fromPage;
30 final SelfList selfList; 31 final SelfList selfList;
31 final String homeGid; 32 final String homeGid;
@@ -33,7 +34,8 @@ class MyMakeMarkingPage extends StatefulWidget { @@ -33,7 +34,8 @@ class MyMakeMarkingPage extends StatefulWidget {
33 {Key key, 34 {Key key,
34 this.fromPage = FromPage.FromPageCustomerList, 35 this.fromPage = FromPage.FromPageCustomerList,
35 this.selfList, 36 this.selfList,
36 - this.homeGid}) 37 + this.homeGid,
  38 + this.uid})
37 : super(key: key); 39 : super(key: key);
38 40
39 @override 41 @override
@@ -487,7 +489,10 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { @@ -487,7 +489,10 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> {
487 489
488 // Map temp = 490 // Map temp =
489 await NavigatorUtil.goMyCustomerListPage( 491 await NavigatorUtil.goMyCustomerListPage(
490 - context, FromPage.FromPageMakeRecord); 492 + context,
  493 + FromPage.FromPageMakeRecord,
  494 + widget.uid,
  495 + );
491 496
492 customerProvider.labels = 497 customerProvider.labels =
493 customerMakingProvider.labels; 498 customerMakingProvider.labels;
@@ -18,9 +18,10 @@ import 'package:one_key/widgets/v_empty_view.dart'; @@ -18,9 +18,10 @@ import 'package:one_key/widgets/v_empty_view.dart';
18 import 'package:provider/provider.dart'; 18 import 'package:provider/provider.dart';
19 19
20 class MyMarketingRecordsDetailPage extends StatefulWidget { 20 class MyMarketingRecordsDetailPage extends StatefulWidget {
  21 + final String uid;
21 final String idstr; 22 final String idstr;
22 final SelfList selfList; 23 final SelfList selfList;
23 - MyMarketingRecordsDetailPage({Key key, this.idstr, this.selfList}) 24 + MyMarketingRecordsDetailPage({Key key, this.idstr, this.selfList, this.uid})
24 : super(key: key); 25 : super(key: key);
25 26
26 @override 27 @override
@@ -205,7 +206,7 @@ class _MyMarketingRecordsDetailPageState @@ -205,7 +206,7 @@ class _MyMarketingRecordsDetailPageState
205 horizontal: ScreenUtil().setWidth(200)), 206 horizontal: ScreenUtil().setWidth(200)),
206 isBold: false, 207 isBold: false,
207 onPressed: () { 208 onPressed: () {
208 - NavigatorUtil.goMyMakeMarkingPage(context, 209 + NavigatorUtil.goMyMakeMarkingPage(context, widget.uid,
209 selfList: widget.selfList, 210 selfList: widget.selfList,
210 fromPage: FromPage.FromPageMakeRecordDetail); 211 fromPage: FromPage.FromPageMakeRecordDetail);
211 }, 212 },
@@ -16,8 +16,9 @@ import 'package:one_key/widgets/system_app_bar.dart'; @@ -16,8 +16,9 @@ import 'package:one_key/widgets/system_app_bar.dart';
16 import 'package:provider/provider.dart'; 16 import 'package:provider/provider.dart';
17 17
18 class MyMarketingRecordsPage extends StatefulWidget { 18 class MyMarketingRecordsPage extends StatefulWidget {
  19 + final String uid;
19 final FromPage fromPage; 20 final FromPage fromPage;
20 - MyMarketingRecordsPage({Key key, this.fromPage}) : super(key: key); 21 + MyMarketingRecordsPage({Key key, this.fromPage, this.uid}) : super(key: key);
21 22
22 @override 23 @override
23 _MyMarketingRecordsPageState createState() => _MyMarketingRecordsPageState(); 24 _MyMarketingRecordsPageState createState() => _MyMarketingRecordsPageState();
@@ -242,7 +243,10 @@ class _MyMarketingRecordsPageState extends State<MyMarketingRecordsPage> { @@ -242,7 +243,10 @@ class _MyMarketingRecordsPageState extends State<MyMarketingRecordsPage> {
242 onTap: () { 243 onTap: () {
243 NavigatorUtil 244 NavigatorUtil
244 .goMyMarketingRecordsDetailPage( 245 .goMyMarketingRecordsDetailPage(
245 - context, data.id, data); 246 + context,
  247 + data.id,
  248 + data,
  249 + widget.uid);
246 }, 250 },
247 child: Text('查看详情', 251 child: Text('查看详情',
248 style: TextStyle( 252 style: TextStyle(
@@ -722,95 +722,101 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> { @@ -722,95 +722,101 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
722 722
723 Widget _managerWidget( 723 Widget _managerWidget(
724 String pnum, String btnTitle, String percent, String detailStr, 724 String pnum, String btnTitle, String percent, String detailStr,
725 - {String uid = ''}) {  
726 - List detailList = detailStr.split('-');  
727 - return Container(  
728 - // width: w(122),  
729 - height: w(116),  
730 - padding: EdgeInsets.symmetric(vertical: w(12), horizontal: w(10)),  
731 - decoration: BoxDecoration(  
732 - color: MyColours.color_ffffff,  
733 - ),  
734 - child: Column(  
735 - children: [  
736 - Align(  
737 - alignment: Alignment.centerLeft,  
738 - child: Container(  
739 - // constraints: BoxConstraints(maxHeight: w(24)),  
740 - padding: EdgeInsets.symmetric(vertical: w(4), horizontal: w(5)),  
741 - decoration: BoxDecoration(  
742 - borderRadius: BorderRadius.circular(r(3)),  
743 - border:  
744 - Border.all(color: MyColours.color_999999, width: w(1))),  
745 - child: Text(  
746 - btnTitle,  
747 - maxLines: 1,  
748 - overflow: TextOverflow.ellipsis,  
749 - style: TextStyle(  
750 - fontSize: font(12),  
751 - fontWeight: FontWeight.bold,  
752 - color: MyColours.color_999999),  
753 - ),  
754 - ),  
755 - ),  
756 - VEmptyView(20),  
757 - Row(  
758 - mainAxisAlignment: MainAxisAlignment.center,  
759 - children: [  
760 - Text(  
761 - pnum,  
762 - style: TextStyle(  
763 - fontSize: font(24),  
764 - fontWeight: FontWeight.bold,  
765 - color: MyColours.color_438E93),  
766 - ),  
767 - Text(  
768 - '位',  
769 - style: TextStyle(  
770 - fontSize: font(14), color: MyColours.color_000000),  
771 - ),  
772 - ], 725 + {String uid = '', GestureTapCallback onTap}) {
  726 + List detailList = detailStr.split('-');
  727 + String firStr = detailList.length > 0 ? detailList[0] : '';
  728 + String secStr = detailList.length > 1 ? detailList[1] : '';
  729 + String thrStr = detailList.length > 2 ? detailList[2] : '';
  730 + return InkWell(
  731 + onTap: onTap,
  732 + child: Container(
  733 + // width: w(122),
  734 + height: w(116),
  735 + padding: EdgeInsets.symmetric(vertical: w(12), horizontal: w(10)),
  736 + decoration: BoxDecoration(
  737 + color: MyColours.color_ffffff,
773 ), 738 ),
774 - VEmptyView(10),  
775 - Row(  
776 - mainAxisAlignment: MainAxisAlignment.center, 739 + child: Column(
777 children: [ 740 children: [
778 - Text(  
779 - '23',  
780 - style: TextStyle(  
781 - fontSize: font(14),  
782 - fontWeight: FontWeight.bold,  
783 - color: MyColours.color_438E93),  
784 - ),  
785 - MyDivider(  
786 - w(4),  
787 - w(1),  
788 - color: MyColours.color_999999,  
789 - ),  
790 - Text(  
791 - '9',  
792 - style: TextStyle(  
793 - fontSize: font(14),  
794 - fontWeight: FontWeight.bold,  
795 - color: MyColours.color_E89243), 741 + Align(
  742 + alignment: Alignment.centerLeft,
  743 + child: Container(
  744 + // constraints: BoxConstraints(maxHeight: w(24)),
  745 + padding:
  746 + EdgeInsets.symmetric(vertical: w(4), horizontal: w(5)),
  747 + decoration: BoxDecoration(
  748 + borderRadius: BorderRadius.circular(r(3)),
  749 + border: Border.all(
  750 + color: MyColours.color_999999, width: w(1))),
  751 + child: Text(
  752 + btnTitle,
  753 + maxLines: 1,
  754 + overflow: TextOverflow.ellipsis,
  755 + style: TextStyle(
  756 + fontSize: font(12),
  757 + fontWeight: FontWeight.bold,
  758 + color: MyColours.color_999999),
  759 + ),
  760 + ),
796 ), 761 ),
797 - MyDivider(  
798 - w(4),  
799 - w(1),  
800 - color: MyColours.color_999999, 762 + VEmptyView(20),
  763 + Row(
  764 + mainAxisAlignment: MainAxisAlignment.center,
  765 + children: [
  766 + Text(
  767 + pnum,
  768 + style: TextStyle(
  769 + fontSize: font(24),
  770 + fontWeight: FontWeight.bold,
  771 + color: MyColours.color_438E93),
  772 + ),
  773 + Text(
  774 + '位',
  775 + style: TextStyle(
  776 + fontSize: font(14), color: MyColours.color_000000),
  777 + ),
  778 + ],
801 ), 779 ),
802 - Text(  
803 - '2',  
804 - style: TextStyle(  
805 - fontSize: font(14),  
806 - fontWeight: FontWeight.bold,  
807 - color: MyColours.color_E34D59), 780 + VEmptyView(10),
  781 + Row(
  782 + mainAxisAlignment: MainAxisAlignment.center,
  783 + children: [
  784 + Text(
  785 + firStr,
  786 + style: TextStyle(
  787 + fontSize: font(14),
  788 + fontWeight: FontWeight.bold,
  789 + color: MyColours.color_438E93),
  790 + ),
  791 + MyDivider(
  792 + w(4),
  793 + w(1),
  794 + color: MyColours.color_999999,
  795 + ),
  796 + Text(
  797 + secStr,
  798 + style: TextStyle(
  799 + fontSize: font(14),
  800 + fontWeight: FontWeight.bold,
  801 + color: MyColours.color_E89243),
  802 + ),
  803 + MyDivider(
  804 + w(4),
  805 + w(1),
  806 + color: MyColours.color_999999,
  807 + ),
  808 + Text(
  809 + thrStr,
  810 + style: TextStyle(
  811 + fontSize: font(14),
  812 + fontWeight: FontWeight.bold,
  813 + color: MyColours.color_E34D59),
  814 + ),
  815 + ],
808 ), 816 ),
809 ], 817 ],
810 ), 818 ),
811 - ],  
812 - ),  
813 - ); 819 + ));
814 } 820 }
815 821
816 @override 822 @override
@@ -958,7 +964,12 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> { @@ -958,7 +964,12 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
958 '${widget.customerProvider.storeSunmodel.distribution}', 964 '${widget.customerProvider.storeSunmodel.distribution}',
959 '未分配经理', 965 '未分配经理',
960 null, 966 null,
961 - '2-2-2'); 967 + '${widget.customerProvider.storeSunmodel.distributionStr}',
  968 + onTap: () {
  969 + NavigatorUtil.goCustomerListPage(
  970 + context, FromPage.FromPageHome, '',
  971 + index: '0', distribution: true);
  972 + });
962 } 973 }
963 974
964 return _managerWidget( 975 return _managerWidget(
@@ -971,7 +982,14 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> { @@ -971,7 +982,14 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
971 null, 982 null,
972 '${widget.customerProvider.storeSunmodel.sellerUser[index - 1].detailStr}', 983 '${widget.customerProvider.storeSunmodel.sellerUser[index - 1].detailStr}',
973 uid: widget.customerProvider.storeSunmodel 984 uid: widget.customerProvider.storeSunmodel
974 - .sellerUser[index - 1].uid); 985 + .sellerUser[index - 1].uid, onTap: () {
  986 + NavigatorUtil.goCustomerListPage(
  987 + context,
  988 + FromPage.FromPageHome,
  989 + widget.customerProvider.storeSunmodel
  990 + .sellerUser[index - 1].uid,
  991 + index: '0');
  992 + });
975 }), 993 }),
976 VEmptyView(10), 994 VEmptyView(10),
977 ListView.builder( 995 ListView.builder(
@@ -138,16 +138,28 @@ class _StoreCustomerHomeRightPageState @@ -138,16 +138,28 @@ class _StoreCustomerHomeRightPageState
138 138
139 ///我的客户首页 139 ///我的客户首页
140 _getGuestManageData({bool isShowLoading = true}) async { 140 _getGuestManageData({bool isShowLoading = true}) async {
  141 + String uid = '';
  142 + menuTitle.forEach((element) {
  143 + if (element.select) {
  144 + uid = element.uid;
  145 + }
  146 + });
141 GuestManageSunModel model = await widget.customerProvider 147 GuestManageSunModel model = await widget.customerProvider
142 - .getGuestManageData(context, isShowLoading: isShowLoading); 148 + .getGuestManageData(context, uid, isShowLoading: isShowLoading);
143 // setState(() {}); 149 // setState(() {});
144 } 150 }
145 151
146 ///消费券 152 ///消费券
147 _couponNetworkData({bool isShowLoading = true}) async { 153 _couponNetworkData({bool isShowLoading = true}) async {
148 // customerMakingProvider.couponSelectIndex = 0; 154 // customerMakingProvider.couponSelectIndex = 0;
  155 + String uid = '';
  156 + menuTitle.forEach((element) {
  157 + if (element.select) {
  158 + uid = element.uid;
  159 + }
  160 + });
149 Map<String, String> params = { 161 Map<String, String> params = {
150 - "uid": Provider.of<UserModel>(context, listen: false).user.openid, 162 + "uid": uid,
151 }; 163 };
152 await widget.customerProvider.getCustomerSelectActivityNew(context, params, 164 await widget.customerProvider.getCustomerSelectActivityNew(context, params,
153 isShowLoading: isShowLoading); 165 isShowLoading: isShowLoading);
@@ -166,9 +178,13 @@ class _StoreCustomerHomeRightPageState @@ -166,9 +178,13 @@ class _StoreCustomerHomeRightPageState
166 } 178 }
167 179
168 _getMarketingByUid() async { 180 _getMarketingByUid() async {
169 - Map<String, String> params = {  
170 - "uid": Provider.of<UserModel>(context, listen: false).user.openid  
171 - }; 181 + String uid = '';
  182 + menuTitle.forEach((element) {
  183 + if (element.select) {
  184 + uid = element.uid;
  185 + }
  186 + });
  187 + Map<String, String> params = {"uid": uid};
172 // await widget.customerProvider.getMarketingByUid(context, params); 188 // await widget.customerProvider.getMarketingByUid(context, params);
173 189
174 MarketingByUidsSunModel myRecordData = 190 MarketingByUidsSunModel myRecordData =
@@ -281,8 +297,14 @@ class _StoreCustomerHomeRightPageState @@ -281,8 +297,14 @@ class _StoreCustomerHomeRightPageState
281 } else if (btnTitle == '120天未到店') { 297 } else if (btnTitle == '120天未到店') {
282 index = '3'; 298 index = '3';
283 } 299 }
  300 + String uid = '';
  301 + menuTitle.forEach((element) {
  302 + if (element.select) {
  303 + uid = element.uid;
  304 + }
  305 + });
284 NavigatorUtil.goMyCustomerListPage( 306 NavigatorUtil.goMyCustomerListPage(
285 - context, FromPage.FromPageMyCustomer, 307 + context, FromPage.FromPageMyCustomer, uid,
286 index: index); 308 index: index);
287 }, 309 },
288 child: Container( 310 child: Container(
@@ -326,8 +348,14 @@ class _StoreCustomerHomeRightPageState @@ -326,8 +348,14 @@ class _StoreCustomerHomeRightPageState
326 } else if (btnTitle == '120天未到店') { 348 } else if (btnTitle == '120天未到店') {
327 index = '3'; 349 index = '3';
328 } 350 }
  351 + String uid = '';
  352 + menuTitle.forEach((element) {
  353 + if (element.select) {
  354 + uid = element.uid;
  355 + }
  356 + });
329 NavigatorUtil.goMyCustomerListPage( 357 NavigatorUtil.goMyCustomerListPage(
330 - context, FromPage.FromPageMyCustomer, 358 + context, FromPage.FromPageMyCustomer, uid,
331 index: index); 359 index: index);
332 }, 360 },
333 text: btnTitle, 361 text: btnTitle,
@@ -363,509 +391,562 @@ class _StoreCustomerHomeRightPageState @@ -363,509 +391,562 @@ class _StoreCustomerHomeRightPageState
363 // EventBus().emit('changeStatusColor'); 391 // EventBus().emit('changeStatusColor');
364 // Navigator.pop(context); 392 // Navigator.pop(context);
365 // }), 393 // }),
366 - body: WillPopScope(onWillPop: () async {  
367 - EventBus().emit('changeStatusColor');  
368 - return true;  
369 - }, child: Consumer<CustomerProvider>(builder: (context, model, _) {  
370 - if (model.pageStateMyHome != PageState.Success) {  
371 - return ExceptionPage(  
372 - pageState: model.pageStateMyHome,  
373 - callback: () {  
374 - _getSellerCountsList();  
375 - },  
376 - emptyMsg: "暂时没有我的客情哦",  
377 - emptyImg: "empty_search",  
378 - showMsg: "加载中，请稍后...",  
379 - );  
380 - } else {  
381 - return Column(children: [  
382 - Container(  
383 - color: MyColours.color_ffffff,  
384 - height: ScreenUtil().setWidth(70),  
385 - padding: EdgeInsets.only(bottom: w(12)),  
386 - margin: EdgeInsets.only(bottom: ScreenUtil().setWidth(10)),  
387 - child: Row(  
388 - children: [  
389 - HEmptyView(48),  
390 - Expanded(  
391 - child: SizedBox(  
392 - // height: ScreenUtil().setWidth(30),  
393 - child: ListView.builder(  
394 - itemCount: menuTitle.length,  
395 - shrinkWrap: true,  
396 - controller: _controller,  
397 - scrollDirection: Axis.horizontal,  
398 - itemBuilder: (BuildContext contxt, int index) {  
399 - return InkWell(  
400 - onTap: () {  
401 - for (MessageMenuModel item in menuTitle) {  
402 - item.select = false;  
403 - }  
404 - menuTitle[index].select = true;  
405 - setState(() {});  
406 - _getSellerCountsList(  
407 - isShowLoading: true, callback: () {});  
408 - // offset = 0;  
409 - // 1提前点餐/2内部预订/10在线预订/15店内消息传/12在线买单 394 + body: WillPopScope(
  395 + onWillPop: () async {
  396 + EventBus().emit('changeStatusColor');
  397 + return true;
  398 + },
  399 + child: Column(children: [
  400 + Container(
  401 + color: MyColours.color_ffffff,
  402 + height: ScreenUtil().setWidth(70),
  403 + padding: EdgeInsets.only(bottom: w(12)),
  404 + margin: EdgeInsets.only(bottom: ScreenUtil().setWidth(10)),
  405 + child: Row(
  406 + children: [
  407 + HEmptyView(48),
  408 + Expanded(
  409 + child: SizedBox(
  410 + // height: ScreenUtil().setWidth(30),
  411 + child: ListView.builder(
  412 + itemCount: menuTitle.length,
  413 + shrinkWrap: true,
  414 + controller: _controller,
  415 + scrollDirection: Axis.horizontal,
  416 + itemBuilder: (BuildContext contxt, int index) {
  417 + return InkWell(
  418 + onTap: () {
  419 + for (MessageMenuModel item in menuTitle) {
  420 + item.select = false;
  421 + }
  422 + menuTitle[index].select = true;
  423 + setState(() {});
  424 + _getMarketingByUid();
  425 + // _getSellerCountsList();
  426 + _getSellerCountsList(
  427 + isShowLoading: true, callback: () {});
  428 + _couponNetworkData();
410 429
411 - // if (index == 0) {  
412 - // typeid = '';  
413 - // } else if (index == 1) {  
414 - // //店内消息  
415 - // typeid = '15';  
416 - // } else if (index == 2) {  
417 - // //在线预订  
418 - // typeid = '10';  
419 - // } else if (index == 3) {  
420 - // //提前点餐  
421 - // typeid = '1';  
422 - // } else if (index == 4) {  
423 - // //在线买单  
424 - // typeid = '12';  
425 - // } else if (index == 5) {  
426 - // //会员充值  
427 - // typeid = '17';  
428 - // } else if (index == 6) {  
429 - // //存酒超期  
430 - // typeid = '18';  
431 - // }  
432 - // getMessage(typeid, showLoading: true);  
433 - },  
434 - child: Container(  
435 - // width: ScreenUtil().setWidth(104 * 2), 430 + // offset = 0;
  431 + // 1提前点餐/2内部预订/10在线预订/15店内消息传/12在线买单
436 432
437 - margin: EdgeInsets.only(  
438 - right: ScreenUtil().setWidth(30),  
439 - ),  
440 - padding: EdgeInsets.symmetric(  
441 - horizontal: ScreenUtil().setWidth(10),  
442 - vertical: ScreenUtil().setWidth(4)),  
443 - alignment: Alignment.center,  
444 - decoration: BoxDecoration(  
445 - borderRadius: BorderRadius.circular(  
446 - ScreenUtil().setWidth(10)),  
447 - // color: menuTitle[index].select  
448 - // ? MyColours.color_438E93  
449 - // : MyColours.color_999999,  
450 - border: Border.all(  
451 - color: menuTitle[index].select  
452 - ? MyColours.color_438E93  
453 - : MyColours.color_999999,  
454 - width: ScreenUtil().setWidth(2))),  
455 - child: Text(  
456 - menuTitle[index].title,  
457 - overflow: TextOverflow.ellipsis,  
458 - style: TextStyle(  
459 - color: menuTitle[index].select  
460 - ? MyColours.color_438E93  
461 - : MyColours.color_999999,  
462 - fontSize: ScreenUtil().setSp(24),  
463 - decoration: TextDecoration.none,  
464 - fontWeight: FontWeight.normal),  
465 - ),  
466 - ),  
467 - );  
468 - })))  
469 - ],  
470 - ),  
471 - ),  
472 - Expanded(  
473 - child: SingleChildScrollView(  
474 - controller: _controller,  
475 - child: Column(  
476 - children: [  
477 - // VEmptyView(10),  
478 - InkWell(  
479 - onTap: () {  
480 - NavigatorUtil.goMyCustomerListPage(  
481 - context, FromPage.FromPageMyCustomer);  
482 - },  
483 - child: Container(  
484 - height: w(80),  
485 - color: MyColours.color_ffffff,  
486 - child: Row(  
487 - mainAxisAlignment: MainAxisAlignment.center,  
488 - children: [  
489 - // Text(  
490 - // '累计',  
491 - // style: TextStyle(  
492 - // color: MyColours.color_515151,  
493 - // fontWeight: FontWeight.bold,  
494 - // fontSize: ScreenUtil().setSp(32)),  
495 - // ),  
496 - Text(  
497 - '${widget.customerProvider.guestSunmodel.myCustomer}',  
498 - style: TextStyle(  
499 - color: MyColours.color_199095,  
500 - fontSize: ScreenUtil().setSp(64),  
501 - fontWeight: FontWeight.bold),  
502 - ),  
503 - Text(  
504 - '位',  
505 - style: TextStyle(  
506 - color: MyColours.color_515151,  
507 - fontWeight: FontWeight.bold,  
508 - fontSize: ScreenUtil().setSp(32)),  
509 - )  
510 - ],  
511 - ),  
512 - )),  
513 - VEmptyView(10),  
514 - // GridView.builder(  
515 - // controller: _controller,  
516 - // shrinkWrap: true,  
517 - // cacheExtent: ScreenUtil().setWidth(0),  
518 - // itemCount: 3,  
519 - // gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(  
520 - // crossAxisCount: 3,  
521 - // childAspectRatio: 1,  
522 - // mainAxisSpacing: ScreenUtil().setWidth(10),  
523 - // crossAxisSpacing: ScreenUtil().setWidth(10)),  
524 - // itemBuilder: (BuildContext context, int index) {  
525 - // // locationState = state;  
526 - // return _percentWidget(  
527 - // '${widget.customerProvider.guestSunmodel.active.count}',  
528 - // '活跃客户',  
529 - // '${widget.customerProvider.guestSunmodel.active.scale}');  
530 - // }),  
531 - Row(  
532 - children: [  
533 - _percentWidget(  
534 - '${widget.customerProvider.guestSunmodel.active.count}',  
535 - '活跃',  
536 - '${widget.customerProvider.guestSunmodel.active.scale}'),  
537 - HEmptyView(10),  
538 - _percentWidget(  
539 - '${widget.customerProvider.guestSunmodel.sleep.count}',  
540 - '60天未到店',  
541 - '${widget.customerProvider.guestSunmodel.sleep.scale}'),  
542 - HEmptyView(10),  
543 - _percentWidget(  
544 - '${widget.customerProvider.guestSunmodel.drain.count}',  
545 - '120天未到店',  
546 - '${widget.customerProvider.guestSunmodel.drain.scale}'), 433 + // if (index == 0) {
  434 + // typeid = '';
  435 + // } else if (index == 1) {
  436 + // //店内消息
  437 + // typeid = '15';
  438 + // } else if (index == 2) {
  439 + // //在线预订
  440 + // typeid = '10';
  441 + // } else if (index == 3) {
  442 + // //提前点餐
  443 + // typeid = '1';
  444 + // } else if (index == 4) {
  445 + // //在线买单
  446 + // typeid = '12';
  447 + // } else if (index == 5) {
  448 + // //会员充值
  449 + // typeid = '17';
  450 + // } else if (index == 6) {
  451 + // //存酒超期
  452 + // typeid = '18';
  453 + // }
  454 + // getMessage(typeid, showLoading: true);
  455 + },
  456 + child: Container(
  457 + // width: ScreenUtil().setWidth(104 * 2),
  458 +
  459 + margin: EdgeInsets.only(
  460 + right: ScreenUtil().setWidth(30),
  461 + ),
  462 + padding: EdgeInsets.symmetric(
  463 + horizontal: ScreenUtil().setWidth(10),
  464 + vertical: ScreenUtil().setWidth(4)),
  465 + alignment: Alignment.center,
  466 + decoration: BoxDecoration(
  467 + borderRadius: BorderRadius.circular(
  468 + ScreenUtil().setWidth(10)),
  469 + // color: menuTitle[index].select
  470 + // ? MyColours.color_438E93
  471 + // : MyColours.color_999999,
  472 + border: Border.all(
  473 + color: menuTitle[index].select
  474 + ? MyColours.color_438E93
  475 + : MyColours.color_999999,
  476 + width: ScreenUtil().setWidth(2))),
  477 + child: Text(
  478 + menuTitle[index].title,
  479 + overflow: TextOverflow.ellipsis,
  480 + style: TextStyle(
  481 + color: menuTitle[index].select
  482 + ? MyColours.color_438E93
  483 + : MyColours.color_999999,
  484 + fontSize: ScreenUtil().setSp(24),
  485 + decoration: TextDecoration.none,
  486 + fontWeight: FontWeight.normal),
  487 + ),
  488 + ),
  489 + );
  490 + })))
547 ], 491 ],
548 ), 492 ),
549 - ListView.builder( 493 + ),
  494 + Consumer<CustomerProvider>(builder: (context, model, _) {
  495 + if (model.pageStateMyHome != PageState.Success) {
  496 + return Expanded(
  497 + child: ExceptionPage(
  498 + pageState: model.pageStateMyHome,
  499 + callback: () {
  500 + _couponNetworkData();
  501 +
  502 + _getMarketingByUid();
  503 + _getSellerCountsList();
  504 + },
  505 + emptyMsg: "暂时没有我的客情哦",
  506 + emptyImg: "empty_search",
  507 + showMsg: "加载中，请稍后...",
  508 + ));
  509 + } else {
  510 + return Expanded(
  511 + child: SingleChildScrollView(
550 controller: _controller, 512 controller: _controller,
551 - shrinkWrap: true,  
552 - cacheExtent: ScreenUtil().setWidth(0),  
553 - itemCount:  
554 - widget.customerProvider.guestSunmodel.tips.task ==  
555 - null ||  
556 - widget.customerProvider.guestSunmodel.tips.task  
557 - .length ==  
558 - 0  
559 - ? 0  
560 - : widget.customerProvider.guestSunmodel.tips.task  
561 - .length,  
562 - itemBuilder: (BuildContext context, int index) {  
563 - // locationState = state;  
564 - Task data = widget  
565 - .customerProvider.guestSunmodel.tips.task[index];  
566 - return Column(  
567 - children: [  
568 - VEmptyView(10),  
569 - Container(  
570 - color: MyColours.color_ffffff,  
571 - padding: EdgeInsets.symmetric(  
572 - horizontal: ScreenUtil().setWidth(20),  
573 - vertical: ScreenUtil().setWidth(30)),  
574 - child: Row(  
575 - children: [  
576 - Image.asset(  
577 - Utils.getImgPath('warning'),  
578 - width: ScreenUtil().setWidth(42),  
579 - ),  
580 - HEmptyView(15),  
581 - Expanded(  
582 - child: Column(  
583 - crossAxisAlignment: CrossAxisAlignment.start,  
584 - children: [  
585 - Text(  
586 - '店内任务：${data.content}',  
587 - maxLines: 1,  
588 - overflow: TextOverflow.ellipsis,  
589 - style: TextStyle(  
590 - color: MyColours.color_333333,  
591 - fontSize: ScreenUtil().setSp(32)),  
592 - ),  
593 - data.aid != null && data.aidStr != null  
594 - ? Padding(  
595 - padding: EdgeInsets.only(  
596 - top: ScreenUtil().setWidth(8)),  
597 - child: Text(  
598 - '优惠内容:${data.aidStr}', 513 + child: Column(
  514 + children: [
  515 + // VEmptyView(10),
  516 + InkWell(
  517 + onTap: () {
  518 + String uid = '';
  519 + menuTitle.forEach((element) {
  520 + if (element.select) {
  521 + uid = element.uid;
  522 + }
  523 + });
  524 + NavigatorUtil.goMyCustomerListPage(
  525 + context, FromPage.FromPageMyCustomer, uid);
  526 + },
  527 + child: Container(
  528 + height: w(80),
  529 + color: MyColours.color_ffffff,
  530 + child: Row(
  531 + mainAxisAlignment: MainAxisAlignment.center,
  532 + children: [
  533 + // Text(
  534 + // '累计',
  535 + // style: TextStyle(
  536 + // color: MyColours.color_515151,
  537 + // fontWeight: FontWeight.bold,
  538 + // fontSize: ScreenUtil().setSp(32)),
  539 + // ),
  540 + Text(
  541 + '${widget.customerProvider.guestSunmodel.myCustomer}',
  542 + style: TextStyle(
  543 + color: MyColours.color_199095,
  544 + fontSize: ScreenUtil().setSp(64),
  545 + fontWeight: FontWeight.bold),
  546 + ),
  547 + Text(
  548 + '位',
  549 + style: TextStyle(
  550 + color: MyColours.color_515151,
  551 + fontWeight: FontWeight.bold,
  552 + fontSize: ScreenUtil().setSp(32)),
  553 + )
  554 + ],
  555 + ),
  556 + )),
  557 + VEmptyView(10),
  558 + // GridView.builder(
  559 + // controller: _controller,
  560 + // shrinkWrap: true,
  561 + // cacheExtent: ScreenUtil().setWidth(0),
  562 + // itemCount: 3,
  563 + // gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
  564 + // crossAxisCount: 3,
  565 + // childAspectRatio: 1,
  566 + // mainAxisSpacing: ScreenUtil().setWidth(10),
  567 + // crossAxisSpacing: ScreenUtil().setWidth(10)),
  568 + // itemBuilder: (BuildContext context, int index) {
  569 + // // locationState = state;
  570 + // return _percentWidget(
  571 + // '${widget.customerProvider.guestSunmodel.active.count}',
  572 + // '活跃客户',
  573 + // '${widget.customerProvider.guestSunmodel.active.scale}');
  574 + // }),
  575 + Row(
  576 + children: [
  577 + _percentWidget(
  578 + '${widget.customerProvider.guestSunmodel.active.count}',
  579 + '活跃',
  580 + '${widget.customerProvider.guestSunmodel.active.scale}'),
  581 + HEmptyView(10),
  582 + _percentWidget(
  583 + '${widget.customerProvider.guestSunmodel.sleep.count}',
  584 + '60天未到店',
  585 + '${widget.customerProvider.guestSunmodel.sleep.scale}'),
  586 + HEmptyView(10),
  587 + _percentWidget(
  588 + '${widget.customerProvider.guestSunmodel.drain.count}',
  589 + '120天未到店',
  590 + '${widget.customerProvider.guestSunmodel.drain.scale}'),
  591 + ],
  592 + ),
  593 + ListView.builder(
  594 + controller: _controller,
  595 + shrinkWrap: true,
  596 + cacheExtent: ScreenUtil().setWidth(0),
  597 + itemCount: widget.customerProvider.guestSunmodel
  598 + .tips.task ==
  599 + null ||
  600 + widget.customerProvider.guestSunmodel.tips
  601 + .task.length ==
  602 + 0
  603 + ? 0
  604 + : widget.customerProvider.guestSunmodel.tips
  605 + .task.length,
  606 + itemBuilder: (BuildContext context, int index) {
  607 + // locationState = state;
  608 + Task data = widget.customerProvider.guestSunmodel
  609 + .tips.task[index];
  610 + return Column(
  611 + children: [
  612 + VEmptyView(10),
  613 + Container(
  614 + color: MyColours.color_ffffff,
  615 + padding: EdgeInsets.symmetric(
  616 + horizontal: ScreenUtil().setWidth(20),
  617 + vertical: ScreenUtil().setWidth(30)),
  618 + child: Row(
  619 + children: [
  620 + Image.asset(
  621 + Utils.getImgPath('warning'),
  622 + width: ScreenUtil().setWidth(42),
  623 + ),
  624 + HEmptyView(15),
  625 + Expanded(
  626 + child: Column(
  627 + crossAxisAlignment:
  628 + CrossAxisAlignment.start,
  629 + children: [
  630 + Text(
  631 + '店内任务：${data.content}',
599 maxLines: 1, 632 maxLines: 1,
600 overflow: TextOverflow.ellipsis, 633 overflow: TextOverflow.ellipsis,
601 style: TextStyle( 634 style: TextStyle(
602 color: MyColours.color_333333, 635 color: MyColours.color_333333,
603 fontSize: 636 fontSize:
604 - ScreenUtil().setSp(24)), 637 + ScreenUtil().setSp(32)),
605 ), 638 ),
606 - )  
607 - : SizedBox(),  
608 - VEmptyView(8),  
609 - Text(  
610 - '创建人：${data.createUser}',  
611 - maxLines: 1,  
612 - overflow: TextOverflow.ellipsis,  
613 - style: TextStyle(  
614 - color: MyColours.color_333333,  
615 - fontSize: ScreenUtil().setSp(26)),  
616 - )  
617 - ],  
618 - )),  
619 - HEmptyView(20),  
620 - Column(children: [  
621 - RoundButton(  
622 - text: '立即完成', 639 + data.aid != null &&
  640 + data.aidStr != null
  641 + ? Padding(
  642 + padding: EdgeInsets.only(
  643 + top: ScreenUtil()
  644 + .setWidth(8)),
  645 + child: Text(
  646 + '优惠内容:${data.aidStr}',
  647 + maxLines: 1,
  648 + overflow:
  649 + TextOverflow.ellipsis,
  650 + style: TextStyle(
  651 + color: MyColours
  652 + .color_333333,
  653 + fontSize: ScreenUtil()
  654 + .setSp(24)),
  655 + ),
  656 + )
  657 + : SizedBox(),
  658 + VEmptyView(8),
  659 + Text(
  660 + '创建人：${data.createUser}',
  661 + maxLines: 1,
  662 + overflow: TextOverflow.ellipsis,
  663 + style: TextStyle(
  664 + color: MyColours.color_333333,
  665 + fontSize:
  666 + ScreenUtil().setSp(26)),
  667 + )
  668 + ],
  669 + )),
  670 + HEmptyView(20),
  671 + Column(children: [
  672 + RoundButton(
  673 + text: '立即完成',
623 674
624 - padding: EdgeInsets.symmetric(  
625 - horizontal: ScreenUtil().setWidth(26)),  
626 - gradientStart: MyColours.color_199095,  
627 - gradientEnd: MyColours.color_199095,  
628 - // borderColor: MyColours.color_999999,  
629 - radius: ScreenUtil().setWidth(40),  
630 - height: ScreenUtil().setWidth(64),  
631 - width: ScreenUtil().setWidth(180),  
632 - fontSize: 26,  
633 - isBold: false,  
634 - onPressed: () {  
635 - SellerList sellerList =  
636 - SellerList.fromJson(  
637 - json.decode(json.encode(data)));  
638 - NavigatorUtil.goMyMakeMarkingPageOnlyShow(  
639 - context, sellerList);  
640 - }, 675 + padding: EdgeInsets.symmetric(
  676 + horizontal:
  677 + ScreenUtil().setWidth(26)),
  678 + gradientStart:
  679 + MyColours.color_199095,
  680 + gradientEnd: MyColours.color_199095,
  681 + // borderColor: MyColours.color_999999,
  682 + radius: ScreenUtil().setWidth(40),
  683 + height: ScreenUtil().setWidth(64),
  684 + width: ScreenUtil().setWidth(180),
  685 + fontSize: 26,
  686 + isBold: false,
  687 + onPressed: () {
  688 + SellerList sellerList =
  689 + SellerList.fromJson(
  690 + json.decode(
  691 + json.encode(data)));
  692 + NavigatorUtil
  693 + .goMyMakeMarkingPageOnlyShow(
  694 + context, sellerList);
  695 + },
  696 + ),
  697 + data.remainingTime != null
  698 + ? Padding(
  699 + padding: EdgeInsets.only(
  700 + top: ScreenUtil()
  701 + .setWidth(6)),
  702 + child: Text(
  703 + '${data.remainingTime}天内',
  704 + maxLines: 1,
  705 + overflow:
  706 + TextOverflow.ellipsis,
  707 + style: TextStyle(
  708 + color: Color.fromRGBO(
  709 + 215, 30, 40, 1),
  710 + fontSize: ScreenUtil()
  711 + .setSp(26)),
  712 + ))
  713 + : SizedBox()
  714 + ])
  715 + ],
  716 + ),
641 ), 717 ),
642 - data.remainingTime != null  
643 - ? Padding(  
644 - padding: EdgeInsets.only(  
645 - top: ScreenUtil().setWidth(6)),  
646 - child: Text(  
647 - '${data.remainingTime}天内',  
648 - maxLines: 1,  
649 - overflow: TextOverflow.ellipsis,  
650 - style: TextStyle(  
651 - color: Color.fromRGBO(  
652 - 215, 30, 40, 1),  
653 - fontSize:  
654 - ScreenUtil().setSp(26)),  
655 - ))  
656 - : SizedBox()  
657 - ])  
658 - ],  
659 - ),  
660 - ),  
661 - ],  
662 - );  
663 - }),  
664 - ListView.builder(  
665 - controller: _controller,  
666 - shrinkWrap: true,  
667 - cacheExtent: ScreenUtil().setWidth(0),  
668 - itemCount:  
669 - widget.customerProvider.guestSunmodel.tips.recover ==  
670 - null ||  
671 - widget.customerProvider.guestSunmodel.tips  
672 - .recover.length ==  
673 - 0  
674 - ? 0  
675 - : 1,  
676 - itemBuilder: (BuildContext context, int index) {  
677 - // locationState = state; 718 + ],
  719 + );
  720 + }),
  721 + ListView.builder(
  722 + controller: _controller,
  723 + shrinkWrap: true,
  724 + cacheExtent: ScreenUtil().setWidth(0),
  725 + itemCount: widget.customerProvider.guestSunmodel
  726 + .tips.recover ==
  727 + null ||
  728 + widget.customerProvider.guestSunmodel.tips
  729 + .recover.length ==
  730 + 0
  731 + ? 0
  732 + : 1,
  733 + itemBuilder: (BuildContext context, int index) {
  734 + // locationState = state;
678 735
679 - return Column(  
680 - children: [  
681 - VEmptyView(10),  
682 - Container(  
683 - color: MyColours.color_ffffff,  
684 - padding: EdgeInsets.symmetric(  
685 - horizontal: ScreenUtil().setWidth(20),  
686 - vertical: ScreenUtil().setWidth(30)),  
687 - child: Row(  
688 - children: [  
689 - Image.asset(  
690 - Utils.getImgPath('warning'),  
691 - width: ScreenUtil().setWidth(42),  
692 - ),  
693 - HEmptyView(15),  
694 - Expanded(  
695 - child: Text(  
696 - '${widget.customerProvider.guestSunmodel.tips.recover[0]}',  
697 - maxLines: 10,  
698 - overflow: TextOverflow.ellipsis,  
699 - style: TextStyle(  
700 - color: MyColours.color_333333,  
701 - fontSize: ScreenUtil().setSp(32)),  
702 - )),  
703 - HEmptyView(20),  
704 - RoundButton(  
705 - text: '一键追回',  
706 - padding: EdgeInsets.symmetric(  
707 - horizontal: ScreenUtil().setWidth(26)),  
708 - gradientStart: MyColours.color_199095,  
709 - gradientEnd: MyColours.color_199095,  
710 - // borderColor: MyColours.color_999999,  
711 - radius: ScreenUtil().setWidth(40),  
712 - height: ScreenUtil().setWidth(64),  
713 - width: ScreenUtil().setWidth(180),  
714 - fontSize: 26,  
715 - isBold: false,  
716 - onPressed: () {  
717 - NavigatorUtil.goMyMakeMarkingPage(context,  
718 - fromPage: FromPage.FromPageMyCustomer,  
719 - homeGid: Utils.listToStringEnglish1(  
720 - widget  
721 - .customerProvider  
722 - .guestSunmodel  
723 - .tips  
724 - .recover[1]));  
725 - },  
726 - ),  
727 - ],  
728 - ),  
729 - ),  
730 - ],  
731 - );  
732 - }),  
733 - ListView.builder(  
734 - controller: _controller,  
735 - shrinkWrap: true,  
736 - cacheExtent: ScreenUtil().setWidth(0),  
737 - itemCount:  
738 - widget.customerProvider.guestSunmodel.tips.awaken ==  
739 - null ||  
740 - widget.customerProvider.guestSunmodel.tips  
741 - .awaken.length ==  
742 - 0  
743 - ? 0  
744 - : 1,  
745 - itemBuilder: (BuildContext context, int index) {  
746 - // locationState = state; 736 + return Column(
  737 + children: [
  738 + VEmptyView(10),
  739 + Container(
  740 + color: MyColours.color_ffffff,
  741 + padding: EdgeInsets.symmetric(
  742 + horizontal: ScreenUtil().setWidth(20),
  743 + vertical: ScreenUtil().setWidth(30)),
  744 + child: Row(
  745 + children: [
  746 + Image.asset(
  747 + Utils.getImgPath('warning'),
  748 + width: ScreenUtil().setWidth(42),
  749 + ),
  750 + HEmptyView(15),
  751 + Expanded(
  752 + child: Text(
  753 + '${widget.customerProvider.guestSunmodel.tips.recover[0]}',
  754 + maxLines: 10,
  755 + overflow: TextOverflow.ellipsis,
  756 + style: TextStyle(
  757 + color: MyColours.color_333333,
  758 + fontSize: ScreenUtil().setSp(32)),
  759 + )),
  760 + HEmptyView(20),
  761 + RoundButton(
  762 + text: '一键追回',
  763 + padding: EdgeInsets.symmetric(
  764 + horizontal:
  765 + ScreenUtil().setWidth(26)),
  766 + gradientStart: MyColours.color_199095,
  767 + gradientEnd: MyColours.color_199095,
  768 + // borderColor: MyColours.color_999999,
  769 + radius: ScreenUtil().setWidth(40),
  770 + height: ScreenUtil().setWidth(64),
  771 + width: ScreenUtil().setWidth(180),
  772 + fontSize: 26,
  773 + isBold: false,
  774 + onPressed: () {
  775 + String uid = '';
  776 + menuTitle.forEach((element) {
  777 + if (element.select) {
  778 + uid = element.uid;
  779 + }
  780 + });
  781 + NavigatorUtil.goMyMakeMarkingPage(
  782 + context, uid,
  783 + fromPage: FromPage
  784 + .FromPageMyCustomer,
  785 + homeGid:
  786 + Utils.listToStringEnglish1(
  787 + widget
  788 + .customerProvider
  789 + .guestSunmodel
  790 + .tips
  791 + .recover[1]));
  792 + },
  793 + ),
  794 + ],
  795 + ),
  796 + ),
  797 + ],
  798 + );
  799 + }),
  800 + ListView.builder(
  801 + controller: _controller,
  802 + shrinkWrap: true,
  803 + cacheExtent: ScreenUtil().setWidth(0),
  804 + itemCount: widget.customerProvider.guestSunmodel
  805 + .tips.awaken ==
  806 + null ||
  807 + widget.customerProvider.guestSunmodel.tips
  808 + .awaken.length ==
  809 + 0
  810 + ? 0
  811 + : 1,
  812 + itemBuilder: (BuildContext context, int index) {
  813 + // locationState = state;
747 814
748 - return Column(  
749 - children: [  
750 - VEmptyView(10),  
751 - Container(  
752 - color: MyColours.color_ffffff,  
753 - padding: EdgeInsets.symmetric(  
754 - horizontal: ScreenUtil().setWidth(20),  
755 - vertical: ScreenUtil().setWidth(30)),  
756 - child: Row(  
757 - children: [  
758 - Image.asset(  
759 - Utils.getImgPath('warning'),  
760 - width: ScreenUtil().setWidth(42),  
761 - ),  
762 - HEmptyView(15),  
763 - Expanded(  
764 - child: Text(  
765 - '${widget.customerProvider.guestSunmodel.tips.awaken[0]}',  
766 - maxLines: 10,  
767 - overflow: TextOverflow.ellipsis,  
768 - style: TextStyle(  
769 - color: MyColours.color_333333,  
770 - fontSize: ScreenUtil().setSp(32)),  
771 - )),  
772 - HEmptyView(20),  
773 - RoundButton(  
774 - text: '一键唤醒',  
775 - padding: EdgeInsets.symmetric(  
776 - horizontal: ScreenUtil().setWidth(26)),  
777 - gradientStart: MyColours.color_199095,  
778 - gradientEnd: MyColours.color_199095,  
779 - // borderColor: MyColours.color_999999,  
780 - radius: ScreenUtil().setWidth(40),  
781 - height: ScreenUtil().setWidth(64),  
782 - width: ScreenUtil().setWidth(180),  
783 - fontSize: 26,  
784 - isBold: false,  
785 - onPressed: () {  
786 - NavigatorUtil.goMyMakeMarkingPage(context,  
787 - fromPage: FromPage.FromPageMyCustomer,  
788 - homeGid: Utils.listToStringEnglish1(  
789 - widget.customerProvider  
790 - .guestSunmodel.tips.awaken[1])); 815 + return Column(
  816 + children: [
  817 + VEmptyView(10),
  818 + Container(
  819 + color: MyColours.color_ffffff,
  820 + padding: EdgeInsets.symmetric(
  821 + horizontal: ScreenUtil().setWidth(20),
  822 + vertical: ScreenUtil().setWidth(30)),
  823 + child: Row(
  824 + children: [
  825 + Image.asset(
  826 + Utils.getImgPath('warning'),
  827 + width: ScreenUtil().setWidth(42),
  828 + ),
  829 + HEmptyView(15),
  830 + Expanded(
  831 + child: Text(
  832 + '${widget.customerProvider.guestSunmodel.tips.awaken[0]}',
  833 + maxLines: 10,
  834 + overflow: TextOverflow.ellipsis,
  835 + style: TextStyle(
  836 + color: MyColours.color_333333,
  837 + fontSize: ScreenUtil().setSp(32)),
  838 + )),
  839 + HEmptyView(20),
  840 + RoundButton(
  841 + text: '一键唤醒',
  842 + padding: EdgeInsets.symmetric(
  843 + horizontal:
  844 + ScreenUtil().setWidth(26)),
  845 + gradientStart: MyColours.color_199095,
  846 + gradientEnd: MyColours.color_199095,
  847 + // borderColor: MyColours.color_999999,
  848 + radius: ScreenUtil().setWidth(40),
  849 + height: ScreenUtil().setWidth(64),
  850 + width: ScreenUtil().setWidth(180),
  851 + fontSize: 26,
  852 + isBold: false,
  853 + onPressed: () {
  854 + String uid = '';
  855 + menuTitle.forEach((element) {
  856 + if (element.select) {
  857 + uid = element.uid;
  858 + }
  859 + });
  860 + NavigatorUtil.goMyMakeMarkingPage(
  861 + context, uid,
  862 + fromPage: FromPage
  863 + .FromPageMyCustomer,
  864 + homeGid:
  865 + Utils.listToStringEnglish1(
  866 + widget
  867 + .customerProvider
  868 + .guestSunmodel
  869 + .tips
  870 + .awaken[1]));
  871 + },
  872 + ),
  873 + ],
  874 + ),
  875 + ),
  876 + ],
  877 + );
  878 + }),
  879 + _chart(),
  880 + ListView.builder(
  881 + itemCount: widget
  882 + .customerProvider.managerStatisticsList.length,
  883 + shrinkWrap: true,
  884 + controller: _controller,
  885 + padding: EdgeInsets.symmetric(horizontal: w(10)),
  886 + itemBuilder: (context, index) {
  887 + SellerCountsListSunModel countsListSunModel =
  888 + widget.customerProvider
  889 + .managerStatisticsList[index];
  890 + return InkWell(
  891 + onTap: () {
  892 + String uid = '';
  893 + menuTitle.forEach((element) {
  894 + if (element.select) {
  895 + uid = element.uid;
  896 + }
  897 + });
  898 + NavigatorUtil.goMonthOrderPage(
  899 + context,
  900 + year.toString(),
  901 + countsListSunModel.monthss.toString(),
  902 + uid: uid);
791 }, 903 },
792 - ),  
793 - ],  
794 - ),  
795 - ),  
796 - ],  
797 - );  
798 - }),  
799 - _chart(),  
800 - ListView.builder(  
801 - itemCount:  
802 - widget.customerProvider.managerStatisticsList.length,  
803 - shrinkWrap: true,  
804 - controller: _controller,  
805 - padding: EdgeInsets.symmetric(horizontal: w(10)),  
806 - itemBuilder: (context, index) {  
807 - SellerCountsListSunModel countsListSunModel =  
808 - widget.customerProvider.managerStatisticsList[index];  
809 - return InkWell(  
810 - onTap: () {  
811 - String uid = '';  
812 - menuTitle.forEach((element) {  
813 - if (element.select) {  
814 - uid = element.uid;  
815 - }  
816 - });  
817 - NavigatorUtil.goMonthOrderPage(  
818 - context,  
819 - year.toString(),  
820 - countsListSunModel.monthss.toString(),  
821 - uid: uid);  
822 - },  
823 - child: MonthItem(  
824 - countsListSunModel: countsListSunModel));  
825 - })  
826 - ],  
827 - ),  
828 - )),  
829 - // Container(  
830 - // color: MyColours.color_FAFAFA,  
831 - // padding: EdgeInsets.only(  
832 - // top: w(13), bottom: w(26), left: w(45), right: (45)),  
833 - // child: Stack(  
834 - // children: [  
835 - // RoundButton(  
836 - // onPressed: () {  
837 - // NavigatorUtil.goMyMarketingRecordsPage(  
838 - // context, FromPage.FromPageMyCustomer);  
839 - // },  
840 - // text: '历史营销记录',  
841 - // fontSize: 32,  
842 - // isBold: true,  
843 - // // margin: EdgeInsets.only(  
844 - // // top: w(13),  
845 - // // bottom: w(26),  
846 - // // left: w(45),  
847 - // // right: (45)),  
848 - // textColor: MyColours.color_F8F9FD,  
849 - // gradientStart: MyColours.color_199095,  
850 - // gradientEnd: MyColours.color_199095,  
851 - // borderColor: MyColours.color_199095,  
852 - // height: ScreenUtil().setWidth(86),  
853 - // // width: ScreenUtil().setWidth(260),  
854 - // radius: ScreenUtil().setWidth(10),  
855 - // ),  
856 - // showWarning  
857 - // ? Positioned(  
858 - // right: ScreenUtil().setWidth(30),  
859 - // top: ScreenUtil().setWidth(45 / 2),  
860 - // child: Image.asset(  
861 - // Utils.getImgPath('warning'),  
862 - // width: ScreenUtil().setWidth(35),  
863 - // ))  
864 - // : SizedBox()  
865 - // ],  
866 - // ))  
867 - ]);  
868 - }  
869 - }))); 904 + child: MonthItem(
  905 + countsListSunModel: countsListSunModel));
  906 + })
  907 + ],
  908 + ),
  909 + ));
  910 + }
  911 + })
  912 + // Container(
  913 + // color: MyColours.color_FAFAFA,
  914 + // padding: EdgeInsets.only(
  915 + // top: w(13), bottom: w(26), left: w(45), right: (45)),
  916 + // child: Stack(
  917 + // children: [
  918 + // RoundButton(
  919 + // onPressed: () {
  920 + // NavigatorUtil.goMyMarketingRecordsPage(
  921 + // context, FromPage.FromPageMyCustomer);
  922 + // },
  923 + // text: '历史营销记录',
  924 + // fontSize: 32,
  925 + // isBold: true,
  926 + // // margin: EdgeInsets.only(
  927 + // // top: w(13),
  928 + // // bottom: w(26),
  929 + // // left: w(45),
  930 + // // right: (45)),
  931 + // textColor: MyColours.color_F8F9FD,
  932 + // gradientStart: MyColours.color_199095,
  933 + // gradientEnd: MyColours.color_199095,
  934 + // borderColor: MyColours.color_199095,
  935 + // height: ScreenUtil().setWidth(86),
  936 + // // width: ScreenUtil().setWidth(260),
  937 + // radius: ScreenUtil().setWidth(10),
  938 + // ),
  939 + // showWarning
  940 + // ? Positioned(
  941 + // right: ScreenUtil().setWidth(30),
  942 + // top: ScreenUtil().setWidth(45 / 2),
  943 + // child: Image.asset(
  944 + // Utils.getImgPath('warning'),
  945 + // width: ScreenUtil().setWidth(35),
  946 + // ))
  947 + // : SizedBox()
  948 + // ],
  949 + // ))
  950 + ])));
870 } 951 }
871 } 952 }
@@ -1269,14 +1269,17 @@ class CustomerProvider extends ChangeNotifier { @@ -1269,14 +1269,17 @@ class CustomerProvider extends ChangeNotifier {
1269 } 1269 }
1270 1270
1271 ///我的客户首页 1271 ///我的客户首页
1272 - Future<GuestManageSunModel> getGuestManageData(BuildContext context,  
1273 - {isShowLoading = true}) async { 1272 + Future<GuestManageSunModel> getGuestManageData(
  1273 + BuildContext context,
  1274 + String uid, {
  1275 + isShowLoading = true,
  1276 + }) async {
1274 if (isShowLoading) { 1277 if (isShowLoading) {
1275 pageStateMyHome = PageState.Loading; 1278 pageStateMyHome = PageState.Loading;
1276 notifyListeners(); 1279 notifyListeners();
1277 } 1280 }
1278 Map<String, String> params = { 1281 Map<String, String> params = {
1279 - 'uid': Provider.of<UserModel>(context, listen: false).user.openid 1282 + 'uid': uid,
1280 }; 1283 };
1281 BaseResp<dynamic> baseResp = await DioUtil() 1284 BaseResp<dynamic> baseResp = await DioUtil()
1282 .request<dynamic>(context, Method.get, HttpUrl.guest_manage, 1285 .request<dynamic>(context, Method.get, HttpUrl.guest_manage,
@@ -708,28 +708,28 @@ class NavigatorUtil { @@ -708,28 +708,28 @@ class NavigatorUtil {
708 /// 708 ///
709 /// 我的客情列表 709 /// 我的客情列表
710 static Future<dynamic> goMyCustomerListPage( 710 static Future<dynamic> goMyCustomerListPage(
711 - BuildContext context, FromPage fromPage, 711 + BuildContext context, FromPage fromPage, String uid,
712 {replace = false, bool needBtn = false, String index = '0'}) { 712 {replace = false, bool needBtn = false, String index = '0'}) {
713 return _navigateTo(context, 713 return _navigateTo(context,
714 - "${Routes.my_customer_list_page}?fromPage=${FluroConvertUtils.enumToString(fromPage)}&index=${index}", 714 + "${Routes.my_customer_list_page}?fromPage=${FluroConvertUtils.enumToString(fromPage)}&index=${index}&uid=${uid}",
715 replace: replace); 715 replace: replace);
716 } 716 }
717 717
718 /// 我的营销记录 718 /// 我的营销记录
719 static Future<dynamic> goMyMarketingRecordsPage( 719 static Future<dynamic> goMyMarketingRecordsPage(
720 - BuildContext context, FromPage fromPage, 720 + BuildContext context, FromPage fromPage,String uid,
721 {replace = false}) { 721 {replace = false}) {
722 return _navigateTo(context, 722 return _navigateTo(context,
723 - "${Routes.my_marketing_records_page}?fromPage=${FluroConvertUtils.enumToString(fromPage)}", 723 + "${Routes.my_marketing_records_page}?fromPage=${FluroConvertUtils.enumToString(fromPage)}&uid=$uid",
724 replace: replace); 724 replace: replace);
725 } 725 }
726 726
727 /// 我的营销记录详情 --- 个人任务 727 /// 我的营销记录详情 --- 个人任务
728 static Future<dynamic> goMyMarketingRecordsDetailPage( 728 static Future<dynamic> goMyMarketingRecordsDetailPage(
729 - BuildContext context, String idstr, SelfList selfList, 729 + BuildContext context, String idstr, SelfList selfList,String uid,
730 {replace = false}) { 730 {replace = false}) {
731 return _navigateTo(context, 731 return _navigateTo(context,
732 - "${Routes.my_marketing_records_detail_page}?idstr=${idstr}&selfList=${FluroConvertUtils.object2string(selfList)}", 732 + "${Routes.my_marketing_records_detail_page}?idstr=${idstr}&selfList=${FluroConvertUtils.object2string(selfList)}&uid=$uid",
733 replace: replace); 733 replace: replace);
734 } 734 }
735 735
@@ -744,14 +744,15 @@ class NavigatorUtil { @@ -744,14 +744,15 @@ class NavigatorUtil {
744 744
745 /// 我的创建营销 745 /// 我的创建营销
746 static Future<dynamic> goMyMakeMarkingPage( 746 static Future<dynamic> goMyMakeMarkingPage(
747 - BuildContext context, { 747 + BuildContext context,
  748 + String uid, {
748 replace = false, 749 replace = false,
749 SelfList selfList, 750 SelfList selfList,
750 FromPage fromPage, 751 FromPage fromPage,
751 String homeGid = '', 752 String homeGid = '',
752 }) { 753 }) {
753 return _navigateTo(context, 754 return _navigateTo(context,
754 - "${Routes.my_make_marketing_page}?selfList=${FluroConvertUtils.object2string(selfList)}&fromPage=${FluroConvertUtils.enumToString(fromPage)}&homeGid=$homeGid", 755 + "${Routes.my_make_marketing_page}?selfList=${FluroConvertUtils.object2string(selfList)}&fromPage=${FluroConvertUtils.enumToString(fromPage)}&homeGid=$homeGid&uid=$uid",
755 replace: replace); 756 replace: replace);
756 } 757 }
757 758
@@ -1116,9 +1116,10 @@ var myCustomerListPageHandle = new Handler( @@ -1116,9 +1116,10 @@ var myCustomerListPageHandle = new Handler(
1116 FromPage.values, params["fromPage"].first); 1116 FromPage.values, params["fromPage"].first);
1117 print(fromPage); 1117 print(fromPage);
1118 String index = params["index"].first; 1118 String index = params["index"].first;
  1119 + String uid = params["uid"].first;
1119 return ChangeNotifierProvider<CustomerProvider>( 1120 return ChangeNotifierProvider<CustomerProvider>(
1120 create: (_) => CustomerProvider(), 1121 create: (_) => CustomerProvider(),
1121 - child: MyCustomerListPage(fromPage: fromPage, index: index)); 1122 + child: MyCustomerListPage(fromPage: fromPage, index: index, uid: uid));
1122 }); 1123 });
1123 1124
1124 ///客情设置 1125 ///客情设置
@@ -1148,9 +1149,10 @@ var myMarketingRecordsPageHandle = new Handler( @@ -1148,9 +1149,10 @@ var myMarketingRecordsPageHandle = new Handler(
1148 FromPage fromPage = FluroConvertUtils.enumFromString<FromPage>( 1149 FromPage fromPage = FluroConvertUtils.enumFromString<FromPage>(
1149 FromPage.values, params["fromPage"].first); 1150 FromPage.values, params["fromPage"].first);
1150 print(fromPage); 1151 print(fromPage);
  1152 + String uid = params["uid"].first;
1151 return ChangeNotifierProvider<CustomerProvider>( 1153 return ChangeNotifierProvider<CustomerProvider>(
1152 create: (_) => CustomerProvider(), 1154 create: (_) => CustomerProvider(),
1153 - child: MyMarketingRecordsPage(fromPage: fromPage)); 1155 + child: MyMarketingRecordsPage(fromPage: fromPage,uid:uid));
1154 }); 1156 });
1155 1157
1156 ///全店营销记录详情 1158 ///全店营销记录详情
@@ -1166,12 +1168,14 @@ var marketingRecordsDetailPageHandle = new Handler( @@ -1166,12 +1168,14 @@ var marketingRecordsDetailPageHandle = new Handler(
1166 var myMarketingRecordsDetailPageHandle = new Handler( 1168 var myMarketingRecordsDetailPageHandle = new Handler(
1167 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1169 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
1168 String idstr = params["idstr"].first; 1170 String idstr = params["idstr"].first;
  1171 + String uid = params["uid"].first;
1169 SelfList selfList = SelfList.fromJson(json 1172 SelfList selfList = SelfList.fromJson(json
1170 .decode(FluroConvertUtils.fluroCnParamsDecode(params["selfList"].first))); 1173 .decode(FluroConvertUtils.fluroCnParamsDecode(params["selfList"].first)));
1171 1174
1172 return ChangeNotifierProvider<CustomerProvider>( 1175 return ChangeNotifierProvider<CustomerProvider>(
1173 create: (_) => CustomerProvider(), 1176 create: (_) => CustomerProvider(),
1174 - child: MyMarketingRecordsDetailPage(idstr: idstr, selfList: selfList)); 1177 + child: MyMarketingRecordsDetailPage(
  1178 + idstr: idstr, selfList: selfList, uid: uid));
1175 }); 1179 });
1176 1180
1177 ///我的营销记录详情 ---- 全店任务 1181 ///我的营销记录详情 ---- 全店任务
@@ -1209,7 +1213,7 @@ var makeMarkingPageHandle = new Handler( @@ -1209,7 +1213,7 @@ var makeMarkingPageHandle = new Handler(
1209 ///我的创建营销 1213 ///我的创建营销
1210 var myMakeMarkingPageHandle = new Handler( 1214 var myMakeMarkingPageHandle = new Handler(
1211 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1215 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
1212 - // String gid = params["gid"].first; 1216 + String uid = params["uid"].first;
1213 1217
1214 FromPage fromPage = FluroConvertUtils.enumFromString<FromPage>( 1218 FromPage fromPage = FluroConvertUtils.enumFromString<FromPage>(
1215 FromPage.values, params["fromPage"].first); 1219 FromPage.values, params["fromPage"].first);
@@ -1218,13 +1222,14 @@ var myMakeMarkingPageHandle = new Handler( @@ -1218,13 +1222,14 @@ var myMakeMarkingPageHandle = new Handler(
1218 FluroConvertUtils.fluroCnParamsDecode(params["selfList"].first))); 1222 FluroConvertUtils.fluroCnParamsDecode(params["selfList"].first)));
1219 return ChangeNotifierProvider<CustomerProvider>( 1223 return ChangeNotifierProvider<CustomerProvider>(
1220 create: (_) => CustomerProvider(), 1224 create: (_) => CustomerProvider(),
1221 - child: MyMakeMarkingPage(selfList: selfList, fromPage: fromPage)); 1225 + child: MyMakeMarkingPage(
  1226 + selfList: selfList, fromPage: fromPage, uid: uid));
1222 } 1227 }
1223 1228
1224 String homeGid = params["homeGid"].first; 1229 String homeGid = params["homeGid"].first;
1225 return ChangeNotifierProvider<CustomerProvider>( 1230 return ChangeNotifierProvider<CustomerProvider>(
1226 create: (_) => CustomerProvider(), 1231 create: (_) => CustomerProvider(),
1227 - child: MyMakeMarkingPage(fromPage: fromPage, homeGid: homeGid)); 1232 + child: MyMakeMarkingPage(fromPage: fromPage, homeGid: homeGid, uid: uid));
1228 }); 1233 });
1229 1234
1230 ///我的创建营销 ---- 完成全店营销 1235 ///我的创建营销 ---- 完成全店营销