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

season
2 parents e438284b 392a7a18
Showing 2 changed files with 30 additions and 4 deletions
pages/cart/cart/ladder_calculate.js
pages/goods/goodsInfo/goodsInfo.js
@@ -72,6 +72,8 @@ module.exports = {
 		for (var mi in car_item.ladder_map) {
 			var bitem = car_item.ladder_map[mi];
 			var act = bitem.act; //获取到组合购的详情
+			if(!act) continue;
+
 			var all_num = 0; //商品数量之和
 			var all_price = 0;
 			var aprice=0;
@@ -261,7 +261,11 @@ Page({
     hiddenCS: true,
     is_retail_price: 0,
-    is_no_new:1
+    is_no_new:1,
+    base_nor:0,
+    base_nor_prom_type:0,
+    base_nor_prom_id:0,
+    base_nor_goods_id:0,
   },
   //------初始化加载----------
@@ -276,7 +280,7 @@ Page({
       prom_type = t.prom_type || 0,
       prom_id = t.prom_id || 0; //活动ID
-    var share_openid = t.share_openid;
+      var share_openid = t.share_openid;
     self = this;
@@ -355,7 +359,14 @@ Page({
     if (prom_type) {
       this.data.prom_type = prom_type;
       this.data.prom_id = prom_id;
+
+      //-- 基础的活动类型 --
+      this.data.base_nor_prom_type=prom_type;
+      this.data.base_nor_prom_id=prom_id;
+
     }
+    this.data.base_nor_goods_id=gid;
+
     ee.setData({
       gid: gid
     });
@@ -3180,8 +3191,9 @@ Page({
     var nor = e.currentTarget.dataset.nor;
     var sku_g = this.data.sku_g;
-    if (nor) {
+    if (nor || this.data.base_nor) {
       sku_g = this.data.sku_g_pt;
+      this.data.base_nor=nor || this.data.base_nor;
     }
     //that.data.change=1;
@@ -3276,6 +3288,18 @@ Page({
     var prom = null,
       goodsinfo = this.data.sele_g,
       th = this;
+
+    //如果是普通购买的时候，要返回原先
+    if(goodsinfo.goods_id==this.data.base_nor_goods_id){
+      goodsinfo.prom_type=this.data.base_nor_prom_type;
+      goodsinfo.prom_id=this.data.base_nor_prom_id;
+
+      this.setData({
+        prom_type:this.data.base_nor_prom_type,
+        prom_id:this.data.base_nor_prom_id,
+      })
+    }
+
     var user_id = getApp().globalData.user_id;
     if (!user_id) user_id = 0;
     if (goodsinfo.prom_type == 1)  {
@@ -7489,7 +7513,7 @@ Page({
             //-- 判断会员能不能参与阶梯促销 --
             await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => {
-              
+
               if (res.data.code == 0 && res.data.data) {
                 var prom_content = "";
                 //暂定优惠促销还不能重叠