Showing
8 changed files
with
22 additions
and
18 deletions
| @@ -22,6 +22,7 @@ class MyContactListPage extends StatefulWidget { | @@ -22,6 +22,7 @@ class MyContactListPage extends StatefulWidget { | ||
| 22 | final FromPage fromPage; | 22 | final FromPage fromPage; |
| 23 | final bool sellerPreserve; | 23 | final bool sellerPreserve; |
| 24 | final bool sellerMarketing; | 24 | final bool sellerMarketing; |
| 25 | + final String uid; | ||
| 25 | 26 | ||
| 26 | const MyContactListPage( | 27 | const MyContactListPage( |
| 27 | {Key key, | 28 | {Key key, |
| @@ -29,7 +30,8 @@ class MyContactListPage extends StatefulWidget { | @@ -29,7 +30,8 @@ class MyContactListPage extends StatefulWidget { | ||
| 29 | this.provider, | 30 | this.provider, |
| 30 | this.fromPage, | 31 | this.fromPage, |
| 31 | this.sellerPreserve, | 32 | this.sellerPreserve, |
| 32 | - this.sellerMarketing}) | 33 | + this.sellerMarketing, |
| 34 | + this.uid}) | ||
| 33 | : super(key: key); | 35 | : super(key: key); |
| 34 | @override | 36 | @override |
| 35 | State<StatefulWidget> createState() { | 37 | State<StatefulWidget> createState() { |
| @@ -494,7 +496,7 @@ class _MyContactListPageState extends State<MyContactListPage> { | @@ -494,7 +496,7 @@ class _MyContactListPageState extends State<MyContactListPage> { | ||
| 494 | } | 496 | } |
| 495 | 497 | ||
| 496 | NavigatorUtil.goMyCustomerDetailPage( | 498 | NavigatorUtil.goMyCustomerDetailPage( |
| 497 | - context, model, widget.fromPage); | 499 | + context, model, widget.fromPage,widget.uid); |
| 498 | } | 500 | } |
| 499 | }, | 501 | }, |
| 500 | child: Container( | 502 | child: Container( |
| @@ -27,8 +27,10 @@ import '../../../../utils/screen_util.dart'; | @@ -27,8 +27,10 @@ import '../../../../utils/screen_util.dart'; | ||
| 27 | class MyCustomerDetailPage extends StatefulWidget { | 27 | class MyCustomerDetailPage extends StatefulWidget { |
| 28 | final CustomerListSunModel userHistoryEntity; | 28 | final CustomerListSunModel userHistoryEntity; |
| 29 | final FromPage fromPage; | 29 | final FromPage fromPage; |
| 30 | + final String uid; | ||
| 30 | 31 | ||
| 31 | - MyCustomerDetailPage({Key key, this.userHistoryEntity, this.fromPage}) | 32 | + MyCustomerDetailPage( |
| 33 | + {Key key, this.userHistoryEntity, this.fromPage, this.uid}) | ||
| 32 | : super(key: key); | 34 | : super(key: key); |
| 33 | 35 | ||
| 34 | @override | 36 | @override |
| @@ -59,7 +61,7 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { | @@ -59,7 +61,7 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { | ||
| 59 | 61 | ||
| 60 | _getGuestInfo() async { | 62 | _getGuestInfo() async { |
| 61 | Map<String, String> params = { | 63 | Map<String, String> params = { |
| 62 | - "uid": Provider.of<UserModel>(context, listen: false).user.openid, | 64 | + "uid": widget.uid, |
| 63 | "id": widget.userHistoryEntity.id, | 65 | "id": widget.userHistoryEntity.id, |
| 64 | 'phone': widget.userHistoryEntity.phone | 66 | 'phone': widget.userHistoryEntity.phone |
| 65 | }; | 67 | }; |
| @@ -1561,6 +1561,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> | @@ -1561,6 +1561,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> | ||
| 1561 | ); | 1561 | ); |
| 1562 | } else { | 1562 | } else { |
| 1563 | return MyContactListPage( | 1563 | return MyContactListPage( |
| 1564 | + uid:widget.uid, | ||
| 1564 | contacts: model.userHistorys, | 1565 | contacts: model.userHistorys, |
| 1565 | provider: customerProvider, | 1566 | provider: customerProvider, |
| 1566 | fromPage: widget.fromPage, | 1567 | fromPage: widget.fromPage, |
| @@ -149,10 +149,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { | @@ -149,10 +149,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { | ||
| 149 | ///消费券 | 149 | ///消费券 |
| 150 | _couponNetworkData({bool isShowLoading = true}) async { | 150 | _couponNetworkData({bool isShowLoading = true}) async { |
| 151 | // customerMakingProvider.couponSelectIndex = 0; | 151 | // customerMakingProvider.couponSelectIndex = 0; |
| 152 | - Map<String, String> params = { | ||
| 153 | - "uid": Provider.of<UserModel>(context, listen: false).user.openid, | ||
| 154 | - 'status': '1' | ||
| 155 | - }; | 152 | + Map<String, String> params = {"uid": widget.uid, 'status': '1'}; |
| 156 | await customerProvider.getCustomerSelectActivityNew(context, params, | 153 | await customerProvider.getCustomerSelectActivityNew(context, params, |
| 157 | isShowLoading: isShowLoading); | 154 | isShowLoading: isShowLoading); |
| 158 | //此人已经新建好券 | 155 | //此人已经新建好券 |
| @@ -174,7 +171,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { | @@ -174,7 +171,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> { | ||
| 174 | return; | 171 | return; |
| 175 | } | 172 | } |
| 176 | Map<String, String> params = { | 173 | Map<String, String> params = { |
| 177 | - "uid": Provider.of<UserModel>(context, listen: false).user.openid, | 174 | + "uid": widget.uid, |
| 178 | "gid": gid, | 175 | "gid": gid, |
| 179 | "content": customerMakingProvider.controller.text | 176 | "content": customerMakingProvider.controller.text |
| 180 | }; | 177 | }; |
| @@ -70,7 +70,10 @@ class _StoreCustomerHomeRightPageState | @@ -70,7 +70,10 @@ class _StoreCustomerHomeRightPageState | ||
| 70 | messageMenuModel.uid = element.uid; | 70 | messageMenuModel.uid = element.uid; |
| 71 | messageMenuModel.title = element.nickName ?? element.account; | 71 | messageMenuModel.title = element.nickName ?? element.account; |
| 72 | messageMenuModel.select = false; | 72 | messageMenuModel.select = false; |
| 73 | - menuTitle.add(messageMenuModel); | 73 | + if(messageMenuModel.title != null){ |
| 74 | + menuTitle.add(messageMenuModel); | ||
| 75 | + } | ||
| 76 | + | ||
| 74 | }); | 77 | }); |
| 75 | if (menuTitle.length > 0) { | 78 | if (menuTitle.length > 0) { |
| 76 | menuTitle[0].select = true; | 79 | menuTitle[0].select = true; |
| @@ -774,11 +774,12 @@ class NavigatorUtil { | @@ -774,11 +774,12 @@ class NavigatorUtil { | ||
| 774 | static Future<dynamic> goMyCustomerDetailPage( | 774 | static Future<dynamic> goMyCustomerDetailPage( |
| 775 | BuildContext context, | 775 | BuildContext context, |
| 776 | CustomerListSunModel userHistoryEntity, | 776 | CustomerListSunModel userHistoryEntity, |
| 777 | - FromPage fromPage, { | 777 | + FromPage fromPage, |
| 778 | + String uid, { | ||
| 778 | replace = false, | 779 | replace = false, |
| 779 | }) { | 780 | }) { |
| 780 | return _navigateTo(context, | 781 | return _navigateTo(context, |
| 781 | - "${Routes.my_customer_detail_page}?userHistoryEntity=${FluroConvertUtils.object2string(userHistoryEntity)}&fromPage=${FluroConvertUtils.enumToString(fromPage)}", | 782 | + "${Routes.my_customer_detail_page}?userHistoryEntity=${FluroConvertUtils.object2string(userHistoryEntity)}&fromPage=${FluroConvertUtils.enumToString(fromPage)}&uid=${uid}", |
| 782 | replace: replace); | 783 | replace: replace); |
| 783 | } | 784 | } |
| 784 | 785 | ||
| @@ -1826,6 +1827,4 @@ class NavigatorUtil { | @@ -1826,6 +1827,4 @@ class NavigatorUtil { | ||
| 1826 | return _navigateTo(context, "${Routes.collect_store_info_page}", | 1827 | return _navigateTo(context, "${Routes.collect_store_info_page}", |
| 1827 | replace: replace); | 1828 | replace: replace); |
| 1828 | } | 1829 | } |
| 1829 | - | ||
| 1830 | - | ||
| 1831 | } | 1830 | } |
| @@ -1356,12 +1356,12 @@ var myCustomerDetailPageHandle = new Handler( | @@ -1356,12 +1356,12 @@ var myCustomerDetailPageHandle = new Handler( | ||
| 1356 | FromPage fromPage = FluroConvertUtils.enumFromString<FromPage>( | 1356 | FromPage fromPage = FluroConvertUtils.enumFromString<FromPage>( |
| 1357 | FromPage.values, params["fromPage"].first); | 1357 | FromPage.values, params["fromPage"].first); |
| 1358 | print(fromPage); | 1358 | print(fromPage); |
| 1359 | + | ||
| 1360 | + String uid = params["uid"].first; | ||
| 1359 | return ChangeNotifierProvider<CustomerProvider>( | 1361 | return ChangeNotifierProvider<CustomerProvider>( |
| 1360 | create: (_) => CustomerProvider(), | 1362 | create: (_) => CustomerProvider(), |
| 1361 | child: MyCustomerDetailPage( | 1363 | child: MyCustomerDetailPage( |
| 1362 | - userHistoryEntity: userHistoryEntity, | ||
| 1363 | - fromPage: fromPage, | ||
| 1364 | - )); | 1364 | + userHistoryEntity: userHistoryEntity, fromPage: fromPage, uid: uid)); |
| 1365 | }); | 1365 | }); |
| 1366 | 1366 | ||
| 1367 | ///编辑客户详情 | 1367 | ///编辑客户详情 |
| @@ -1741,7 +1741,7 @@ class Utils { | @@ -1741,7 +1741,7 @@ class Utils { | ||
| 1741 | // String sellerImage = | 1741 | // String sellerImage = |
| 1742 | // Provider.of<UserModel>(context, listen: false).user.sellerimage; | 1742 | // Provider.of<UserModel>(context, listen: false).user.sellerimage; |
| 1743 | 1743 | ||
| 1744 | - String _thumbnail = 'https://nosqn.colorcun.com/share_money.png'; | 1744 | + String _thumbnail = 'https://nosqn.colorcun.com/share_coupon.jpg'; |
| 1745 | String _title = "${managerName}给您赠送${couponSunModel.aname},点击查看详情"; | 1745 | String _title = "${managerName}给您赠送${couponSunModel.aname},点击查看详情"; |
| 1746 | 1746 | ||
| 1747 | String _userName = "gh_487873d353b3"; | 1747 | String _userName = "gh_487873d353b3"; |
-
Please register or login to post a comment