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

yvan.ni
1 parent 9431cb23
Showing 2 changed files with 25 additions and 3 deletions
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -24,12 +24,11 @@ Page({
         getApp().getConfig2(function (e) {
-			
             th.setData({conf: e,sales_rules:e.sales_rules, userInfo: getApp().globalData.userInfo});
             //--- 看后台是不是有开通等级卡 ---
             if(e.switch_list){
             	    var s_list=JSON.parse(e.switch_list);
-									th.setData({sys_switch: s_list,appoint_pick_keyid:s_list.appoint_pick_keyid});
+					th.setData({sys_switch: s_list,appoint_pick_keyid:s_list.appoint_pick_keyid});
 					var is_open_offline=s_list.is_pricing_open;
                     var user=getApp().globalData.userInfo;
                    //如果后台有开启等级价的功能
@@ -450,6 +449,18 @@ Page({
                 gg = res.data.data;
             })
+            //-- 要进行判断指定门店的判断优化,先做普通商品 --
+            if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids){
+                var idx0=gg.pick_up_lists.findIndex(function (e){
+                    return e.pickup_id==order.pickup_id;
+                })
+                if(idx0<0){
+                    getApp().confirmBox(gg.goods_name + "的指定门店不匹配");
+                    th.setData({ paying: 0 });
+                    return false;
+                }
+            }
+
             var limit = gg.viplimited;
             var store_count = gg.store_count;
             good.erpwareid = gg.erpwareid;
@@ -745,7 +745,6 @@ Page({
     for (var i in order_goods) {
       var good = order_goods[i];
-
       //线下取价功能已经关闭或者过期
       if (!th.data.is_open_offline && good.offline_cut > 0) {
         wx.showModal({
@@ -764,6 +763,18 @@ Page({
         gg = res.data.data;
       })
+      //-- 要进行判断指定门店的判断优化,先做普通商品 --
+      if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids){
+          var idx0=gg.pick_up_lists.findIndex(function (e){
+            return e.pickup_id==order.pickup_id;
+          })
+          if(idx0<0){
+            getApp().confirmBox(gg.goods_name + "的指定门店不匹配");
+            th.setData({ paying: 0 });
+            return false;
+          }
+      }
+
       var limit = gg.viplimited;
       var store_count = gg.store_count;
       good.erpwareid = gg.erpwareid;