Commit f2f8c5ba119b93cdcf7210920e9174fa993fa869

Authored by wdn127929
1 parent 91359c26

优惠券

@@ -6,7 +6,7 @@ class Constant { @@ -6,7 +6,7 @@ class Constant {
6 6
7 /** 7 /**
8 * 8 *
9 - * 打包注意事项 !!!!!!!! 9 + * 打包注意事项 !!!!!!!! ****************苹果 看看导出预订数据****************
10 * 10 *
11 * 11 *
12 * */ 12 * */
@@ -16,7 +16,7 @@ Notebook _$NotebookFromJson(Map<String, dynamic> json) { @@ -16,7 +16,7 @@ Notebook _$NotebookFromJson(Map<String, dynamic> json) {
16 }); 16 });
17 } 17 }
18 18
19 - List<dynamic> tabletemp = convert.jsonDecode(json['tableinfo'] as String); 19 + List<dynamic> tabletemp = json['tableinfo'] == null ? [] : convert.jsonDecode(json['tableinfo'] as String);
20 20
21 List<t.TableList> temp = []; 21 List<t.TableList> temp = [];
22 tabletemp.forEach((element) { 22 tabletemp.forEach((element) {
@@ -704,6 +704,34 @@ class _CouponDetailPageState extends State<CouponDetailPage> { @@ -704,6 +704,34 @@ class _CouponDetailPageState extends State<CouponDetailPage> {
704 ), 704 ),
705 if (couponProvider.couponSunModel.liteQrcode != null) 705 if (couponProvider.couponSunModel.liteQrcode != null)
706 HEmptyView(30), 706 HEmptyView(30),
  707 + RoundButton(
  708 + text: '复用',
  709 + width: w(100),
  710 + gradientStart: MyColours.color_ffffff,
  711 + gradientEnd: MyColours.color_ffffff,
  712 + borderColor: MyColours.color_438E93,
  713 + textColor: MyColours.color_438E93,
  714 + height: ScreenUtil().setWidth(80),
  715 + radius: ScreenUtil().setWidth(14),
  716 + isBold: true,
  717 + fontSize: 28,
  718 + onPressed: () async {
  719 + //复用,跳转至编辑页面
  720 + bool needRefresh =
  721 + await NavigatorUtil.goCouponEditPage(context,
  722 + isMine:
  723 + couponProvider.couponSunModel.isType ==
  724 + '1'
  725 + ? false
  726 + : true,
  727 + couponSunModel: couponProvider.couponSunModel);
  728 + if(needRefresh != null &&needRefresh){
  729 +
  730 + Navigator.pop(context);
  731 + }
  732 + },
  733 + ),
  734 + HEmptyView(30),
707 Expanded( 735 Expanded(
708 child: RoundButton( 736 child: RoundButton(
709 text: '分享给客户', 737 text: '分享给客户',
@@ -19,6 +19,7 @@ import 'package:one_key/widgets/system_app_bar.dart'; @@ -19,6 +19,7 @@ import 'package:one_key/widgets/system_app_bar.dart';
19 import 'package:one_key/widgets/v_empty_view.dart'; 19 import 'package:one_key/widgets/v_empty_view.dart';
20 import 'package:provider/provider.dart'; 20 import 'package:provider/provider.dart';
21 21
  22 +import '../../models/coupon_model.dart';
22 import '../../models/filter_btn_model.dart'; 23 import '../../models/filter_btn_model.dart';
23 import '../../models/upload_img_model.dart'; 24 import '../../models/upload_img_model.dart';
24 import '../../provider/upload_img_provider.dart'; 25 import '../../provider/upload_img_provider.dart';
@@ -32,7 +33,9 @@ import '../online_check/img_picker_widget.dart'; @@ -32,7 +33,9 @@ import '../online_check/img_picker_widget.dart';
32 33
33 class CouponEidtPage extends StatefulWidget { 34 class CouponEidtPage extends StatefulWidget {
34 final bool isMine; 35 final bool isMine;
35 - CouponEidtPage({Key key, this.isMine = true}) : super(key: key); 36 + final CouponSunModel couponSunModel;
  37 + CouponEidtPage({Key key, this.isMine = true, this.couponSunModel})
  38 + : super(key: key);
36 39
37 @override 40 @override
38 _CouponEidtPageState createState() => _CouponEidtPageState(); 41 _CouponEidtPageState createState() => _CouponEidtPageState();
@@ -162,9 +165,60 @@ class _CouponEidtPageState extends State<CouponEidtPage> { @@ -162,9 +165,60 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
162 } 165 }
163 }); 166 });
164 167
  168 + if (widget.couponSunModel != null) {
  169 + _couponNameEditControl.text = widget.couponSunModel.aname;
  170 + _couponRequireEditControl.text = widget.couponSunModel.desc;
  171 + _couponExplainEditControl.text = widget.couponSunModel.explain;
  172 + DateTime dateTimes = DateTime.fromMillisecondsSinceEpoch(
  173 + int.parse(widget.couponSunModel.stime.toString()) * 1000);
  174 + fromDate = DateUtil.formatDate(dateTimes, format: DateFormats.y_mo_d);
  175 + DateTime dateTimee = DateTime.fromMillisecondsSinceEpoch(
  176 + int.parse(widget.couponSunModel.etime.toString()) * 1000);
  177 + endDate = DateUtil.formatDate(dateTimee, format: DateFormats.y_mo_d);
  178 +
  179 + swichState = widget.couponSunModel.status == '1' ? true : false;
  180 +
  181 + if (widget.isMine) {
  182 + //我的优惠券
  183 +
  184 + } else {
  185 + //店铺
  186 + swichHexiao = widget.couponSunModel.isExamine == '1' ? true : false;
  187 + _priceControl.text = widget.couponSunModel.price;
  188 +
  189 + money = widget.couponSunModel.use.isCash;
  190 + dish = widget.couponSunModel.use.isDish;
  191 + discount = widget.couponSunModel.use.isDiscount;
  192 + moneyControl.text = widget.couponSunModel.use.cash;
  193 + discountControl.text = widget.couponSunModel.use.discount;
  194 + dishControl.text = widget.couponSunModel.use.dish;
  195 +
  196 + if (widget.couponSunModel.use.images.length > 0) {
  197 + widget.couponSunModel.use.images.forEach((element) {
  198 + UploadImgModel uploadImgModel = UploadImgModel();
  199 + uploadImgModel.qiniuUrl = element;
  200 + uploadImgModel.process = 1;
  201 + img.add(uploadImgModel);
  202 + });
  203 + }
  204 +
  205 + limitNone = widget.couponSunModel.expDate.isNone ? true : false;
  206 + limitBirthday = widget.couponSunModel.expDate.isBirthday ? true : false;
  207 + limitWeek = widget.couponSunModel.expDate.isWeek ? true : false;
  208 +
  209 + weekShow = widget.couponSunModel.expDate.weekShow ?? '点击设置可用日期';
  210 + weekData = widget.couponSunModel.expDate.weekData ?? [];
  211 + uids = widget.couponSunModel.uidList;
  212 + _limitNumControl.text = widget.couponSunModel.grantNum;
  213 + }
  214 + }
  215 +
165 WidgetsBinding.instance.addPostFrameCallback((_) { 216 WidgetsBinding.instance.addPostFrameCallback((_) {
166 // _couponNetworkData(0); 217 // _couponNetworkData(0);
167 - _initWeekData(); 218 + if (weekData.length == 0) {
  219 + _initWeekData();
  220 + }
  221 +
168 _getQiniuInfo(); 222 _getQiniuInfo();
169 }); 223 });
170 } 224 }
@@ -818,15 +872,105 @@ class _CouponEidtPageState extends State<CouponEidtPage> { @@ -818,15 +872,105 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
818 .numberWithOptions()), 872 .numberWithOptions()),
819 873
820 if (dish) 874 if (dish)
821 - _textfieldSelect('菜品:', '点击输入赠送菜品名称',  
822 - dishControl, dishFocusNode,  
823 - textInputType: TextInputType.text), 875 + Container(
  876 + padding: EdgeInsets.only(left: w(20)),
  877 + child: Column(
  878 + crossAxisAlignment:
  879 + CrossAxisAlignment.start,
  880 +
  881 + // mainAxisAlignment:
  882 + // MainAxisAlignment.spaceBetween,
  883 + children: [
  884 + Container(
  885 + child: Text(
  886 + '菜品:',
  887 + style: TextStyle(
  888 + color:
  889 + MyColours.color_515151,
  890 + fontSize:
  891 + ScreenUtil().setSp(32)),
  892 + ),
  893 + ),
  894 + VEmptyView(24),
  895 + Container(
  896 + margin: EdgeInsets.only(
  897 + right: w(20),
  898 + ),
  899 + decoration: BoxDecoration(
  900 + borderRadius:
  901 + BorderRadius.circular(
  902 + r(10)),
  903 + border: Border.all(
  904 + width: w(1),
  905 + color: MyColours
  906 + .color_DBDBDB)),
  907 + padding: EdgeInsets.only(
  908 + left: w(8), right: (w(8))),
  909 + child: TextField(
  910 + controller: dishControl,
  911 + textAlign: TextAlign.left,
  912 + textAlignVertical:
  913 + TextAlignVertical
  914 + .bottom,
  915 + maxLines: 5,
  916 + maxLength: 500,
  917 + // //光标颜色
  918 + // cursorColor:
  919 + // widget.isSelect ? Colors.white : MyColours.color_199095,
  920 + //输入文本的样式
  921 + style: TextStyle(
  922 + color: MyColours
  923 + .color_515151,
  924 + fontSize: ScreenUtil()
  925 + .setSp(32),
  926 + ),
  927 + focusNode: dishFocusNode,
  928 + decoration: InputDecoration(
  929 + isCollapsed: true,
  930 + border:
  931 + OutlineInputBorder(
  932 + borderSide:
  933 + BorderSide
  934 + .none),
  935 + hintText: '点击输入赠送菜品名称',
  936 + hintStyle: TextStyle(
  937 + color: MyColours
  938 + .color_999999,
  939 + fontSize: ScreenUtil()
  940 + .setSp(32),
  941 + ),
  942 + enabledBorder:
  943 + new UnderlineInputBorder(
  944 + borderSide:
  945 + BorderSide.none,
  946 + ),
  947 + focusedBorder:
  948 + new UnderlineInputBorder(
  949 + borderSide:
  950 + BorderSide.none,
  951 + ),
  952 + ),
  953 + onChanged: (value) {},
  954 + onEditingComplete: () {
  955 + // FocusScope.of(context)
  956 + // .requestFocus(
  957 + // FocusNode()); //点击空白处隐藏键盘
  958 + },
  959 + keyboardType: TextInputType
  960 + .multiline)),
  961 + ],
  962 + ),
  963 + ),
  964 +
  965 + // _textfieldSelect('', '',
  966 + // , ,
  967 + // textInputType: TextInputType.text),
824 if (dish) VEmptyView(20), 968 if (dish) VEmptyView(20),
825 969
826 if (dish) 970 if (dish)
827 Padding( 971 Padding(
828 padding: EdgeInsets.only( 972 padding: EdgeInsets.only(
829 - left: w(10), right: w(15)), 973 + left: w(20), right: w(15)),
830 child: Consumer<UploadImageProvider>( 974 child: Consumer<UploadImageProvider>(
831 builder: (context, model, _) { 975 builder: (context, model, _) {
832 return ImgPickerWidget( 976 return ImgPickerWidget(
@@ -756,6 +756,7 @@ class MyPageSimState extends State<MyPageSim> with WidgetsBindingObserver { @@ -756,6 +756,7 @@ class MyPageSimState extends State<MyPageSim> with WidgetsBindingObserver {
756 }, 756 },
757 ); 757 );
758 } else { 758 } else {
  759 + //立即续费 7天之内提示立即续费,其他日期,近体诗过期日期,问红旗是否??????
759 DialogUtil 760 DialogUtil
760 .cupertinoAlertSellerEdateDialogSim( 761 .cupertinoAlertSellerEdateDialogSim(
761 context, 762 context,
@@ -322,9 +322,14 @@ class NavigatorUtil { @@ -322,9 +322,14 @@ class NavigatorUtil {
322 322
323 /// 创建优惠券 323 /// 创建优惠券
324 static Future<dynamic> goCouponEditPage(BuildContext context, 324 static Future<dynamic> goCouponEditPage(BuildContext context,
325 - {replace = false, bool isMine = true}) {  
326 - return _navigateTo(context, "${Routes.coupon_edit}?isMine=${isMine}", 325 + {replace = false, bool isMine = true, CouponSunModel couponSunModel}) {
  326 + if(couponSunModel != null){
  327 + return _navigateTo(context, "${Routes.coupon_edit}?isMine=${isMine}&couponSunModel=${FluroConvertUtils.object2string(couponSunModel)}",
327 replace: replace); 328 replace: replace);
  329 + }
  330 + return _navigateTo(context, "${Routes.coupon_edit}?isMine=${isMine}",
  331 + replace: replace);
  332 +
328 } 333 }
329 334
330 /// 选择优惠券 335 /// 选择优惠券
@@ -326,8 +326,6 @@ var homeHandler = new Handler( @@ -326,8 +326,6 @@ var homeHandler = new Handler(
326 solt: solt))))); 326 solt: solt)))));
327 }); 327 });
328 328
329 -  
330 -  
331 // 跳转到主页 329 // 跳转到主页
332 var homeSimHandler = new Handler( 330 var homeSimHandler = new Handler(
333 handlerFunc: (BuildContext context, Map<String, List<Object>> params) { 331 handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
@@ -382,9 +380,6 @@ var reserveDetailHandler = new Handler( @@ -382,9 +380,6 @@ var reserveDetailHandler = new Handler(
382 )))))); 380 ))))));
383 }); 381 });
384 382
385 -  
386 -  
387 -  
388 // 跳转预订详情页 383 // 跳转预订详情页
389 var reserveDetailSimHandler = new Handler( 384 var reserveDetailSimHandler = new Handler(
390 handlerFunc: (BuildContext context, Map<String, List<Object>> params) { 385 handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
@@ -446,8 +441,6 @@ var handleOnlineHandler = new Handler( @@ -446,8 +441,6 @@ var handleOnlineHandler = new Handler(
446 // return HandleOnlinePage(rid, mid,fromNotify: fromNotify); 441 // return HandleOnlinePage(rid, mid,fromNotify: fromNotify);
447 }); 442 });
448 443
449 -  
450 -  
451 // 跳转到处理在线预订 444 // 跳转到处理在线预订
452 var handleOnlineSimHandler = new Handler( 445 var handleOnlineSimHandler = new Handler(
453 handlerFunc: (BuildContext context, Map<String, List<Object>> params) { 446 handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
@@ -585,8 +578,6 @@ var handleInvicationHandler = new Handler( @@ -585,8 +578,6 @@ var handleInvicationHandler = new Handler(
585 child: InvicationPage(rid))))))); 578 child: InvicationPage(rid)))))));
586 }); 579 });
587 580
588 -  
589 -  
590 // 跳转到邀请函页面 581 // 跳转到邀请函页面
591 var handleInvicationSimHandler = new Handler( 582 var handleInvicationSimHandler = new Handler(
592 handlerFunc: (BuildContext context, Map<String, List<Object>> params) { 583 handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
@@ -776,11 +767,24 @@ var handleCouponEditPageHandler = new Handler( @@ -776,11 +767,24 @@ var handleCouponEditPageHandler = new Handler(
776 handlerFunc: (BuildContext context, Map<String, List<Object>> params) { 767 handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
777 // String rid = params["rid"].first; 768 // String rid = params["rid"].first;
778 bool isMine = FluroConvertUtils.string2bool(params["isMine"].first); 769 bool isMine = FluroConvertUtils.string2bool(params["isMine"].first);
  770 + CouponSunModel couponSunModel;
  771 + if(params.keys.contains("couponSunModel")){
  772 + couponSunModel = CouponSunModel.fromJson(json.decode(
  773 + FluroConvertUtils.fluroCnParamsDecode(params["couponSunModel"].first)));
  774 +
  775 + }
  776 +
779 return ChangeNotifierProvider<UploadImageProvider>( 777 return ChangeNotifierProvider<UploadImageProvider>(
780 create: (_) => UploadImageProvider(), 778 create: (_) => UploadImageProvider(),
781 child: CouponEidtPage( 779 child: CouponEidtPage(
782 isMine: isMine, 780 isMine: isMine,
  781 + couponSunModel:couponSunModel
783 )); 782 ));
  783 +
  784 +
  785 +
  786 +
  787 +
784 }); 788 });
785 789
786 ///选择优惠券 790 ///选择优惠券
@@ -835,9 +839,6 @@ var baseInfoPageHandler = new Handler( @@ -835,9 +839,6 @@ var baseInfoPageHandler = new Handler(
835 ))); 839 )));
836 }); 840 });
837 841
838 -  
839 -  
840 -  
841 ///个人资料页面 842 ///个人资料页面
842 var baseInfoPageSimHandler = new Handler( 843 var baseInfoPageSimHandler = new Handler(
843 handlerFunc: (BuildContext context, Map<String, List<Object>> params) { 844 handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
@@ -1134,14 +1135,14 @@ var storeBaseInfoPageHandler = new Handler( @@ -1134,14 +1135,14 @@ var storeBaseInfoPageHandler = new Handler(
1134 return ChangeNotifierProvider<StoreBaseIndoProvider>( 1135 return ChangeNotifierProvider<StoreBaseIndoProvider>(
1135 create: (_) => StoreBaseIndoProvider(), 1136 create: (_) => StoreBaseIndoProvider(),
1136 child: ChangeNotifierProvider<BookSetTimeModel>( 1137 child: ChangeNotifierProvider<BookSetTimeModel>(
1137 - create: (_) => BookSetTimeModel(), child: ChangeNotifierProvider<MarketingCenterProvider>(  
1138 - create: (_) => MarketingCenterProvider(), child: StoreBaseInfoPage()))); 1138 + create: (_) => BookSetTimeModel(),
  1139 + child: ChangeNotifierProvider<MarketingCenterProvider>(
  1140 + create: (_) => MarketingCenterProvider(),
  1141 + child: StoreBaseInfoPage())));
1139 // return ChangeNotifierProvider<UploadImageProvider>( 1142 // return ChangeNotifierProvider<UploadImageProvider>(
1140 // create: (_) => UploadImageProvider(), child: EnterStoreFrontPhotoPage()); 1143 // create: (_) => UploadImageProvider(), child: EnterStoreFrontPhotoPage());
1141 }); 1144 });
1142 1145
1143 -  
1144 -  
1145 ///店铺信息 1146 ///店铺信息
1146 var storeBaseInfoPageSimHandler = new Handler( 1147 var storeBaseInfoPageSimHandler = new Handler(
1147 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1148 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
@@ -1150,8 +1151,10 @@ var storeBaseInfoPageSimHandler = new Handler( @@ -1150,8 +1151,10 @@ var storeBaseInfoPageSimHandler = new Handler(
1150 return ChangeNotifierProvider<StoreBaseIndoProvider>( 1151 return ChangeNotifierProvider<StoreBaseIndoProvider>(
1151 create: (_) => StoreBaseIndoProvider(), 1152 create: (_) => StoreBaseIndoProvider(),
1152 child: ChangeNotifierProvider<BookSetTimeModel>( 1153 child: ChangeNotifierProvider<BookSetTimeModel>(
1153 - create: (_) => BookSetTimeModel(), child: ChangeNotifierProvider<MarketingCenterProvider>(  
1154 - create: (_) => MarketingCenterProvider(), child: StoreBaseInfoPageSim()))); 1154 + create: (_) => BookSetTimeModel(),
  1155 + child: ChangeNotifierProvider<MarketingCenterProvider>(
  1156 + create: (_) => MarketingCenterProvider(),
  1157 + child: StoreBaseInfoPageSim())));
1155 // return ChangeNotifierProvider<UploadImageProvider>( 1158 // return ChangeNotifierProvider<UploadImageProvider>(
1156 // create: (_) => UploadImageProvider(), child: EnterStoreFrontPhotoPage()); 1159 // create: (_) => UploadImageProvider(), child: EnterStoreFrontPhotoPage());
1157 }); 1160 });
@@ -1253,7 +1256,6 @@ var personnelManagePageHandle = new Handler( @@ -1253,7 +1256,6 @@ var personnelManagePageHandle = new Handler(
1253 create: (_) => PersonnelProvider(), child: PersonnelManagePage()); 1256 create: (_) => PersonnelProvider(), child: PersonnelManagePage());
1254 }); 1257 });
1255 1258
1256 -  
1257 ///店员管理 1259 ///店员管理
1258 var personnelManagePageSimHandle = new Handler( 1260 var personnelManagePageSimHandle = new Handler(
1259 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1261 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
@@ -1261,7 +1263,6 @@ var personnelManagePageSimHandle = new Handler( @@ -1261,7 +1263,6 @@ var personnelManagePageSimHandle = new Handler(
1261 create: (_) => PersonnelProvider(), child: PersonnelManagePageSim()); 1263 create: (_) => PersonnelProvider(), child: PersonnelManagePageSim());
1262 }); 1264 });
1263 1265
1264 -  
1265 ///店员详情页面 1266 ///店员详情页面
1266 var personnelDetailPageHandle = new Handler( 1267 var personnelDetailPageHandle = new Handler(
1267 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1268 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
@@ -1275,7 +1276,6 @@ var personnelDetailPageHandle = new Handler( @@ -1275,7 +1276,6 @@ var personnelDetailPageHandle = new Handler(
1275 child: PersonnelDetailPage(index: index, position: position))); 1276 child: PersonnelDetailPage(index: index, position: position)));
1276 }); 1277 });
1277 1278
1278 -  
1279 ///店员详情页面 1279 ///店员详情页面
1280 var personnelDetailPageSimHandle = new Handler( 1280 var personnelDetailPageSimHandle = new Handler(
1281 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1281 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
@@ -1363,19 +1363,14 @@ var customerListPageHandle = new Handler( @@ -1363,19 +1363,14 @@ var customerListPageHandle = new Handler(
1363 sellerUser: sellerUser))); 1363 sellerUser: sellerUser)));
1364 }); 1364 });
1365 1365
1366 -  
1367 -  
1368 ///客情列表 1366 ///客情列表
1369 var customerListPageSimHandle = new Handler( 1367 var customerListPageSimHandle = new Handler(
1370 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1368 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
1371 -  
1372 // banquetDetail = GetBanquetByIdNewSunModel.fromJson(temp); 1369 // banquetDetail = GetBanquetByIdNewSunModel.fromJson(temp);
1373 return ChangeNotifierProvider<CustomerProvider>( 1370 return ChangeNotifierProvider<CustomerProvider>(
1374 create: (_) => CustomerProvider(), 1371 create: (_) => CustomerProvider(),
1375 child: ChangeNotifierProvider<CollectStoreProvider>( 1372 child: ChangeNotifierProvider<CollectStoreProvider>(
1376 - create: (_) => CollectStoreProvider(),  
1377 - child: CustomerListPageSim(  
1378 - ))); 1373 + create: (_) => CollectStoreProvider(), child: CustomerListPageSim()));
1379 }); 1374 });
1380 1375
1381 ///仅供展示的客情列表 ---商家 1376 ///仅供展示的客情列表 ---商家
@@ -1420,7 +1415,6 @@ var myCustomerListPageHandle = new Handler( @@ -1420,7 +1415,6 @@ var myCustomerListPageHandle = new Handler(
1420 MyCustomerListPage(fromPage: fromPage, index: index, uid: uid))); 1415 MyCustomerListPage(fromPage: fromPage, index: index, uid: uid)));
1421 }); 1416 });
1422 1417
1423 -  
1424 ///我的客情列表 1418 ///我的客情列表
1425 var myCustomerListPageSimHandle = new Handler( 1419 var myCustomerListPageSimHandle = new Handler(
1426 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1420 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
@@ -1433,8 +1427,7 @@ var myCustomerListPageSimHandle = new Handler( @@ -1433,8 +1427,7 @@ var myCustomerListPageSimHandle = new Handler(
1433 create: (_) => CustomerProvider(), 1427 create: (_) => CustomerProvider(),
1434 child: ChangeNotifierProvider<CollectStoreProvider>( 1428 child: ChangeNotifierProvider<CollectStoreProvider>(
1435 create: (_) => CollectStoreProvider(), 1429 create: (_) => CollectStoreProvider(),
1436 - child:  
1437 - MyCustomerListPageSim())); 1430 + child: MyCustomerListPageSim()));
1438 }); 1431 });
1439 1432
1440 ///客情设置 1433 ///客情设置
@@ -1609,7 +1602,6 @@ var customerDetailPageHandle = new Handler( @@ -1609,7 +1602,6 @@ var customerDetailPageHandle = new Handler(
1609 )); 1602 ));
1610 }); 1603 });
1611 1604
1612 -  
1613 ///客户详情 1605 ///客户详情
1614 var customerDetailPageSimHandle = new Handler( 1606 var customerDetailPageSimHandle = new Handler(
1615 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1607 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
@@ -1648,7 +1640,6 @@ var myCustomerDetailPageHandle = new Handler( @@ -1648,7 +1640,6 @@ var myCustomerDetailPageHandle = new Handler(
1648 userHistoryEntity: userHistoryEntity, fromPage: fromPage, uid: uid)); 1640 userHistoryEntity: userHistoryEntity, fromPage: fromPage, uid: uid));
1649 }); 1641 });
1650 1642
1651 -  
1652 ///我的客户详情 1643 ///我的客户详情
1653 var myCustomerDetailPageSimHandle = new Handler( 1644 var myCustomerDetailPageSimHandle = new Handler(
1654 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1645 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
@@ -1663,8 +1654,7 @@ var myCustomerDetailPageSimHandle = new Handler( @@ -1663,8 +1654,7 @@ var myCustomerDetailPageSimHandle = new Handler(
1663 // String uid = params["uid"].first; 1654 // String uid = params["uid"].first;
1664 return ChangeNotifierProvider<CustomerProvider>( 1655 return ChangeNotifierProvider<CustomerProvider>(
1665 create: (_) => CustomerProvider(), 1656 create: (_) => CustomerProvider(),
1666 - child: MyCustomerDetailPageSim(  
1667 - userHistoryEntity: userHistoryEntity)); 1657 + child: MyCustomerDetailPageSim(userHistoryEntity: userHistoryEntity));
1668 }); 1658 });
1669 1659
1670 ///编辑客户详情 1660 ///编辑客户详情
@@ -1680,8 +1670,6 @@ var customerDetailEditPageHandle = new Handler( @@ -1680,8 +1670,6 @@ var customerDetailEditPageHandle = new Handler(
1680 child: CustomerDetailEditPage(guest: guest, fromPage: fromPage)); 1670 child: CustomerDetailEditPage(guest: guest, fromPage: fromPage));
1681 }); 1671 });
1682 1672
1683 -  
1684 -  
1685 ///编辑客户详情 1673 ///编辑客户详情
1686 var customerDetailEditPageSimHandle = new Handler( 1674 var customerDetailEditPageSimHandle = new Handler(
1687 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1675 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
@@ -1711,8 +1699,6 @@ var myCustomerDetailEditPageHandle = new Handler( @@ -1711,8 +1699,6 @@ var myCustomerDetailEditPageHandle = new Handler(
1711 )); 1699 ));
1712 }); 1700 });
1713 1701
1714 -  
1715 -  
1716 ///我的编辑客户详情 1702 ///我的编辑客户详情
1717 var myCustomerDetailEditPagSimHandle = new Handler( 1703 var myCustomerDetailEditPagSimHandle = new Handler(
1718 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1704 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
@@ -1725,7 +1711,6 @@ var myCustomerDetailEditPagSimHandle = new Handler( @@ -1725,7 +1711,6 @@ var myCustomerDetailEditPagSimHandle = new Handler(
1725 create: (_) => CustomerProvider(), 1711 create: (_) => CustomerProvider(),
1726 child: MyCustomerDetailEditPageSim( 1712 child: MyCustomerDetailEditPageSim(
1727 guest: guest, 1713 guest: guest,
1728 -  
1729 )); 1714 ));
1730 }); 1715 });
1731 1716
@@ -1826,9 +1811,6 @@ var tableManagerPageHandle = new Handler( @@ -1826,9 +1811,6 @@ var tableManagerPageHandle = new Handler(
1826 child: TableManagerPage(guest: guest))))))))); 1811 child: TableManagerPage(guest: guest)))))))));
1827 }); 1812 });
1828 1813
1829 -  
1830 -  
1831 -  
1832 ///客情列表详情---再次预订 1814 ///客情列表详情---再次预订
1833 var tableManagerPageSimHandle = new Handler( 1815 var tableManagerPageSimHandle = new Handler(
1834 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1816 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
@@ -1860,12 +1842,13 @@ var tableManagerPageSimHandle = new Handler( @@ -1860,12 +1842,13 @@ var tableManagerPageSimHandle = new Handler(
1860 create: (_) => StoreBaseIndoProvider(), 1842 create: (_) => StoreBaseIndoProvider(),
1861 child: ChangeNotifierProvider<CustomerProvider>( 1843 child: ChangeNotifierProvider<CustomerProvider>(
1862 create: (_) => CustomerProvider(), 1844 create: (_) => CustomerProvider(),
1863 - child: ChangeNotifierProvider<  
1864 - MarketingCenterProvider>(  
1865 - create: (_) => MarketingCenterProvider(),  
1866 - child: ChangeNotifierProvider<SmsModel>(  
1867 - create: (_) => SmsModel(),  
1868 - child: TableManagerPageSim(guest: guest))))))))); 1845 + child:
  1846 + ChangeNotifierProvider<MarketingCenterProvider>(
  1847 + create: (_) => MarketingCenterProvider(),
  1848 + child: ChangeNotifierProvider<SmsModel>(
  1849 + create: (_) => SmsModel(),
  1850 + child: TableManagerPageSim(
  1851 + guest: guest)))))))));
1869 }); 1852 });
1870 1853
1871 ///账号登录页面 1854 ///账号登录页面
@@ -2888,8 +2871,6 @@ var bookInfoPageHandle = new Handler( @@ -2888,8 +2871,6 @@ var bookInfoPageHandle = new Handler(
2888 create: (_) => BaseIndoProvider(), child: BookInfoPage())))); 2871 create: (_) => BaseIndoProvider(), child: BookInfoPage()))));
2889 }); 2872 });
2890 2873
2891 -  
2892 -  
2893 //我的----营销中心-预订信息展示 2874 //我的----营销中心-预订信息展示
2894 var bookInfoPageSimHandle = new Handler( 2875 var bookInfoPageSimHandle = new Handler(
2895 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 2876 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
@@ -2904,7 +2885,8 @@ var bookInfoPageSimHandle = new Handler( @@ -2904,7 +2885,8 @@ var bookInfoPageSimHandle = new Handler(
2904 child: ChangeNotifierProvider<StoreBaseIndoProvider>( 2885 child: ChangeNotifierProvider<StoreBaseIndoProvider>(
2905 create: (_) => StoreBaseIndoProvider(), 2886 create: (_) => StoreBaseIndoProvider(),
2906 child: ChangeNotifierProvider<BaseIndoProvider>( 2887 child: ChangeNotifierProvider<BaseIndoProvider>(
2907 - create: (_) => BaseIndoProvider(), child: BookInfoPageSim())))); 2888 + create: (_) => BaseIndoProvider(),
  2889 + child: BookInfoPageSim()))));
2908 }); 2890 });
2909 2891
2910 //我的----营销中心-店铺介绍 2892 //我的----营销中心-店铺介绍
@@ -2914,8 +2896,9 @@ var storeIntroducePageHandle = new Handler( @@ -2914,8 +2896,9 @@ var storeIntroducePageHandle = new Handler(
2914 // NotebookDetail detailEntity = NotebookDetail.fromJson(json 2896 // NotebookDetail detailEntity = NotebookDetail.fromJson(json
2915 // .decode(FluroConvertUtils.fluroCnParamsDecode(params["detail"].first))); 2897 // .decode(FluroConvertUtils.fluroCnParamsDecode(params["detail"].first)));
2916 return ChangeNotifierProvider<MarketingCenterProvider>( 2898 return ChangeNotifierProvider<MarketingCenterProvider>(
2917 - create: (_) => MarketingCenterProvider(), child:ChangeNotifierProvider<StoreBaseIndoProvider>(  
2918 - create: (_) => StoreBaseIndoProvider(), child: StoreIntroducePage())); 2899 + create: (_) => MarketingCenterProvider(),
  2900 + child: ChangeNotifierProvider<StoreBaseIndoProvider>(
  2901 + create: (_) => StoreBaseIndoProvider(), child: StoreIntroducePage()));
2919 }); 2902 });
2920 2903
2921 //我的----营销中心-主厨介绍 2904 //我的----营销中心-主厨介绍
@@ -2949,8 +2932,6 @@ var markingInteractionPageHandle = new Handler( @@ -2949,8 +2932,6 @@ var markingInteractionPageHandle = new Handler(
2949 child: MarkingInteractionPage()); 2932 child: MarkingInteractionPage());
2950 }); 2933 });
2951 2934
2952 -  
2953 -  
2954 //我的----营销中心-客户互动及店铺推广 2935 //我的----营销中心-客户互动及店铺推广
2955 var markingInteractionPageSimHandle = new Handler( 2936 var markingInteractionPageSimHandle = new Handler(
2956 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 2937 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
@@ -3445,8 +3426,6 @@ var customerNoticeSettingPageHandle = new Handler( @@ -3445,8 +3426,6 @@ var customerNoticeSettingPageHandle = new Handler(
3445 child: CustomerNoticeSettingPage()); 3426 child: CustomerNoticeSettingPage());
3446 }); 3427 });
3447 3428
3448 -  
3449 -  
3450 //客户通知配置页 3429 //客户通知配置页
3451 var customerNoticeSettingPageSimHandle = new Handler( 3430 var customerNoticeSettingPageSimHandle = new Handler(
3452 handlerFunc: (BuildContext context, Map<String, List<Object>> params) { 3431 handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
@@ -3644,8 +3623,6 @@ var smsTemplateSettingPageHandle = new Handler( @@ -3644,8 +3623,6 @@ var smsTemplateSettingPageHandle = new Handler(
3644 smsTemplate: smsTemplate, bookinginfo: bookinginfo)); 3623 smsTemplate: smsTemplate, bookinginfo: bookinginfo));
3645 }); 3624 });
3646 3625
3647 -  
3648 -  
3649 //预订通知短信模版选择 3626 //预订通知短信模版选择
3650 3627
3651 var smsTemplateSettingPageSimHandle = new Handler( 3628 var smsTemplateSettingPageSimHandle = new Handler(
@@ -3659,8 +3636,6 @@ var smsTemplateSettingPageSimHandle = new Handler( @@ -3659,8 +3636,6 @@ var smsTemplateSettingPageSimHandle = new Handler(
3659 smsTemplate: smsTemplate, bookinginfo: bookinginfo)); 3636 smsTemplate: smsTemplate, bookinginfo: bookinginfo));
3660 }); 3637 });
3661 3638
3662 -  
3663 -  
3664 //优惠券海报 3639 //优惠券海报
3665 3640
3666 var couponPosterPageHandle = new Handler( 3641 var couponPosterPageHandle = new Handler(