秒杀指定门店不可售

yvan.ni
1 parent 509f53cb
Showing 2 changed files with 15 additions and 4 deletions
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -455,7 +455,7 @@ Page({
                     return e.pickup_id==order.pickup_id;
                 })
                 if(idx0<0){
-                    getApp().confirmBox(gg.goods_name + "的指定门店不匹配");
+                    getApp().confirmBox(gg.goods_name + "的门店不可售");
                     th.setData({ paying: 0 });
                     return false;
                 }
@@ -978,6 +978,19 @@ Page({
             }
             //----------如果有活动，并且在进行中，就不计算线下库存---------------
             if (prom) {
+
+                //指定门店的控制
+                if (goodsinfo.prom_type == 1 && prom.pick_up_lists) {
+                    var idx0=prom.pick_up_lists.findIndex(function (e){
+                        return e.pickup_id==order.pick_id;
+                    })
+                    if(idx0<0){
+                        getApp().confirmBox(goodsinfo.goods_name + "秒杀活动的门店不可售");
+                        th.setData({ paying: 0 });
+                        return false;
+                    }
+                }
+
                 var now = ut.gettimestamp();
                 if (prom.is_end == 1 && prom.end_time < now) {
                     var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单'
@@ -1295,16 +1295,14 @@ Page({
         //指定门店的控制
         if (goodsinfo.prom_type == 1 && prom.pick_up_lists) {
-
           var idx0=prom.pick_up_lists.findIndex(function (e){
             return e.pickup_id==order.pick_id;
           })
           if(idx0<0){
             getApp().confirmBox(goodsinfo.goods_name + "秒杀活动的门店不可售");
-            wx.hideLoading();
+            th.setData({ paying: 0 });
             return false;
           }
-
         }