diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 8475b59..075e249 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -2057,6 +2057,9 @@ Page({ } dd.order_amount = parseFloat(th.data.order_m).toFixed(2); + if(getApp().globalData.scene) + dd.scene=getApp().globalData.scene; + console.log(JSON.stringify(dd)); wx.request({ url: oo.url + '/api/weshop/order/pay/payPresellWk', diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 3ea477b..8db3a02 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -3957,7 +3957,7 @@ Page({ if (end_time < ut.gettimestamp()) { wx.showToast({title:err_txt, icon: 'none', duration: 3000}); setTimeout(function () { - ut.wx_back(); + getApp().goto("/pages/index/index/index"); }, 2000) gnext=0; return false; diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml index 213583b..6588255 100644 --- a/pages/cart/cart2/cart2.wxml +++ b/pages/cart/cart2/cart2.wxml @@ -726,7 +726,7 @@ - {{gf_pr_name}},可以获赠一下任意{{zp_num}}件商品 + {{gf_pr_name}},可任选{{zp_num}}件商品为赠品 diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index c496da3..439866a 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -801,6 +801,12 @@ Page({ this.wait_for_store_config(); //先检验一下商品的活动情况 this.check_gd_prom_new(function () { + + if(ee.data.prom_type==8){ + getApp().goto("/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+ee.data.gid+"&prom_id="+ee.data.prom_id); + return false; + } + i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, { failRollback: !0, success: function (t) { @@ -839,6 +845,8 @@ Page({ }); } } + + //动态获取商品名称 wx.setNavigationBarTitle({ title: t.data.data.goods_name, @@ -1173,7 +1181,10 @@ Page({ if (num < th.data.goodsInputNum) { // getApp().my_warnning("活动库存不足!", 0, th); - wx.showToast({ title: '活动库存不足!', icon: 'none', }); + wx.showToast({ + title: '活动库存不足!', + icon: 'none', + }); return false; } else { th.add_cart_func(t); @@ -1205,7 +1216,10 @@ Page({ //---判断商品是否超出限购--- if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) { if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) { - wx.showToast({ title: '超出商品限购', icon: 'none', }); + wx.showToast({ + title: '超出商品限购', + icon: 'none', + }); // s.my_warnning('超出商品限购', 0, th); return false; } @@ -1428,7 +1442,10 @@ Page({ if (res.data.data.pageData.length > 0) { var CanOutQty = res.data.data.pageData[0].CanOutQty; if (CanOutQty < e.data.goodsInputNum) { - wx.showToast({ title: '库存不足!', icon: 'none', }); + wx.showToast({ + title: '库存不足!', + icon: 'none', + }); return false; // return s.my_warnning("库存不足!", 0, th); } @@ -2013,7 +2030,10 @@ Page({ var gd_buy_num = th.data.g_buy_num.get(th.data.sele_g.goods_id); if (t + gd_buy_num > th.data.sele_g.viplimited) { - wx.showToast({ title: '超出商品限购', icon: 'none', }); + wx.showToast({ + title: '超出商品限购', + icon: 'none', + }); // s.my_warnning('超出商品限购', 0, th); var num = th.data.sele_g.viplimited - gd_buy_num; if (num < 0) num = 0; @@ -2104,7 +2124,10 @@ Page({ var gd_buy_num = th.data.g_buy_num.get(th.data.sele_g.goods_id); if (t + gd_buy_num > th.data.sele_g.viplimited) { - wx.showToast({ title: '超出商品限购', icon: 'none', }); + wx.showToast({ + title: '超出商品限购', + icon: 'none', + }); // s.my_warnning('超出商品限购', 0, th); var num = th.data.sele_g.viplimited - gd_buy_num; if (num < 0) num = 0; @@ -4321,7 +4344,10 @@ Page({ th = e, o = this.data.sele_g; if (o.store_count <= 0) { - wx.showToast({ title: '库存已为空!', icon: 'none', }); + wx.showToast({ + title: '库存已为空!', + icon: 'none', + }); return false; // return s.my_warnning("库存已为空!", 0, th); }; @@ -5768,7 +5794,10 @@ Page({ if (!th.data.only_pk && !th.data.def_pickpu_list) { // getApp().confirmBox("门店库存不足", null, 25000, !1); - wx.showToast({ title: '门店库存不足', icon: 'none', }); + wx.showToast({ + title: '门店库存不足', + icon: 'none', + }); return false; }