xt / Flutter-ReserveApp · Commits

Go to a project

Commit f764b6ce8cbe80582164ee7f11c6936d50f4589f

Authored by wdn127929
1 parent 0ea1d788
build: skipped

分享排菜单是否显示价格

Inline Side-by-side
Showing 13 changed files with 283 additions and 73 deletions
@@ -45,6 +45,8 @@ class GetDzSellerConfSunModel { @@ -45,6 +45,8 @@ class GetDzSellerConfSunModel {
45 String isStoreSms; 45 String isStoreSms;
46 String storeDate; 46 String storeDate;
47 47
  48 + String isShowPrice;
  49 +
48 GetDzSellerConfSunModel( 50 GetDzSellerConfSunModel(
49 {this.id, 51 {this.id,
50 this.sid, 52 this.sid,
@@ -62,7 +64,8 @@ class GetDzSellerConfSunModel { @@ -62,7 +64,8 @@ class GetDzSellerConfSunModel {
62 this.cookStyle, 64 this.cookStyle,
63 this.cdate, 65 this.cdate,
64 this.isStoreSms, 66 this.isStoreSms,
65 - this.storeDate}); 67 + this.storeDate,
  68 + this.isShowPrice});
66 69
67 GetDzSellerConfSunModel.fromJson(Map<String, dynamic> json) { 70 GetDzSellerConfSunModel.fromJson(Map<String, dynamic> json) {
68 id = json['id']; 71 id = json['id'];
@@ -84,6 +87,7 @@ class GetDzSellerConfSunModel { @@ -84,6 +87,7 @@ class GetDzSellerConfSunModel {
84 cdate = json['cdate']; 87 cdate = json['cdate'];
85 isStoreSms = json['is_store_sms']; 88 isStoreSms = json['is_store_sms'];
86 storeDate = json['store_date']; 89 storeDate = json['store_date'];
  90 + isShowPrice = json['is_show_price'];
87 } 91 }
88 92
89 Map<String, dynamic> toJson() { 93 Map<String, dynamic> toJson() {
@@ -105,6 +109,7 @@ class GetDzSellerConfSunModel { @@ -105,6 +109,7 @@ class GetDzSellerConfSunModel {
105 data['cdate'] = this.cdate; 109 data['cdate'] = this.cdate;
106 data['is_store_sms'] = this.isStoreSms; 110 data['is_store_sms'] = this.isStoreSms;
107 data['store_date'] = this.storeDate; 111 data['store_date'] = this.storeDate;
  112 + data['is_show_price'] = this.isShowPrice;
108 return data; 113 return data;
109 } 114 }
110 } 115 }
@@ -608,7 +608,7 @@ class MenuSunModel { @@ -608,7 +608,7 @@ class MenuSunModel {
608 amounttemp += v.amount; 608 amounttemp += v.amount;
609 amountHasOrderList.add(v); 609 amountHasOrderList.add(v);
610 } 610 }
611 - amount = amounttemp * json['out_all_num']; 611 + amount = amounttemp * (json['out_all_num']??1);
612 }); 612 });
613 // } 613 // }
614 614
@@ -390,6 +390,7 @@ class HttpUrl { @@ -390,6 +390,7 @@ class HttpUrl {
390 390
391 static const String set_confing = 391 static const String set_confing =
392 "?service=App.Reserve.SetConfing"; // 设置订座商家配置信息 392 "?service=App.Reserve.SetConfing"; // 设置订座商家配置信息
  393 +
393 394
394 // static const String send_vc_code = 395 // static const String send_vc_code =
395 // "?service=App.SendSMS.SendVcCode"; // 向指定手机号码发送验证码 396 // "?service=App.SendSMS.SendVcCode"; // 向指定手机号码发送验证码
@@ -29,23 +29,28 @@ class MarketingCenterHomePage extends StatefulWidget { @@ -29,23 +29,28 @@ class MarketingCenterHomePage extends StatefulWidget {
29 29
30 class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> { 30 class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
31 MarketingCenterProvider marketingCenterProvider; 31 MarketingCenterProvider marketingCenterProvider;
32 - bool select = false; 32 + bool select = false; //启用预订安排通知图文模式
  33 + bool selectShowPrice = false; //分享排菜单给客户时展示菜品价格
33 34
34 @override 35 @override
35 void initState() { 36 void initState() {
36 super.initState(); 37 super.initState();
37 38
38 WidgetsBinding.instance.addPostFrameCallback((_) { 39 WidgetsBinding.instance.addPostFrameCallback((_) {
39 - getSellerTemplateConf(); 40 + getDzSellerConf();
40 }); 41 });
41 } 42 }
42 43
43 - getSellerTemplateConf() async {  
44 - bool success = await marketingCenterProvider.getSellerTemplateConf(context);  
45 - if (success && marketingCenterProvider.markDataModel != null) {  
46 - select = marketingCenterProvider.markDataModel.isNewTemplate == '1' 44 + getDzSellerConf() async {
  45 + bool success = await marketingCenterProvider.getDzSellerConf(context);
  46 + if (success && marketingCenterProvider.dzSellerConfModel != null) {
  47 + select = marketingCenterProvider.dzSellerConfModel.isNewTemplate == '1'
47 ? true 48 ? true
48 : false; 49 : false;
  50 + selectShowPrice =
  51 + marketingCenterProvider.dzSellerConfModel.isShowPrice == '1'
  52 + ? true
  53 + : false;
49 setState(() {}); 54 setState(() {});
50 } 55 }
51 } 56 }
@@ -83,6 +88,59 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> { @@ -83,6 +88,59 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
83 ))); 88 )));
84 } 89 }
85 90
  91 + ///分享排菜单给客户时展示菜品价格
  92 +
  93 + Future<bool> _setPriceShow({bool isShowLoading = true}) async {
  94 + Map<String, String> params = {
  95 + 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
  96 + 'key': 'is_show_price',
  97 + 'value': selectShowPrice ? '1' : '0'
  98 + };
  99 +
  100 + bool success = await marketingCenterProvider.setConfing(context, params,
  101 + needToast: false);
  102 +
  103 + if (success) {
  104 + return true;
  105 + } else {
  106 + return false;
  107 + }
  108 + }
  109 +
  110 + ///启用预订安排通知图文模式
  111 + Future<bool> _setNewType({bool isShowLoading = true}) async {
  112 + Map<String, String> params = {
  113 + 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
  114 + 'key': 'is_new_template',
  115 + 'value': select ? '1' : '0'
  116 + };
  117 +
  118 + bool success = await marketingCenterProvider.setConfing(context, params,
  119 + needToast: false);
  120 +
  121 + if (success) {
  122 + return true;
  123 + } else {
  124 + return false;
  125 + }
  126 + }
  127 +
  128 + ///保存接口
  129 + _setData() async {
  130 + Future.wait<bool>([
  131 + _setPriceShow(),
  132 + _setNewType(),
  133 + ]).then((results) {
  134 + print(results[0]);
  135 + if (results[0] && results[1]) {
  136 + Utils.showToast('设置成功');
  137 + }
  138 + }).catchError((e) {
  139 + Utils.showToast('设置失败,请重试');
  140 + print(e);
  141 + });
  142 + }
  143 +
86 @override 144 @override
87 Widget build(BuildContext context) { 145 Widget build(BuildContext context) {
88 marketingCenterProvider = 146 marketingCenterProvider =
@@ -145,6 +203,60 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> { @@ -145,6 +203,60 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
145 InkWell( 203 InkWell(
146 onTap: () { 204 onTap: () {
147 setState(() { 205 setState(() {
  206 + selectShowPrice = !selectShowPrice;
  207 + });
  208 + },
  209 + child: Padding(
  210 + padding: EdgeInsets.only(
  211 + left: w(16),
  212 + top: w(12),
  213 + bottom: w(12),
  214 + right: w(12)),
  215 + child: Row(
  216 + mainAxisAlignment:
  217 + MainAxisAlignment.spaceBetween,
  218 + children: [
  219 + Text(
  220 + '分享排菜单给客户时展示菜品价格',
  221 + style: TextStyle(
  222 + color: MyColours.color_515151,
  223 + fontSize: ScreenUtil().setWidth(32)),
  224 + ),
  225 + Spacer(),
  226 + Container(
  227 + padding: EdgeInsets.symmetric(
  228 + horizontal: w(7), vertical: w(4)),
  229 + child: Image.asset(
  230 + Utils.getImgPath(selectShowPrice
  231 + ? 'swich_on'
  232 + : 'swich_off'),
  233 + width: w(44),
  234 + ),
  235 + )
  236 + // RoundButton(
  237 + // text: '预览',
  238 + // gradientStart: MyColours.color_ffffff,
  239 + // gradientEnd: MyColours.color_ffffff,
  240 + // borderColor: MyColours.color_438E93,
  241 + // textColor: MyColours.color_438E93,
  242 + // radius: ScreenUtil().setWidth(22),
  243 + // fontSize: 24,
  244 + // width: w(72),
  245 + // height: ScreenUtil().setWidth(44),
  246 + // isBold: true,
  247 + // onPressed: () {
  248 + // NavigatorUtil.goMarkingPreviewPage(context);
  249 + // },
  250 + // ),
  251 + ]))),
  252 + Padding(
  253 + padding: EdgeInsets.only(left: w(16)),
  254 + child: MyDivider(double.infinity, w(0.5),
  255 + color: MyColours.color_E7E7E7)),
  256 + VEmptyView(20),
  257 + InkWell(
  258 + onTap: () {
  259 + setState(() {
148 select = !select; 260 select = !select;
149 }); 261 });
150 }, 262 },
@@ -190,6 +302,10 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> { @@ -190,6 +302,10 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
190 // }, 302 // },
191 // ), 303 // ),
192 ]))), 304 ]))),
  305 + Padding(
  306 + padding: EdgeInsets.only(left: w(16)),
  307 + child: MyDivider(double.infinity, w(0.5),
  308 + color: MyColours.color_E7E7E7)),
193 _item('首图形象展示', onTap: () { 309 _item('首图形象展示', onTap: () {
194 NavigatorUtil.goFirstImagePage(context); 310 NavigatorUtil.goFirstImagePage(context);
195 }), 311 }),
@@ -244,18 +360,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> { @@ -244,18 +360,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
244 isBold: true, 360 isBold: true,
245 onPressed: () async { 361 onPressed: () async {
246 //调用接口 362 //调用接口
247 - Map<String, String> params = {  
248 - 'sid': Provider.of<UserModel>(context,  
249 - listen: false)  
250 - .user  
251 - .sellerid,  
252 - 'key': 'is_new_template',  
253 - 'value': select ? '1' : '0'  
254 - };  
255 -  
256 - bool success = await marketingCenterProvider  
257 - .setConfing(context, params);  
258 - if (success) {} 363 + _setData();
259 })) 364 }))
260 ], 365 ],
261 )) 366 ))
@@ -3236,7 +3236,9 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> { @@ -3236,7 +3236,9 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
3236 }); 3236 });
3237 if (!has) { 3237 if (!has) {
3238 //旧的里面没有该菜品 3238 //旧的里面没有该菜品
3239 - show.cookbooklist.add(newcook); 3239 + show.cookbooklist.add(
  3240 + MenuSunModel.fromJson4(
  3241 + newcook.toJson()));
3240 } 3242 }
3241 }); 3243 });
3242 } 3244 }
@@ -3260,7 +3262,8 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> { @@ -3260,7 +3262,8 @@ class _OrderAdvanceEidtPageState extends State<OrderAdvanceEidtPage> {
3260 priceSum: priceSum.toString(), 3262 priceSum: priceSum.toString(),
3261 memberPriceSum: memberPriceSum.toString(), 3263 memberPriceSum: memberPriceSum.toString(),
3262 planDishText: planDishC.text, 3264 planDishText: planDishC.text,
3263 - detailEntity: widget.detailEntity); 3265 + detailEntity: widget.detailEntity,
  3266 + rid: widget.rid);
3264 }, 3267 },
3265 ), 3268 ),
3266 RoundButton( 3269 RoundButton(
@@ -1502,7 +1502,9 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> { @@ -1502,7 +1502,9 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
1502 }); 1502 });
1503 if (!has) { 1503 if (!has) {
1504 //旧的里面没有该菜品 1504 //旧的里面没有该菜品
1505 - show.cookbooklist.add(newcook); 1505 + show.cookbooklist.add(
  1506 + MenuSunModel.fromJson4(
  1507 + newcook.toJson()));
1506 } 1508 }
1507 }); 1509 });
1508 } 1510 }
@@ -1525,7 +1527,8 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> { @@ -1525,7 +1527,8 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
1525 .planCookByRidSunModel.memberPrice, 1527 .planCookByRidSunModel.memberPrice,
1526 planDishText: _planDishProvider 1528 planDishText: _planDishProvider
1527 .planCookByRidSunModel.planPrice, 1529 .planCookByRidSunModel.planPrice,
1528 - detailEntity: widget.detailEntity); 1530 + detailEntity: widget.detailEntity,
  1531 + rid: widget.rid);
1529 } 1532 }
1530 }, '分享排菜单', 1533 }, '分享排菜单',
1531 fontColor: 1534 fontColor:
@@ -2545,9 +2545,7 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> { @@ -2545,9 +2545,7 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
2545 show.allSum += newcook 2545 show.allSum += newcook
2546 .amountHasOrderList[0].amount; 2546 .amountHasOrderList[0].amount;
2547 // } 2547 // }
2548 - }else{  
2549 -  
2550 - } 2548 + } else {}
2551 } 2549 }
2552 } 2550 }
2553 }); 2551 });
@@ -2649,7 +2647,7 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> { @@ -2649,7 +2647,7 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
2649 }); 2647 });
2650 if (!has) { 2648 if (!has) {
2651 //旧的里面没有该菜品 2649 //旧的里面没有该菜品
2652 - show.cookbooklist.add(newcook); 2650 + show.cookbooklist.add(MenuSunModel.fromJson4(newcook.toJson()));
2653 } 2651 }
2654 }); 2652 });
2655 } 2653 }
@@ -2671,7 +2669,8 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> { @@ -2671,7 +2669,8 @@ class _OrderEditListShowPageState extends State<OrderEditListShowPage> {
2671 priceSum: priceSum.toString(), 2669 priceSum: priceSum.toString(),
2672 memberPriceSum: memberPriceSum.toString(), 2670 memberPriceSum: memberPriceSum.toString(),
2673 planDishText: planDishC.text, 2671 planDishText: planDishC.text,
2674 - detailEntity: widget.detailEntity); 2672 + detailEntity: widget.detailEntity,
  2673 + rid:widget.rid);
2675 }, 2674 },
2676 ), 2675 ),
2677 HEmptyView(30), 2676 HEmptyView(30),
@@ -31,6 +31,7 @@ class OrderPreviewPage extends StatefulWidget { @@ -31,6 +31,7 @@ class OrderPreviewPage extends StatefulWidget {
31 final String name; 31 final String name;
32 final String remark; 32 final String remark;
33 final NotebookDetail detailEntity; 33 final NotebookDetail detailEntity;
  34 + final String rid;
34 OrderPreviewPage( 35 OrderPreviewPage(
35 {Key key, 36 {Key key,
36 this.showList, 37 this.showList,
@@ -39,7 +40,8 @@ class OrderPreviewPage extends StatefulWidget { @@ -39,7 +40,8 @@ class OrderPreviewPage extends StatefulWidget {
39 this.planDishText, 40 this.planDishText,
40 this.name, 41 this.name,
41 this.remark, 42 this.remark,
42 - this.detailEntity}) 43 + this.detailEntity,
  44 + this.rid})
43 : super(key: key); 45 : super(key: key);
44 46
45 @override 47 @override
@@ -662,6 +664,7 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> { @@ -662,6 +664,7 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> {
662 VEmptyView(10), 664 VEmptyView(10),
663 ]))), 665 ]))),
664 VEmptyView(10), 666 VEmptyView(10),
  667 + /***
665 if (index != null) 668 if (index != null)
666 InkWell( 669 InkWell(
667 onTap: () { 670 onTap: () {
@@ -785,6 +788,7 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> { @@ -785,6 +788,7 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> {
785 }, 788 },
786 keyboardType: TextInputType.text)), 789 keyboardType: TextInputType.text)),
787 VEmptyView(20), 790 VEmptyView(20),
  791 + */
788 ], 792 ],
789 ))), 793 ))),
790 Container( 794 Container(
@@ -813,7 +817,8 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> { @@ -813,7 +817,8 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> {
813 HEmptyView(30), 817 HEmptyView(30),
814 Expanded( 818 Expanded(
815 child: RoundButton( 819 child: RoundButton(
816 - text: '下一步', 820 + // text: '下一步',
  821 + text: '分享排菜单',
817 gradientStart: MyColours.color_438E93, 822 gradientStart: MyColours.color_438E93,
818 gradientEnd: MyColours.color_438E93, 823 gradientEnd: MyColours.color_438E93,
819 height: w(43), 824 height: w(43),
@@ -821,32 +826,42 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> { @@ -821,32 +826,42 @@ class _OrderPreviewPageState extends State<OrderPreviewPage> {
821 fontSize: 36, 826 fontSize: 36,
822 isBold: false, 827 isBold: false,
823 onPressed: () { 828 onPressed: () {
824 - if (index != null) {  
825 - NavigatorUtil.goOrderSharePage(context,  
826 - object: {'object': widget.showList},  
827 - name: widget.name,  
828 - remark: widget.remark,  
829 - priceSum: widget.priceSum,  
830 - memberPriceSum: widget.memberPriceSum,  
831 - planDishText: widget.planDishText,  
832 - detailEntity: widget.detailEntity,  
833 - rechargeListSunModel:  
834 - marketingCenterProvider.rechargeList[index],  
835 - recommend: recommendC.text,  
836 - isRecharge: isRecharge,  
837 - isRecommend: isRecommend);  
838 - } else {  
839 - NavigatorUtil.goOrderSharePage(  
840 - context,  
841 - object: {'object': widget.showList},  
842 - name: widget.name,  
843 - remark: widget.remark,  
844 - priceSum: widget.priceSum,  
845 - memberPriceSum: widget.memberPriceSum,  
846 - planDishText: widget.planDishText,  
847 - detailEntity: widget.detailEntity,  
848 - );  
849 - } 829 + Utils.goShareOrderFoodToWeChatPaicai(
  830 + context,
  831 + data: widget.showList,
  832 + title: '菜品已点好，快来看看都点了什么～',
  833 + img:
  834 + 'http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148571.jpg',
  835 + rid: widget.rid,
  836 + // oid: oid,
  837 + );
  838 +
  839 + // if (index != null) {
  840 + // NavigatorUtil.goOrderSharePage(context,
  841 + // object: {'object': widget.showList},
  842 + // name: widget.name,
  843 + // remark: widget.remark,
  844 + // priceSum: widget.priceSum,
  845 + // memberPriceSum: widget.memberPriceSum,
  846 + // planDishText: widget.planDishText,
  847 + // detailEntity: widget.detailEntity,
  848 + // rechargeListSunModel:
  849 + // marketingCenterProvider.rechargeList[index],
  850 + // recommend: recommendC.text,
  851 + // isRecharge: isRecharge,
  852 + // isRecommend: isRecommend);
  853 + // } else {
  854 + // NavigatorUtil.goOrderSharePage(
  855 + // context,
  856 + // object: {'object': widget.showList},
  857 + // name: widget.name,
  858 + // remark: widget.remark,
  859 + // priceSum: widget.priceSum,
  860 + // memberPriceSum: widget.memberPriceSum,
  861 + // planDishText: widget.planDishText,
  862 + // detailEntity: widget.detailEntity,
  863 + // );
  864 + // }
850 }, 865 },
851 ), 866 ),
852 ) 867 )
@@ -6,6 +6,7 @@ import 'package:provider/provider.dart'; @@ -6,6 +6,7 @@ import 'package:provider/provider.dart';
6 6
7 import '../constant/constant.dart'; 7 import '../constant/constant.dart';
8 import '../constant/error.dart'; 8 import '../constant/error.dart';
  9 +import '../models/GetDzSellerConfModel.dart';
9 import '../models/mark_data_model.dart'; 10 import '../models/mark_data_model.dart';
10 import '../models/recharge_notice_model.dart'; 11 import '../models/recharge_notice_model.dart';
11 import '../models/tableOuter.dart'; 12 import '../models/tableOuter.dart';
@@ -34,7 +35,7 @@ class MarketingCenterProvider extends ChangeNotifier { @@ -34,7 +35,7 @@ class MarketingCenterProvider extends ChangeNotifier {
34 PageState pageStateMessageDetail = PageState.Loading; 35 PageState pageStateMessageDetail = PageState.Loading;
35 36
36 RechargeNoticeSunModel rechargeNoticeSunModel; 37 RechargeNoticeSunModel rechargeNoticeSunModel;
37 - 38 + GetDzSellerConfSunModel dzSellerConfModel;
38 39
39 //获取桌位列表 40 //获取桌位列表
40 getTableList(context, {needLoading = true}) async { 41 getTableList(context, {needLoading = true}) async {
@@ -46,6 +47,30 @@ class MarketingCenterProvider extends ChangeNotifier { @@ -46,6 +47,30 @@ class MarketingCenterProvider extends ChangeNotifier {
46 notifyListeners(); 47 notifyListeners();
47 } 48 }
48 49
  50 + // 获取商家订座配置
  51 + Future<bool> getDzSellerConf(BuildContext context,
  52 + {bool showLoading = true}) async {
  53 + Map<String, String> params = {
  54 + 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid
  55 + };
  56 + BaseResp<dynamic> baseResp = await DioUtil()
  57 + .request<dynamic>(context, Method.get, HttpUrl.get_dz_seller_conf,
  58 + data: params, showLoading: showLoading)
  59 + .catchError((error) {
  60 + print(error.toString());
  61 + Utils.showToast('请求失败,请重试');
  62 + return false;
  63 + });
  64 + if (baseResp.code == Constant.status_success) {
  65 + dzSellerConfModel =
  66 + GetDzSellerConfModel.fromJson(baseResp.responseData).data;
  67 + return true;
  68 + } else {
  69 + Utils.showToast(baseResp.msg ?? '请求失败,请重试');
  70 + }
  71 + return false;
  72 + }
  73 +
49 // 商家设置预订安排模板页面 74 // 商家设置预订安排模板页面
50 Future<bool> setSellerTemplateConf( 75 Future<bool> setSellerTemplateConf(
51 BuildContext context, Map<String, String> params, 76 BuildContext context, Map<String, String> params,
@@ -72,24 +97,33 @@ class MarketingCenterProvider extends ChangeNotifier { @@ -72,24 +97,33 @@ class MarketingCenterProvider extends ChangeNotifier {
72 97
73 // 设置订座商家配置信息 98 // 设置订座商家配置信息
74 Future<bool> setConfing(BuildContext context, Map<String, String> params, 99 Future<bool> setConfing(BuildContext context, Map<String, String> params,
75 - {bool showLoading = true}) async { 100 + {bool showLoading = true, bool needToast = true}) async {
76 BaseResp<dynamic> baseResp = await DioUtil() 101 BaseResp<dynamic> baseResp = await DioUtil()
77 .request<dynamic>(context, Method.get, HttpUrl.set_confing, 102 .request<dynamic>(context, Method.get, HttpUrl.set_confing,
78 data: params, showLoading: showLoading) 103 data: params, showLoading: showLoading)
79 .catchError((error) { 104 .catchError((error) {
80 print(error.toString()); 105 print(error.toString());
81 - Utils.showToast('设置失败,请重试'); 106 + if (needToast) {
  107 + Utils.showToast('设置失败,请重试');
  108 + }
  109 +
82 return false; 110 return false;
83 }); 111 });
84 if (baseResp.code == Constant.status_success) { 112 if (baseResp.code == Constant.status_success) {
85 if (baseResp.data == 0 || baseResp.data == 1) { 113 if (baseResp.data == 0 || baseResp.data == 1) {
86 - Utils.showToast('设置成功'); 114 + if (needToast) {
  115 + Utils.showToast('设置成功');
  116 + }
87 return true; 117 return true;
88 } else { 118 } else {
89 - Utils.showToast('设置失败,请重试'); 119 + if (needToast) {
  120 + Utils.showToast('设置失败,请重试');
  121 + }
90 } 122 }
91 } else { 123 } else {
92 - Utils.showToast(baseResp.msg ?? '设置失败,请重试'); 124 + if (needToast) {
  125 + Utils.showToast(baseResp.msg ?? '设置失败,请重试');
  126 + }
93 } 127 }
94 return false; 128 return false;
95 } 129 }
@@ -298,8 +332,7 @@ class MarketingCenterProvider extends ChangeNotifier { @@ -298,8 +332,7 @@ class MarketingCenterProvider extends ChangeNotifier {
298 return false; 332 return false;
299 }); 333 });
300 if (baseResp.code == Constant.status_success) { 334 if (baseResp.code == Constant.status_success) {
301 - rechargeNoticeSunModel =  
302 - RechargeNoticeModel.fromJson(baseResp.data).data; 335 + rechargeNoticeSunModel = RechargeNoticeModel.fromJson(baseResp.data).data;
303 pageStateMessageDetail = PageState.Success; 336 pageStateMessageDetail = PageState.Success;
304 notifyListeners(); 337 notifyListeners();
305 return true; 338 return true;
@@ -222,7 +222,7 @@ class MenuManageProvider extends ChangeNotifier { @@ -222,7 +222,7 @@ class MenuManageProvider extends ChangeNotifier {
222 GetDzSellerConfModel.fromJson(baseResp.responseData).data; 222 GetDzSellerConfModel.fromJson(baseResp.responseData).data;
223 return true; 223 return true;
224 } else { 224 } else {
225 - Utils.showToast(baseResp.msg ?? '设置失败,请重试'); 225 + Utils.showToast(baseResp.msg ?? '请求失败,请重试');
226 } 226 }
227 return false; 227 return false;
228 } 228 }
@@ -1270,7 +1270,8 @@ class NavigatorUtil { @@ -1270,7 +1270,8 @@ class NavigatorUtil {
1270 String planDishText, 1270 String planDishText,
1271 String name, 1271 String name,
1272 String remark, 1272 String remark,
1273 - NotebookDetail detailEntity}) { 1273 + NotebookDetail detailEntity,
  1274 + String rid}) {
1274 // if (invoice != null) { 1275 // if (invoice != null) {
1275 // return _navigateTo(context, 1276 // return _navigateTo(context,
1276 // "${Routes.order_advance_home_page}?invoice=${FluroConvertUtils.object2string(invoice)}", 1277 // "${Routes.order_advance_home_page}?invoice=${FluroConvertUtils.object2string(invoice)}",
@@ -1281,7 +1282,7 @@ class NavigatorUtil { @@ -1281,7 +1282,7 @@ class NavigatorUtil {
1281 // "${Routes.order_advance_home_page}?tids=$tids&tableidNow=$tableidNow&fromPage=$fromPage&canChoose=$canChoose&object=${FluroConvertUtils.object2string(object)}"); 1282 // "${Routes.order_advance_home_page}?tids=$tids&tableidNow=$tableidNow&fromPage=$fromPage&canChoose=$canChoose&object=${FluroConvertUtils.object2string(object)}");
1282 // } 1283 // }
1283 return _navigateTo(context, 1284 return _navigateTo(context,
1284 - "${Routes.order_preview_page}?object=${FluroConvertUtils.object2string(object)}&priceSum=$priceSum&memberPriceSum=$memberPriceSum&planDishText=${Uri.encodeComponent(planDishText)}&name=${Uri.encodeComponent(name)}&remark=${Uri.encodeComponent(remark)}&detail=${FluroConvertUtils.object2string(detailEntity)}", 1285 + "${Routes.order_preview_page}?object=${FluroConvertUtils.object2string(object)}&priceSum=$priceSum&memberPriceSum=$memberPriceSum&planDishText=${Uri.encodeComponent(planDishText)}&name=${Uri.encodeComponent(name)}&remark=${Uri.encodeComponent(remark)}&detail=${FluroConvertUtils.object2string(detailEntity)}&rid=$rid",
1285 replace: replace); 1286 replace: replace);
1286 } 1287 }
1287 1288
@@ -2100,6 +2100,7 @@ var orderPreviewPageHandle = new Handler( @@ -2100,6 +2100,7 @@ var orderPreviewPageHandle = new Handler(
2100 String planDishText = params["planDishText"].first; 2100 String planDishText = params["planDishText"].first;
2101 String name = params["name"].first; 2101 String name = params["name"].first;
2102 String remark = params["remark"].first; 2102 String remark = params["remark"].first;
  2103 + String rid = params["rid"].first;
2103 2104
2104 return ChangeNotifierProvider<PlanDishProvider>( 2105 return ChangeNotifierProvider<PlanDishProvider>(
2105 create: (_) => PlanDishProvider(), 2106 create: (_) => PlanDishProvider(),
@@ -2112,7 +2113,8 @@ var orderPreviewPageHandle = new Handler( @@ -2112,7 +2113,8 @@ var orderPreviewPageHandle = new Handler(
2112 planDishText: planDishText, 2113 planDishText: planDishText,
2113 name: name, 2114 name: name,
2114 remark: remark, 2115 remark: remark,
2115 - detailEntity: detailEntity))); 2116 + detailEntity: detailEntity,
  2117 + rid: rid)));
2116 }); 2118 });
2117 2119
2118 ///经理排菜---排菜编辑列表展示 2120 ///经理排菜---排菜编辑列表展示
@@ -36,6 +36,7 @@ import 'package:path_provider/path_provider.dart'; @@ -36,6 +36,7 @@ import 'package:path_provider/path_provider.dart';
36 import 'package:image_cropper/image_cropper.dart'; 36 import 'package:image_cropper/image_cropper.dart';
37 import 'dart:math'; 37 import 'dart:math';
38 38
  39 +import '../models/cookbook_model.dart';
39 import '../models/coupon_model.dart'; 40 import '../models/coupon_model.dart';
40 import '../models/recharge_list_model.dart'; 41 import '../models/recharge_list_model.dart';
41 // import 'dart:typed_data'; 42 // import 'dart:typed_data';
@@ -1213,6 +1214,48 @@ class Utils { @@ -1213,6 +1214,48 @@ class Utils {
1213 miniProgramType: WXMiniProgramType.RELEASE); 1214 miniProgramType: WXMiniProgramType.RELEASE);
1214 } 1215 }
1215 1216
  1217 + //分享排菜单
  1218 + static goShareOrderFoodToWeChatPaicai(BuildContext context,
  1219 + {List<MenuModel> data,
  1220 + String title,
  1221 + String rid,
  1222 + String oid,
  1223 + String img}) async {
  1224 + Loading.showLoading(context);
  1225 + String _webPageUrl = "http://colorcun.com/";
  1226 + // String _thumbnail = img;
  1227 + String sellerImage =
  1228 + Provider.of<UserModel>(context, listen: false).user.sellerimage;
  1229 + // String _thumbnail = sellerImage == null || sellerImage == ''
  1230 + // ? 'http://nosqn.colorcun.com/reserve/images/3x/%E6%9A%82%E6%97%A0.png'
  1231 + // : sellerImage;
  1232 + String _thumbnail =
  1233 + 'https://nosqn.colorcun.com/share_advanced_order_new.png';
  1234 +
  1235 + String _title = title;
  1236 + String _userName = "gh_487873d353b3";
  1237 + // String _path =
  1238 + // "pack-cookbook/pages/success?rid=$rid&identity=2&hasOnlyShow=1";
  1239 + String _path =
  1240 + "pack-cookbook/pages/success_new?cookbooklist=${json.encode(data)}&hasSuccess=1&oid=$oid&rid=$rid&identity=2&hasOnlyShow=1&sellerName=${Provider.of<UserModel>(context, listen: false).user.sellername}&sid=${Provider.of<UserModel>(context, listen: false).user.sellerid}&type=2";
  1241 + String _description = "OneKey";
  1242 + // Uint8List source = await testComporessList(context, _thumbnail);
  1243 + print(_path);
  1244 + var model = new WeChatShareMiniProgramModel(
  1245 + miniProgramType: WXMiniProgramType.RELEASE,
  1246 + webPageUrl: _webPageUrl,
  1247 + userName: _userName,
  1248 + title: _title,
  1249 + path: _path,
  1250 + description: _description,
  1251 + thumbnail: WeChatImage.network(_thumbnail)
  1252 + // thumbnail: WeChatImage.binary(source)
  1253 + );
  1254 + bool isShare = await shareToWeChat(model);
  1255 + print(isShare);
  1256 + Loading.hideLoading(context);
  1257 + }
  1258 +
1216 //分享已点菜品----跳转小程序提前点餐 1259 //分享已点菜品----跳转小程序提前点餐
1217 static goShareOrderPageToWeChat(BuildContext context, 1260 static goShareOrderPageToWeChat(BuildContext context,
1218 {String title, String rid, String img, String oid, String sid}) async { 1261 {String title, String rid, String img, String oid, String sid}) async {
@@ -1272,7 +1315,7 @@ class Utils { @@ -1272,7 +1315,7 @@ class Utils {
1272 // String _path = 1315 // String _path =
1273 // "pack-cookbook/pages/success?rid=$rid&identity=2&hasOnlyShow=1"; 1316 // "pack-cookbook/pages/success?rid=$rid&identity=2&hasOnlyShow=1";
1274 String _path = 1317 String _path =
1275 - "pack-cookbook/pages/success_new?hasSuccess=1&oid=$oid&rid=$rid&identity=2&hasOnlyShow=1&sellerName=${Provider.of<UserModel>(context, listen: false).user.sellername}&sid=${Provider.of<UserModel>(context, listen: false).user.sellerid}"; 1318 + "pack-cookbook/pages/success_new?hasSuccess=1&oid=$oid&rid=$rid&identity=2&hasOnlyShow=1&sellerName=${Provider.of<UserModel>(context, listen: false).user.sellername}&sid=${Provider.of<UserModel>(context, listen: false).user.sellerid}&type=1";
1276 String _description = "OneKey"; 1319 String _description = "OneKey";
1277 // Uint8List source = await testComporessList(context, _thumbnail); 1320 // Uint8List source = await testComporessList(context, _thumbnail);
1278 var model = new WeChatShareMiniProgramModel( 1321 var model = new WeChatShareMiniProgramModel(
@@ -1690,7 +1733,7 @@ class Utils { @@ -1690,7 +1733,7 @@ class Utils {
1690 path: _path, 1733 path: _path,
1691 description: 'hhh', 1734 description: 'hhh',
1692 // miniProgramType: WXMiniProgramType.PREVIEW, //体验版 1735 // miniProgramType: WXMiniProgramType.PREVIEW, //体验版
1693 - miniProgramType: WXMiniProgramType.RELEASE, //正式版 1736 + miniProgramType: WXMiniProgramType.RELEASE, //正式版
1694 // miniProgramType: WXMiniProgramType.TEST //开发版 1737 // miniProgramType: WXMiniProgramType.TEST //开发版
1695 // thumbnail: WeChatImage.binary(source) 1738 // thumbnail: WeChatImage.binary(source)
1696 thumbnail: WeChatImage.network(_thumbnail), 1739 thumbnail: WeChatImage.network(_thumbnail),
@@ -1745,7 +1788,7 @@ class Utils { @@ -1745,7 +1788,7 @@ class Utils {
1745 path: _path, 1788 path: _path,
1746 description: _description, 1789 description: _description,
1747 // miniProgramType: WXMiniProgramType.PREVIEW, //体验版 1790 // miniProgramType: WXMiniProgramType.PREVIEW, //体验版
1748 - miniProgramType: WXMiniProgramType.RELEASE, //正式版 1791 + miniProgramType: WXMiniProgramType.RELEASE, //正式版
1749 // miniProgramType: WXMiniProgramType.TEST //开发版 1792 // miniProgramType: WXMiniProgramType.TEST //开发版
1750 // thumbnail: WeChatImage.binary(source) 1793 // thumbnail: WeChatImage.binary(source)
1751 thumbnail: WeChatImage.network(_thumbnail) 1794 thumbnail: WeChatImage.network(_thumbnail)
@@ -1799,7 +1842,7 @@ class Utils { @@ -1799,7 +1842,7 @@ class Utils {
1799 path: _path, 1842 path: _path,
1800 description: _description, 1843 description: _description,
1801 // miniProgramType: WXMiniProgramType.PREVIEW, //体验版 1844 // miniProgramType: WXMiniProgramType.PREVIEW, //体验版
1802 - miniProgramType: WXMiniProgramType.RELEASE, //正式版 1845 + miniProgramType: WXMiniProgramType.RELEASE, //正式版
1803 // miniProgramType: WXMiniProgramType.TEST //开发版 1846 // miniProgramType: WXMiniProgramType.TEST //开发版
1804 // thumbnail: WeChatImage.binary(source) 1847 // thumbnail: WeChatImage.binary(source)
1805 thumbnail: WeChatImage.network(_thumbnail) 1848 thumbnail: WeChatImage.network(_thumbnail)