Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

后端研发-苏泰源
2 parents 13559c8f b854bf10
Showing 2 changed files with 10 additions and 6 deletions
packageC/pages/presell/cart/cart2.js
packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -1069,7 +1069,7 @@ Page({
             if (gg.is_pd_normal) goods.is_pd_normal = 1;
             //如果不立即购买或者秒杀，如果是线下库存购买的时候
-            if (goods.prom_type != 1 && goods.prom_type != 6 && th.data.sales_rules == 2) {
+            if (goods.prom_type != 1 && goods.prom_type != 6 && goods.prom_type != 8 && th.data.sales_rules == 2) {
                 var isok = 1;
                 await th.check_store_num(goods.goods_id, th.data.bn_pick, gg.goods_num, function (res) {
                     isok = res;
@@ -1327,6 +1327,10 @@ Page({
                             goods.prom_type = 7;
                             goods.prom_id = g_item.prom_id;
                             break
+                       case 8:
+                                goods.prom_type = 8;
+                                goods.prom_id = g_item.prom_id;
+                                break
                         default:
                             goods.prom_type = 0;
                             goods.prom_id = 0;
@@ -137,7 +137,7 @@ Page({
     nation_name: '',
     //商品的活动类型 0普通  1秒杀 2团购 3优惠  4 积分购  6拼单 8预售
-    prom_type: 0,
+    prom_type: 8,
     prom_time_text: "",
     prom_price: null,
     prom_buy_limit: 0,
@@ -1852,8 +1852,8 @@ Page({
           th.setData({ all_pick_list: e.data.data.pageData });
-          //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购--
-          if (th.data.sales_rules == 2 && !th.data.is_newsales_rules && ((th.data.prom_type != 1 && th.data.prom_type != 6 && th.data.prom_type != 4) || is_normal == 1)) {
+          //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购 预售--
+          if (th.data.sales_rules == 2 && !th.data.is_newsales_rules && ((th.data.prom_type != 1 && th.data.prom_type != 6 && th.data.prom_type != 4 && th.data.prom_type !=8 ) || is_normal == 1)) {
             setTimeout(function () {
               th.deal_pickup_dline(e);
             }, 800)
@@ -3355,7 +3355,7 @@ Page({
     var lock = 0;
     //---如果是活动的时候,同时不是普通购买---
-    if ((th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) && !th.data.is_normal) {
+    if ((th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4 || th.data.prom_type == 8) && !th.data.is_normal) {
       func(); return false;
     }
@@ -3815,7 +3815,7 @@ Page({
     this.data.show_prew_img = 1;
     wx.previewImage({
       //将图片预览出来
-      urls: [this.data.sele_g.original_img]
+      urls: [this.data.shareImgPath]
     });
   },