xt / Flutter-ReserveApp · Commits

Go to a project

Commit c407f98d94e8f367b6d439b0435cc4a85223b4c1

Authored by wdn127929
1 parent cc65b6f4
build: skipped

存酒推送跳转存酒详情

Inline Side-by-side
Showing 14 changed files with 208 additions and 228 deletions
@@ -137,6 +137,9 @@ class NewUnmessage extends Object { @@ -137,6 +137,9 @@ class NewUnmessage extends Object {
137 @JsonKey(name: 'dtime') 137 @JsonKey(name: 'dtime')
138 String dtime; 138 String dtime;
139 139
  140 + @JsonKey(name: 'wid')
  141 + String wid;
  142 +
140 NewUnmessage( 143 NewUnmessage(
141 this.id, 144 this.id,
142 this.uid, 145 this.uid,
@@ -167,7 +170,8 @@ class NewUnmessage extends Object { @@ -167,7 +170,8 @@ class NewUnmessage extends Object {
167 this.phone, 170 this.phone,
168 this.storeCdate, 171 this.storeCdate,
169 this.desc, 172 this.desc,
170 - this.dtime); 173 + this.dtime,
  174 + this.wid);
171 175
172 String get rnameStr { 176 String get rnameStr {
173 if (rname == null || rname == '' || rname == ' ') return ""; 177 if (rname == null || rname == '' || rname == ' ') return "";
@@ -71,7 +71,10 @@ NewUnmessage _$NewUnmessageFromJson(Map<String, dynamic> json) { @@ -71,7 +71,10 @@ NewUnmessage _$NewUnmessageFromJson(Map<String, dynamic> json) {
71 json['phone'] as String, 71 json['phone'] as String,
72 json['store_cdate'] as String, 72 json['store_cdate'] as String,
73 json['desc'] as String, 73 json['desc'] as String,
74 - json['dtime'] as String); 74 + json['dtime'] as String,
  75 + json['wid'] as String,
  76 +
  77 + );
75 } 78 }
76 79
77 Map<String, dynamic> _$NewUnmessageToJson(NewUnmessage instance) => 80 Map<String, dynamic> _$NewUnmessageToJson(NewUnmessage instance) =>
@@ -105,5 +108,6 @@ Map<String, dynamic> _$NewUnmessageToJson(NewUnmessage instance) => @@ -105,5 +108,6 @@ Map<String, dynamic> _$NewUnmessageToJson(NewUnmessage instance) =>
105 'phone': instance.phone, 108 'phone': instance.phone,
106 'store_cdate': instance.storeCdate, 109 'store_cdate': instance.storeCdate,
107 'desc': instance.desc, 110 'desc': instance.desc,
108 - 'dtime': instance.dtime 111 + 'dtime': instance.dtime,
  112 + 'wid':instance.wid
109 }; 113 };
@@ -195,14 +195,14 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -195,14 +195,14 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
195 create: (_) => MarketingCenterProvider(), 195 create: (_) => MarketingCenterProvider(),
196 child: ChangeNotifierProvider<NotebookDetailModel>( 196 child: ChangeNotifierProvider<NotebookDetailModel>(
197 create: (_) => NotebookDetailModel(), 197 create: (_) => NotebookDetailModel(),
198 - child:ChangeNotifierProvider<CollectStoreProvider>(  
199 - create: (_) => CollectStoreProvider(),  
200 - child: SafeArea(  
201 - child: NoteBookPage(  
202 - tabIndex: widget.mine ? 1 : 0,  
203 - date: widget.date,  
204 - solt: widget.solt,  
205 - ))), 198 + child: ChangeNotifierProvider<CollectStoreProvider>(
  199 + create: (_) => CollectStoreProvider(),
  200 + child: SafeArea(
  201 + child: NoteBookPage(
  202 + tabIndex: widget.mine ? 1 : 0,
  203 + date: widget.date,
  204 + solt: widget.solt,
  205 + ))),
206 )))) 206 ))))
207 ..add(ChangeNotifierProvider<MyModel>( 207 ..add(ChangeNotifierProvider<MyModel>(
208 create: (_) => MyModel(), 208 create: (_) => MyModel(),
@@ -870,33 +870,15 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -870,33 +870,15 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
870 870
871 break; 871 break;
872 case "18": 872 case "18":
873 - if (!collectStoreProvider.sellerPreserve) {  
874 - //没有购买客情维护模块 873 + if (!collectStoreProvider.sellerWine) {
  874 + //没有购买存酒管理
875 //提示购买 875 //提示购买
876 876
877 - DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {}); 877 + DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
878 return; 878 return;
879 } 879 }
880 - CustomerBySellerSunModel userHistoryEntity = CustomerBySellerSunModel(  
881 - null,  
882 - null,  
883 - notifyParam['phone'],  
884 - null,  
885 - null,  
886 - null,  
887 - null,  
888 - null,  
889 - null,  
890 - null,  
891 - null,  
892 - notifyParam['id'],  
893 - null,  
894 - null,  
895 - null,  
896 - null);  
897 880
898 - NavigatorUtil.goCustomerDetailPage(  
899 - context, userHistoryEntity, FromPage.FromPageMessagePage); 881 + NavigatorUtil.goWineDetailPage(context, notifyParam['wid']);
900 MessageDialogModel messageDialogModel = 882 MessageDialogModel messageDialogModel =
901 Provider.of<MessageDialogModel>(context, listen: false); 883 Provider.of<MessageDialogModel>(context, listen: false);
902 884
@@ -1225,35 +1207,16 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -1225,35 +1207,16 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
1225 break; 1207 break;
1226 case "18": 1208 case "18":
1227 //存酒 1209 //存酒
1228 - print('fff');  
1229 - if (!collectStoreProvider.sellerPreserve) {  
1230 - //没有购买客情维护模块 1210 + if (!collectStoreProvider.sellerWine) {
  1211 + //没有购买存酒管理
1231 //提示购买 1212 //提示购买
1232 1213
1233 - DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {}); 1214 + DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
1234 return; 1215 return;
1235 } 1216 }
1236 - CustomerBySellerSunModel userHistoryEntity =  
1237 - CustomerBySellerSunModel(  
1238 - null,  
1239 - null,  
1240 - custom['phone'],  
1241 - null,  
1242 - null,  
1243 - null,  
1244 - null,  
1245 - null,  
1246 - null,  
1247 - null,  
1248 - null,  
1249 - custom['id'],  
1250 - null,  
1251 - null,  
1252 - null,  
1253 - null);  
1254 1217
1255 - NavigatorUtil.goCustomerDetailPage(  
1256 - context, userHistoryEntity, FromPage.FromPageMessagePage); 1218 + NavigatorUtil.goWineDetailPage(context, custom['wid']);
  1219 +
1257 MessageDialogModel messageDialogModel = 1220 MessageDialogModel messageDialogModel =
1258 Provider.of<MessageDialogModel>(context, listen: false); 1221 Provider.of<MessageDialogModel>(context, listen: false);
1259 1222
@@ -213,35 +213,16 @@ class MessageDialogItemF extends StatelessWidget { @@ -213,35 +213,16 @@ class MessageDialogItemF extends StatelessWidget {
213 213
214 bus.emit("refresh_untreated_num"); //刷新未读消息数目 214 bus.emit("refresh_untreated_num"); //刷新未读消息数目
215 } else if (message.message_type == "18") { 215 } else if (message.message_type == "18") {
216 - if (!collectStoreProvider.sellerPreserve) {  
217 - //没有购买客情维护模块 216 + if (!collectStoreProvider.sellerWine) {
  217 + //没有购买存酒管理
218 //提示购买 218 //提示购买
219 219
220 - DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {}); 220 + DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
221 return; 221 return;
222 } 222 }
223 - //存酒超期  
224 - CustomerBySellerSunModel userHistoryEntity =  
225 - CustomerBySellerSunModel(  
226 - null,  
227 - null,  
228 - message.phone,  
229 - null,  
230 - null,  
231 - null,  
232 - null,  
233 - null,  
234 - null,  
235 - null,  
236 - null,  
237 - message.gid,  
238 - null,  
239 - null,  
240 - null,  
241 - null);  
242 -  
243 - NavigatorUtil.goCustomerDetailPage(  
244 - context, userHistoryEntity, FromPage.FromPageMessagePage); 223 + if (message.wid != null) {
  224 + NavigatorUtil.goWineDetailPage(context, message.wid);
  225 + }
245 bus.emit("remove_untreated_message", message.id); 226 bus.emit("remove_untreated_message", message.id);
246 227
247 Map<String, String> params1 = { 228 Map<String, String> params1 = {
@@ -737,37 +718,17 @@ class MessageDialogItemF extends StatelessWidget { @@ -737,37 +718,17 @@ class MessageDialogItemF extends StatelessWidget {
737 718
738 bus.emit("refresh_untreated_num"); //刷新未读消息数目 719 bus.emit("refresh_untreated_num"); //刷新未读消息数目
739 } else if (message.message_type == "18") { 720 } else if (message.message_type == "18") {
740 - if (!collectStoreProvider.sellerPreserve) {  
741 - //没有购买客情维护模块 721 + if (!collectStoreProvider.sellerWine) {
  722 + //没有购买存酒管理
742 //提示购买 723 //提示购买
743 724
744 DialogUtil.showSellerVersionBuyDialog( 725 DialogUtil.showSellerVersionBuyDialog(
745 - context, '客情维护', (v) {}); 726 + context, '存酒管理', (v) {});
746 return; 727 return;
747 } 728 }
748 -  
749 - //存酒超期  
750 - CustomerBySellerSunModel userHistoryEntity =  
751 - CustomerBySellerSunModel(  
752 - null,  
753 - null,  
754 - message.phone,  
755 - null,  
756 - null,  
757 - null,  
758 - null,  
759 - null,  
760 - null,  
761 - null,  
762 - null,  
763 - message.gid,  
764 - null,  
765 - null,  
766 - null,  
767 - null);  
768 -  
769 - NavigatorUtil.goCustomerDetailPage(context,  
770 - userHistoryEntity, FromPage.FromPageMessagePage); 729 + if (message.wid != null) {
  730 + NavigatorUtil.goWineDetailPage(context, message.wid);
  731 + }
771 bus.emit("remove_untreated_message", message.id); 732 bus.emit("remove_untreated_message", message.id);
772 733
773 Map<String, String> params1 = { 734 Map<String, String> params1 = {
@@ -141,37 +141,41 @@ class MessageItemF extends StatelessWidget { @@ -141,37 +141,41 @@ class MessageItemF extends StatelessWidget {
141 //会员充值 141 //会员充值
142 NavigatorUtil.goMessageRechargeInfoPage(context, message.payid); 142 NavigatorUtil.goMessageRechargeInfoPage(context, message.payid);
143 } else if (message.message_type == "18") { 143 } else if (message.message_type == "18") {
144 - if (!collectStoreProvider.sellerPreserve) {  
145 - //没有购买客情维护模块 144 + if (!collectStoreProvider.sellerWine) {
  145 + //没有购买存酒管理
146 //提示购买 146 //提示购买
147 147
148 - DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {}); 148 + DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
149 return; 149 return;
150 } 150 }
151 - //存酒超期  
152 - CustomerBySellerSunModel userHistoryEntity =  
153 - CustomerBySellerSunModel(  
154 - null,  
155 - null,  
156 - message.phone,  
157 - // '057128223456',  
158 - null,  
159 - null,  
160 - null,  
161 - null,  
162 - null,  
163 - null,  
164 - null,  
165 - null,  
166 - message.gid,  
167 - // '19358',  
168 - null,  
169 - null,  
170 - null,  
171 - null); 151 + if (message.wid != null) {
  152 + NavigatorUtil.goWineDetailPage(context, message.wid);
  153 + }
172 154
173 - NavigatorUtil.goCustomerDetailPage(  
174 - context, userHistoryEntity, FromPage.FromPageMessagePage); 155 + // //存酒超期
  156 + // CustomerBySellerSunModel userHistoryEntity =
  157 + // CustomerBySellerSunModel(
  158 + // null,
  159 + // null,
  160 + // message.phone,
  161 + // // '057128223456',
  162 + // null,
  163 + // null,
  164 + // null,
  165 + // null,
  166 + // null,
  167 + // null,
  168 + // null,
  169 + // null,
  170 + // message.gid,
  171 + // // '19358',
  172 + // null,
  173 + // null,
  174 + // null,
  175 + // null);
  176 +
  177 + // NavigatorUtil.goCustomerDetailPage(
  178 + // context, userHistoryEntity, FromPage.FromPageMessagePage);
175 } else if (message.message_type == "19") { 179 } else if (message.message_type == "19") {
176 if (!collectStoreProvider.sellerPreserve) { 180 if (!collectStoreProvider.sellerPreserve) {
177 //没有购买客情维护模块 181 //没有购买客情维护模块
@@ -326,35 +330,16 @@ class MessageItemF extends StatelessWidget { @@ -326,35 +330,16 @@ class MessageItemF extends StatelessWidget {
326 330
327 bus.emit("refresh_untreated_num"); //刷新未读消息数目 331 bus.emit("refresh_untreated_num"); //刷新未读消息数目
328 } else if (message.message_type == "18") { 332 } else if (message.message_type == "18") {
329 - if (!collectStoreProvider.sellerPreserve) {  
330 - //没有购买客情维护模块 333 + if (!collectStoreProvider.sellerWine) {
  334 + //没有购买存酒管理
331 //提示购买 335 //提示购买
332 336
333 - DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {}); 337 + DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
334 return; 338 return;
335 } 339 }
336 - //存酒超期  
337 - CustomerBySellerSunModel userHistoryEntity =  
338 - CustomerBySellerSunModel(  
339 - null,  
340 - null,  
341 - message.phone,  
342 - null,  
343 - null,  
344 - null,  
345 - null,  
346 - null,  
347 - null,  
348 - null,  
349 - null,  
350 - message.gid,  
351 - null,  
352 - null,  
353 - null,  
354 - null);  
355 -  
356 - NavigatorUtil.goCustomerDetailPage(  
357 - context, userHistoryEntity, FromPage.FromPageMessagePage); 340 + if (message.wid != null) {
  341 + NavigatorUtil.goWineDetailPage(context, message.wid);
  342 + }
358 bus.emit("remove_untreated_message", message.id); 343 bus.emit("remove_untreated_message", message.id);
359 344
360 Map<String, String> params1 = { 345 Map<String, String> params1 = {
@@ -854,36 +839,17 @@ class MessageItemF extends StatelessWidget { @@ -854,36 +839,17 @@ class MessageItemF extends StatelessWidget {
854 839
855 bus.emit("refresh_untreated_num"); //刷新未读消息数目 840 bus.emit("refresh_untreated_num"); //刷新未读消息数目
856 } else if (message.message_type == "18") { 841 } else if (message.message_type == "18") {
857 - if (!collectStoreProvider.sellerPreserve) {  
858 - //没有购买客情维护模块 842 + if (!collectStoreProvider.sellerWine) {
  843 + //没有购买存酒管理
859 //提示购买 844 //提示购买
860 845
861 DialogUtil.showSellerVersionBuyDialog( 846 DialogUtil.showSellerVersionBuyDialog(
862 - context, '客情维护', (v) {}); 847 + context, '存酒管理', (v) {});
863 return; 848 return;
864 } 849 }
865 - //存酒超期  
866 - CustomerBySellerSunModel userHistoryEntity =  
867 - CustomerBySellerSunModel(  
868 - null,  
869 - null,  
870 - message.phone,  
871 - null,  
872 - null,  
873 - null,  
874 - null,  
875 - null,  
876 - null,  
877 - null,  
878 - null,  
879 - message.gid,  
880 - null,  
881 - null,  
882 - null,  
883 - null);  
884 -  
885 - NavigatorUtil.goCustomerDetailPage(context,  
886 - userHistoryEntity, FromPage.FromPageMessagePage); 850 + if (message.wid != null) {
  851 + NavigatorUtil.goWineDetailPage(context, message.wid);
  852 + }
887 bus.emit("remove_untreated_message", message.id); 853 bus.emit("remove_untreated_message", message.id);
888 854
889 Map<String, String> params1 = { 855 Map<String, String> params1 = {
@@ -730,7 +730,7 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -730,7 +730,7 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
730 height: w(22), 730 height: w(22),
731 onPressed: () { 731 onPressed: () {
732 NavigatorUtil.goWineDetailPage(context, 732 NavigatorUtil.goWineDetailPage(context,
733 - customerProvider.guestInfoSunModel.store.id, true, 733 + customerProvider.guestInfoSunModel.store.id,
734 onlyShow: true); 734 onlyShow: true);
735 }, 735 },
736 ) 736 )
@@ -639,7 +639,7 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> { @@ -639,7 +639,7 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
639 height: w(22), 639 height: w(22),
640 onPressed: () { 640 onPressed: () {
641 NavigatorUtil.goWineDetailPage(context, 641 NavigatorUtil.goWineDetailPage(context,
642 - customerProvider.guestInfoSunModel.store.id, true, 642 + customerProvider.guestInfoSunModel.store.id,
643 onlyShow: true); 643 onlyShow: true);
644 }, 644 },
645 ) 645 )
@@ -10,7 +10,9 @@ import 'package:one_key/widgets/system_app_bar.dart'; @@ -10,7 +10,9 @@ import 'package:one_key/widgets/system_app_bar.dart';
10 import 'package:provider/provider.dart'; 10 import 'package:provider/provider.dart';
11 11
12 import '../../../constant/state.dart'; 12 import '../../../constant/state.dart';
  13 +import '../../../models/personnel_manage_model.dart';
13 import '../../../models/wine_manage_model.dart'; 14 import '../../../models/wine_manage_model.dart';
  15 +import '../../../provider/personnel_provider.dart';
14 import '../../../provider/store_wine_provider.dart'; 16 import '../../../provider/store_wine_provider.dart';
15 import '../../../res/colors.dart'; 17 import '../../../res/colors.dart';
16 import '../../../route/navigator_util.dart'; 18 import '../../../route/navigator_util.dart';
@@ -43,6 +45,7 @@ class _WineDetailPageState extends State<WineDetailPage> { @@ -43,6 +45,7 @@ class _WineDetailPageState extends State<WineDetailPage> {
43 45
44 // List dataWine = []; 46 // List dataWine = [];
45 String isMember = ''; 47 String isMember = '';
  48 + bool isStoreWine = false;
46 49
47 @override 50 @override
48 void initState() { 51 void initState() {
@@ -53,10 +56,84 @@ class _WineDetailPageState extends State<WineDetailPage> { @@ -53,10 +56,84 @@ class _WineDetailPageState extends State<WineDetailPage> {
53 // dataWine.add(wineManageModel); 56 // dataWine.add(wineManageModel);
54 57
55 WidgetsBinding.instance.addPostFrameCallback((_) async { 58 WidgetsBinding.instance.addPostFrameCallback((_) async {
  59 + if (widget.isStoreWine == null) {
  60 + _getAuthUserLists(showLoading: false);
  61 + } else {
  62 + isStoreWine = widget.isStoreWine;
  63 + }
56 _getStoreWineById(); 64 _getStoreWineById();
57 }); 65 });
58 } 66 }
59 67
  68 + //获取员工信息列表
  69 + _getAuthUserLists({bool showLoading = true}) async {
  70 + Map<String, String> params = {
  71 + "sellerid": Provider.of<UserModel>(context, listen: false).user.sellerid,
  72 + };
  73 + PersonnelProvider personnelProvider =
  74 + Provider.of<PersonnelProvider>(context, listen: false);
  75 + PersonnelManageSunModel data;
  76 + await personnelProvider.getAuthUserLists(context, params,
  77 + showLoading: showLoading);
  78 + UserModel userModel = Provider.of<UserModel>(context, listen: false);
  79 +
  80 + if (personnelProvider.dataMap != null) {
  81 + if (userModel.user.role_name == '管理员') {
  82 + personnelProvider.dataMap.admin.listdata.forEach((element) {
  83 + if (element.id == userModel.user.openid) {
  84 + //找到自己
  85 + data = element;
  86 + }
  87 + });
  88 + } else if (userModel.user.role_name == '店长') {
  89 + personnelProvider.dataMap.shopowner.listdata.forEach((element) {
  90 + if (element.id == userModel.user.openid) {
  91 + //找到自己
  92 + data = element;
  93 + }
  94 + });
  95 + } else if (userModel.user.role_name == '客户经理') {
  96 + personnelProvider.dataMap.manager.listdata.forEach((element) {
  97 + if (element.id == userModel.user.openid) {
  98 + //找到自己
  99 + data = element;
  100 + }
  101 + });
  102 + } else if (userModel.user.role_name == '收银员') {
  103 + personnelProvider.dataMap.cashier.listdata.forEach((element) {
  104 + if (element.id == userModel.user.openid) {
  105 + //找到自己
  106 + data = element;
  107 + }
  108 + });
  109 + } else if (userModel.user.role_name == '服务员') {
  110 + personnelProvider.dataMap.waiter.listdata.forEach((element) {
  111 + if (element.id == userModel.user.openid) {
  112 + //找到自己
  113 + data = element;
  114 + }
  115 + });
  116 + } else if (userModel.user.role_name == '前台') {
  117 + personnelProvider.dataMap.reception.listdata.forEach((element) {
  118 + if (element.id == userModel.user.openid) {
  119 + //找到自己
  120 + data = element;
  121 + }
  122 + });
  123 + } else if (userModel.user.role_name == '迎宾') {
  124 + personnelProvider.dataMap.welcome.listdata.forEach((element) {
  125 + if (element.id == userModel.user.openid) {
  126 + //找到自己
  127 + data = element;
  128 + }
  129 + });
  130 + }
  131 +
  132 + isStoreWine = data.isStoreWine == '1' ? true : false;
  133 + setState(() {});
  134 + }
  135 + }
  136 +
60 _getStoreWineById() async { 137 _getStoreWineById() async {
61 Map<String, String> params = {"id": widget.idstr}; 138 Map<String, String> params = {"id": widget.idstr};
62 bool success = await storeWineProvider.getStoreWineById(context, params); 139 bool success = await storeWineProvider.getStoreWineById(context, params);
@@ -168,8 +245,10 @@ class _WineDetailPageState extends State<WineDetailPage> { @@ -168,8 +245,10 @@ class _WineDetailPageState extends State<WineDetailPage> {
168 VEmptyView(32), 245 VEmptyView(32),
169 _textItemWidget( 246 _textItemWidget(
170 '联系电话', 247 '联系电话',
171 - widget.isStoreWine ? model.wineManageDetail.phone: Utils.starPhone(  
172 - model.wineManageDetail.phone)), 248 + isStoreWine
  249 + ? model.wineManageDetail.phone
  250 + : Utils.starPhone(
  251 + model.wineManageDetail.phone)),
173 Container( 252 Container(
174 height: ScreenUtil().setWidth(48 * 2), 253 height: ScreenUtil().setWidth(48 * 2),
175 padding: EdgeInsets.only( 254 padding: EdgeInsets.only(
@@ -269,7 +348,7 @@ class _WineDetailPageState extends State<WineDetailPage> { @@ -269,7 +348,7 @@ class _WineDetailPageState extends State<WineDetailPage> {
269 // if (userModel.user.role_name == '管理员' || 348 // if (userModel.user.role_name == '管理员' ||
270 // userModel.user.role_name == '店长') { 349 // userModel.user.role_name == '店长') {
271 NavigatorUtil.goOutStoreRecordPage( 350 NavigatorUtil.goOutStoreRecordPage(
272 - context, widget.idstr,widget.isStoreWine); 351 + context, widget.idstr, isStoreWine);
273 // } else { 352 // } else {
274 // bool needRefresh = 353 // bool needRefresh =
275 // await NavigatorUtil.goCouponEditPage(context); 354 // await NavigatorUtil.goCouponEditPage(context);
@@ -292,15 +371,15 @@ class _WineDetailPageState extends State<WineDetailPage> { @@ -292,15 +371,15 @@ class _WineDetailPageState extends State<WineDetailPage> {
292 height: ScreenUtil().setWidth(80), 371 height: ScreenUtil().setWidth(80),
293 radius: ScreenUtil().setWidth(10), 372 radius: ScreenUtil().setWidth(10),
294 isBold: true, 373 isBold: true,
295 - gradientStart: !widget.isStoreWine 374 + gradientStart: !isStoreWine
296 ? MyColours.color_BFC4D4 375 ? MyColours.color_BFC4D4
297 : MyColours.color_438E93, 376 : MyColours.color_438E93,
298 - gradientEnd: !widget.isStoreWine 377 + gradientEnd: !isStoreWine
299 ? MyColours.color_BFC4D4 378 ? MyColours.color_BFC4D4
300 : MyColours.color_438E93, 379 : MyColours.color_438E93,
301 fontSize: 32, 380 fontSize: 32,
302 onPressed: () async { 381 onPressed: () async {
303 - if (!widget.isStoreWine) { 382 + if (!isStoreWine) {
304 Utils.showToast('您不是店铺的存酒管理员，无权进行相关操作。'); 383 Utils.showToast('您不是店铺的存酒管理员，无权进行相关操作。');
305 return false; 384 return false;
306 } 385 }
@@ -361,10 +440,7 @@ class _WineDetailPageState extends State<WineDetailPage> { @@ -361,10 +440,7 @@ class _WineDetailPageState extends State<WineDetailPage> {
361 // storeWineProvider.wineManageDetail.sexStr; 440 // storeWineProvider.wineManageDetail.sexStr;
362 441
363 NavigatorUtil.goApplyOutStorePage( 442 NavigatorUtil.goApplyOutStorePage(
364 - context,  
365 - modelTemp,  
366 - widget.isStoreWine  
367 - ); 443 + context, modelTemp, isStoreWine);
368 // } else { 444 // } else {
369 // bool needRefresh = 445 // bool needRefresh =
370 // await NavigatorUtil.goCouponEditPage(context); 446 // await NavigatorUtil.goCouponEditPage(context);
@@ -31,7 +31,7 @@ class _WineInStoreItemState extends State<WineInStoreItem> { @@ -31,7 +31,7 @@ class _WineInStoreItemState extends State<WineInStoreItem> {
31 return InkWell( 31 return InkWell(
32 onTap: () { 32 onTap: () {
33 NavigatorUtil.goWineDetailPage( 33 NavigatorUtil.goWineDetailPage(
34 - context, widget.wineManageModel.id, widget.isStoreWine); 34 + context, widget.wineManageModel.id,isStoreWine:widget.isStoreWine);
35 }, 35 },
36 child: Container( 36 child: Container(
37 // width: ScreenUtil().setWidth(610), 37 // width: ScreenUtil().setWidth(610),
@@ -955,11 +955,11 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver { @@ -955,11 +955,11 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
955 955
956 break; 956 break;
957 case "18": 957 case "18":
958 - if (!collectStoreProvider.sellerPreserve) { 958 + if (!collectStoreProvider.sellerWine) {
959 //没有购买客情维护模块 959 //没有购买客情维护模块
960 //提示购买 960 //提示购买
961 961
962 - DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {}); 962 + DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
963 return; 963 return;
964 } 964 }
965 // CustomerBySellerSunModel userHistoryEntity = CustomerBySellerSunModel( 965 // CustomerBySellerSunModel userHistoryEntity = CustomerBySellerSunModel(
@@ -1311,11 +1311,11 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver { @@ -1311,11 +1311,11 @@ class HomePageSimState extends State<HomePageSim> with WidgetsBindingObserver {
1311 case "18": 1311 case "18":
1312 //存酒 1312 //存酒
1313 print('fff'); 1313 print('fff');
1314 - if (!collectStoreProvider.sellerPreserve) { 1314 + if (!collectStoreProvider.sellerWine) {
1315 //没有购买客情维护模块 1315 //没有购买客情维护模块
1316 //提示购买 1316 //提示购买
1317 1317
1318 - DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {}); 1318 + DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
1319 return; 1319 return;
1320 } 1320 }
1321 // CustomerBySellerSunModel userHistoryEntity = 1321 // CustomerBySellerSunModel userHistoryEntity =
@@ -213,11 +213,11 @@ class MessageDialogItemFSim extends StatelessWidget { @@ -213,11 +213,11 @@ class MessageDialogItemFSim extends StatelessWidget {
213 213
214 bus.emit("refresh_untreated_num"); //刷新未读消息数目 214 bus.emit("refresh_untreated_num"); //刷新未读消息数目
215 } else if (message.message_type == "18") { 215 } else if (message.message_type == "18") {
216 - if (!collectStoreProvider.sellerPreserve) { 216 + if (!collectStoreProvider.sellerWine) {
217 //没有购买客情维护模块 217 //没有购买客情维护模块
218 //提示购买 218 //提示购买
219 219
220 - DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {}); 220 + DialogUtil.showSellerVersionBuyDialog(context, '存酒管理', (v) {});
221 return; 221 return;
222 } 222 }
223 //存酒超期 223 //存酒超期
@@ -737,12 +737,12 @@ class MessageDialogItemFSim extends StatelessWidget { @@ -737,12 +737,12 @@ class MessageDialogItemFSim extends StatelessWidget {
737 737
738 bus.emit("refresh_untreated_num"); //刷新未读消息数目 738 bus.emit("refresh_untreated_num"); //刷新未读消息数目
739 } else if (message.message_type == "18") { 739 } else if (message.message_type == "18") {
740 - if (!collectStoreProvider.sellerPreserve) { 740 + if (!collectStoreProvider.sellerWine) {
741 //没有购买客情维护模块 741 //没有购买客情维护模块
742 //提示购买 742 //提示购买
743 743
744 DialogUtil.showSellerVersionBuyDialog( 744 DialogUtil.showSellerVersionBuyDialog(
745 - context, '客情维护', (v) {}); 745 + context, '存酒管理', (v) {});
746 return; 746 return;
747 } 747 }
748 748
@@ -141,11 +141,11 @@ class MessageItemFSim extends StatelessWidget { @@ -141,11 +141,11 @@ class MessageItemFSim extends StatelessWidget {
141 //会员充值 141 //会员充值
142 NavigatorUtil.goMessageRechargeInfoPage(context, message.payid); 142 NavigatorUtil.goMessageRechargeInfoPage(context, message.payid);
143 } else if (message.message_type == "18") { 143 } else if (message.message_type == "18") {
144 - if (!collectStoreProvider.sellerPreserve) { 144 + if (!collectStoreProvider.sellerWine) {
145 //没有购买客情维护模块 145 //没有购买客情维护模块
146 //提示购买 146 //提示购买
147 147
148 - DialogUtil.showSellerVersionBuyDialog(context, '请使用带客情维护功能的周到安排商家软件版本。详情请联系400-000-9690', (v) {}); 148 + DialogUtil.showSellerVersionBuyDialog(context, '请使用带存酒管理功能的周到安排商家软件版本。详情请联系400-000-9690', (v) {});
149 return; 149 return;
150 } 150 }
151 //存酒超期 151 //存酒超期
@@ -326,11 +326,11 @@ class MessageItemFSim extends StatelessWidget { @@ -326,11 +326,11 @@ class MessageItemFSim extends StatelessWidget {
326 326
327 bus.emit("refresh_untreated_num"); //刷新未读消息数目 327 bus.emit("refresh_untreated_num"); //刷新未读消息数目
328 } else if (message.message_type == "18") { 328 } else if (message.message_type == "18") {
329 - if (!collectStoreProvider.sellerPreserve) { 329 + if (!collectStoreProvider.sellerWine) {
330 //没有购买客情维护模块 330 //没有购买客情维护模块
331 //提示购买 331 //提示购买
332 332
333 - DialogUtil.showSellerVersionBuyDialog(context, '请使用带客情维护功能的周到安排商家软件版本。详情请联系400-000-9690', (v) {}); 333 + DialogUtil.showSellerVersionBuyDialog(context, '请使用带存酒管理功能的周到安排商家软件版本。详情请联系400-000-9690', (v) {});
334 return; 334 return;
335 } 335 }
336 //存酒超期 336 //存酒超期
@@ -853,12 +853,12 @@ class MessageItemFSim extends StatelessWidget { @@ -853,12 +853,12 @@ class MessageItemFSim extends StatelessWidget {
853 853
854 bus.emit("refresh_untreated_num"); //刷新未读消息数目 854 bus.emit("refresh_untreated_num"); //刷新未读消息数目
855 } else if (message.message_type == "18") { 855 } else if (message.message_type == "18") {
856 - if (!collectStoreProvider.sellerPreserve) { 856 + if (!collectStoreProvider.sellerWine) {
857 //没有购买客情维护模块 857 //没有购买客情维护模块
858 //提示购买 858 //提示购买
859 859
860 DialogUtil.showSellerVersionBuyDialog( 860 DialogUtil.showSellerVersionBuyDialog(
861 - context, '请使用带客情维护功能的周到安排商家软件版本。详情请联系400-000-9690', (v) {}); 861 + context, '请使用带存酒管理功能的周到安排商家软件版本。详情请联系400-000-9690', (v) {});
862 return; 862 return;
863 } 863 }
864 //存酒超期 864 //存酒超期
@@ -1749,8 +1749,13 @@ class NavigatorUtil { @@ -1749,8 +1749,13 @@ class NavigatorUtil {
1749 1749
1750 ///我的------存酒详情 1750 ///我的------存酒详情
1751 static Future<dynamic> goWineDetailPage( 1751 static Future<dynamic> goWineDetailPage(
1752 - BuildContext context, String idstr, bool isStoreWine,  
1753 - {replace = false, bool onlyShow = false}) { 1752 + BuildContext context, String idstr,
  1753 + {bool isStoreWine,replace = false, bool onlyShow = false}) {
  1754 + if(isStoreWine == null){
  1755 + return _navigateTo(context,
  1756 + "${Routes.wine_detail_page}?idstr=$idstr&onlyShow=${onlyShow}",
  1757 + replace: replace);
  1758 + }
1754 return _navigateTo(context, 1759 return _navigateTo(context,
1755 "${Routes.wine_detail_page}?idstr=$idstr&isStoreWine=${isStoreWine}&onlyShow=${onlyShow}", 1760 "${Routes.wine_detail_page}?idstr=$idstr&isStoreWine=${isStoreWine}&onlyShow=${onlyShow}",
1756 replace: replace); 1761 replace: replace);
@@ -3117,15 +3117,22 @@ var createStoreWinePageHandle = new Handler( @@ -3117,15 +3117,22 @@ var createStoreWinePageHandle = new Handler(
3117 var wineDetailPageHandle = new Handler( 3117 var wineDetailPageHandle = new Handler(
3118 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 3118 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
3119 String idstr = params["idstr"].first; 3119 String idstr = params["idstr"].first;
  3120 + bool isStoreWine;
  3121 + if (params.containsKey('isStoreWine')) {
  3122 + isStoreWine = FluroConvertUtils.string2bool(params["isStoreWine"].first);
  3123 + }
3120 3124
3121 - bool isStoreWine = FluroConvertUtils.string2bool(params["isStoreWine"].first);  
3122 bool onlyShow = FluroConvertUtils.string2bool(params["onlyShow"].first); 3125 bool onlyShow = FluroConvertUtils.string2bool(params["onlyShow"].first);
3123 return ChangeNotifierProvider<StoreWineProvider>( 3126 return ChangeNotifierProvider<StoreWineProvider>(
3124 create: (_) => StoreWineProvider(), 3127 create: (_) => StoreWineProvider(),
3125 child: ChangeNotifierProvider<CustomerProvider>( 3128 child: ChangeNotifierProvider<CustomerProvider>(
3126 create: (_) => CustomerProvider(), 3129 create: (_) => CustomerProvider(),
3127 - child: WineDetailPage(  
3128 - idstr: idstr, isStoreWine: isStoreWine, onlyShow: onlyShow))); 3130 + child: ChangeNotifierProvider<PersonnelProvider>(
  3131 + create: (_) => PersonnelProvider(),
  3132 + child: WineDetailPage(
  3133 + idstr: idstr,
  3134 + isStoreWine: isStoreWine,
  3135 + onlyShow: onlyShow))));
3129 }); 3136 });
3130 3137
3131 ///我的----存酒记录 3138 ///我的----存酒记录
@@ -3137,7 +3144,7 @@ var outStoreRecordPageHandle = new Handler( @@ -3137,7 +3144,7 @@ var outStoreRecordPageHandle = new Handler(
3137 create: (_) => StoreWineProvider(), 3144 create: (_) => StoreWineProvider(),
3138 child: ChangeNotifierProvider<CustomerProvider>( 3145 child: ChangeNotifierProvider<CustomerProvider>(
3139 create: (_) => CustomerProvider(), 3146 create: (_) => CustomerProvider(),
3140 - child: OutStoreRecordPage(wid: idstr,isStoreWine:isStoreWine))); 3147 + child: OutStoreRecordPage(wid: idstr, isStoreWine: isStoreWine)));
3141 }); 3148 });
3142 3149
3143 ///我的----申请出库 3150 ///我的----申请出库
@@ -3152,7 +3159,9 @@ var applyOutStorePageHandle = new Handler( @@ -3152,7 +3159,9 @@ var applyOutStorePageHandle = new Handler(
3152 create: (_) => CustomerProvider(), 3159 create: (_) => CustomerProvider(),
3153 child: ChangeNotifierProvider<MenuManageProvider>( 3160 child: ChangeNotifierProvider<MenuManageProvider>(
3154 create: (_) => MenuManageProvider(), 3161 create: (_) => MenuManageProvider(),
3155 - child: ApplyOutStorePage(wineManageDetail: wineManageDetail,isStoreWine:isStoreWine)))); 3162 + child: ApplyOutStorePage(
  3163 + wineManageDetail: wineManageDetail,
  3164 + isStoreWine: isStoreWine))));
3156 }); 3165 });
3157 3166
3158 ///我的----申请出库短信验证输入 3167 ///我的----申请出库短信验证输入
@@ -3856,8 +3865,6 @@ var paymentSettingPageHandle = new Handler( @@ -3856,8 +3865,6 @@ var paymentSettingPageHandle = new Handler(
3856 create: (_) => StoreBaseIndoProvider(), child: PaymentSettingPage())); 3865 create: (_) => StoreBaseIndoProvider(), child: PaymentSettingPage()));
3857 }); 3866 });
3858 3867
3859 -  
3860 -  
3861 ///小程序通知卡片样式 3868 ///小程序通知卡片样式
3862 var miniprogramSettingPageHandle = new Handler( 3869 var miniprogramSettingPageHandle = new Handler(
3863 handlerFunc: (BuildContext context, Map<String, List<Object>> params) { 3870 handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
@@ -3869,13 +3876,9 @@ var miniprogramSettingPageHandle = new Handler( @@ -3869,13 +3876,9 @@ var miniprogramSettingPageHandle = new Handler(
3869 // FluroConvertUtils.fluroCnParamsDecode(params["couponSunModel"].first))); 3876 // FluroConvertUtils.fluroCnParamsDecode(params["couponSunModel"].first)));
3870 return ChangeNotifierProvider<MarketingCenterProvider>( 3877 return ChangeNotifierProvider<MarketingCenterProvider>(
3871 create: (_) => MarketingCenterProvider(), 3878 create: (_) => MarketingCenterProvider(),
3872 - child: MiniprogramSettingPage()); 3879 + child: MiniprogramSettingPage());
3873 }); 3880 });
3874 3881
3875 -  
3876 -  
3877 -  
3878 -  
3879 ///存酒短信模版设置 3882 ///存酒短信模版设置
3880 var wineSettingMsgPageHandle = new Handler( 3883 var wineSettingMsgPageHandle = new Handler(
3881 handlerFunc: (BuildContext context, Map<String, List<Object>> params) { 3884 handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
@@ -3888,7 +3891,5 @@ var wineSettingMsgPageHandle = new Handler( @@ -3888,7 +3891,5 @@ var wineSettingMsgPageHandle = new Handler(
3888 return ChangeNotifierProvider<MenuManageProvider>( 3891 return ChangeNotifierProvider<MenuManageProvider>(
3889 create: (_) => MenuManageProvider(), 3892 create: (_) => MenuManageProvider(),
3890 child: ChangeNotifierProvider<CustomerProvider>( 3893 child: ChangeNotifierProvider<CustomerProvider>(
3891 - create: (_) => CustomerProvider(),  
3892 - child: WineSettingMsgPage())); 3894 + create: (_) => CustomerProvider(), child: WineSettingMsgPage()));
3893 }); 3895 });
3894 -