wxd / MShopWeApp

Commit 6a1b66aee4a0ffacd06d99130694779a24f5a85f

Authored by yvan.ni
1 parent 9431cb23

待支付重新支付判断门店指定是不是匹配

Inline Side-by-side
Showing 2 changed files with 25 additions and 3 deletions
pages/user/order_detail/order_detail.js
  View file @6a1b66a
... ... @@ -24,12 +24,11 @@ Page({
24 24  
25 25 getApp().getConfig2(function (e) {
26 26  
27   -
28 27 th.setData({conf: e,sales_rules:e.sales_rules, userInfo: getApp().globalData.userInfo});
29 28 //--- 看后台是不是有开通等级卡 ---
30 29 if(e.switch_list){
31 30 var s_list=JSON.parse(e.switch_list);
32   - th.setData({sys_switch: s_list,appoint_pick_keyid:s_list.appoint_pick_keyid});
  31 + th.setData({sys_switch: s_list,appoint_pick_keyid:s_list.appoint_pick_keyid});
33 32 var is_open_offline=s_list.is_pricing_open;
34 33 var user=getApp().globalData.userInfo;
35 34 //如果后台有开启等级价的功能
... ... @@ -450,6 +449,18 @@ Page({
450 449 gg = res.data.data;
451 450 })
452 451  
  452 + //-- 要进行判断指定门店的判断优化,先做普通商品 --
  453 + if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids){
  454 + var idx0=gg.pick_up_lists.findIndex(function (e){
  455 + return e.pickup_id==order.pickup_id;
  456 + })
  457 + if(idx0<0){
  458 + getApp().confirmBox(gg.goods_name + "的指定门店不匹配");
  459 + th.setData({ paying: 0 });
  460 + return false;
  461 + }
  462 + }
  463 +
453 464 var limit = gg.viplimited;
454 465 var store_count = gg.store_count;
455 466 good.erpwareid = gg.erpwareid;
... ...
pages/user/order_list/order_list.js
  View file @6a1b66a
... ... @@ -745,7 +745,6 @@ Page({
745 745 for (var i in order_goods) {
746 746 var good = order_goods[i];
747 747  
748   -
749 748 //线下取价功能已经关闭或者过期
750 749 if (!th.data.is_open_offline && good.offline_cut > 0) {
751 750 wx.showModal({
... ... @@ -764,6 +763,18 @@ Page({
764 763 gg = res.data.data;
765 764 })
766 765  
  766 + //-- 要进行判断指定门店的判断优化,先做普通商品 --
  767 + if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids){
  768 + var idx0=gg.pick_up_lists.findIndex(function (e){
  769 + return e.pickup_id==order.pickup_id;
  770 + })
  771 + if(idx0<0){
  772 + getApp().confirmBox(gg.goods_name + "的指定门店不匹配");
  773 + th.setData({ paying: 0 });
  774 + return false;
  775 + }
  776 + }
  777 +
767 778 var limit = gg.viplimited;
768 779 var store_count = gg.store_count;
769 780 good.erpwareid = gg.erpwareid;
... ...