1. 预售购买要带场景

2. 多赠品的优化

1. 预售购买要带场景
2. 多赠品的优化
yvan.ni
1 parent dd20e2fe
Showing 4 changed files with 41 additions and 9 deletions
packageC/pages/presell/cart/cart.js
packageC/pages/presell/goodsInfo/goodsInfo.js
pages/cart/cart2/cart2.wxml
pages/goods/goodsInfo/goodsInfo.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',
@@ -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;
@@ -726,7 +726,7 @@
     </view>
 	<!-- top act_name -->
 	<view class="flex gift_top_v ai_c fs30" style="padding-left: 70rpx">
-		{{gf_pr_name}}，可以获赠一下任意{{zp_num}}件商品
+		{{gf_pr_name}}，可任选{{zp_num}}件商品为赠品
 	</view>
 	<!-- 赠品选择 -->
 	<scroll-view scroll-y="{{true}}" style="height:calc(100% - 300rpx);">
@@ -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;
         }