wxd / MShopWeApp

Commit a2dcf50bae8f222809c5d402aef17ec328189dcb

Authored by 后端研发-苏泰源
2 parents 13559c8f b854bf10

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

Inline Side-by-side
Showing 2 changed files with 10 additions and 6 deletions
packageC/pages/presell/cart/cart2.js
  View file @a2dcf50
... ... @@ -1069,7 +1069,7 @@ Page({
1069 1069 if (gg.is_pd_normal) goods.is_pd_normal = 1;
1070 1070  
1071 1071 //如果不立即购买或者秒杀，如果是线下库存购买的时候
1072   - if (goods.prom_type != 1 && goods.prom_type != 6 && th.data.sales_rules == 2) {
  1072 + if (goods.prom_type != 1 && goods.prom_type != 6 && goods.prom_type != 8 && th.data.sales_rules == 2) {
1073 1073 var isok = 1;
1074 1074 await th.check_store_num(goods.goods_id, th.data.bn_pick, gg.goods_num, function (res) {
1075 1075 isok = res;
... ... @@ -1327,6 +1327,10 @@ Page({
1327 1327 goods.prom_type = 7;
1328 1328 goods.prom_id = g_item.prom_id;
1329 1329 break
  1330 + case 8:
  1331 + goods.prom_type = 8;
  1332 + goods.prom_id = g_item.prom_id;
  1333 + break
1330 1334 default:
1331 1335 goods.prom_type = 0;
1332 1336 goods.prom_id = 0;
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @a2dcf50
... ... @@ -137,7 +137,7 @@ Page({
137 137 nation_name: '',
138 138  
139 139 //商品的活动类型 0普通 1秒杀 2团购 3优惠 4 积分购 6拼单 8预售
140   - prom_type: 0,
  140 + prom_type: 8,
141 141 prom_time_text: "",
142 142 prom_price: null,
143 143 prom_buy_limit: 0,
... ... @@ -1852,8 +1852,8 @@ Page({
1852 1852  
1853 1853 th.setData({ all_pick_list: e.data.data.pageData });
1854 1854  
1855   - //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购--
1856   - 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)) {
  1855 + //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购 预售--
  1856 + 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)) {
1857 1857 setTimeout(function () {
1858 1858 th.deal_pickup_dline(e);
1859 1859 }, 800)
... ... @@ -3355,7 +3355,7 @@ Page({
3355 3355 var lock = 0;
3356 3356  
3357 3357 //---如果是活动的时候,同时不是普通购买---
3358   - if ((th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) && !th.data.is_normal) {
  3358 + 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) {
3359 3359 func(); return false;
3360 3360 }
3361 3361  
... ... @@ -3815,7 +3815,7 @@ Page({
3815 3815 this.data.show_prew_img = 1;
3816 3816 wx.previewImage({
3817 3817 //将图片预览出来
3818   - urls: [this.data.sele_g.original_img]
  3818 + urls: [this.data.shareImgPath]
3819 3819 });
3820 3820 },
3821 3821  
... ...