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

WXD-SEASON\season
2 parents 1e41d1d9 d9d20c5d
Showing 2 changed files with 15 additions and 7 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
pages/goods/goodsInfo/goodsInfo.js
@@ -6357,7 +6357,7 @@ Page({
       var url = '/api/weshop/activitylist/listGoodActInfo2New';
       var req_d = {
         "store_id": os.stoid,
-        "goods_id": this.data.gid,
+        "goods_id": gid,
         "user_id": user_id,
       }
       await getApp().request.promiseGet(url, {
@@ -3444,7 +3444,7 @@ Page({
     else that.get_sto();
     if (!item.whsle_id && ([1,2,4,6].indexOf(item.prom_type)==-1 || this.data.is_normal==1))
-       that.check_is_youhui(gid, that.data.is_normal);
+       that.check_is_youhui(gid, that.data.is_normal,1);
     //默认门店要拿下门店库存
     if (that.data.sales_rules >= 2 && that.data.def_pick_store && !that.data.sele_g.whsle_id && [1,2,4,6].indexOf(item.prom_type)==-1) {
@@ -7478,19 +7478,19 @@ Page({
     })
   },
-  //---检查有没有优惠活动---
-  check_is_youhui:async function (gid, is_nor) {
+  //---检查有没有优惠活动---  is_nor的普通购买的时候，is_spec是切换规格的时候
+  check_is_youhui:async function (gid, is_nor,is_spec) {
     var th = this;
     var user_id = getApp().globalData.user_id;
     if (!user_id) user_id = 0;
     //普通购买的时候，重新算一下组合购有没有
-    if(is_nor){
+    if(is_nor || is_spec){
       var arr3=null;
       var url = '/api/weshop/activitylist/listGoodActInfo2New';
       var req_d = {
         "store_id": os.stoid,
-        "goods_id": this.data.gid,
+        "goods_id": gid,
         "user_id": user_id,
       }
       await getApp().request.promiseGet(url, {
@@ -7518,7 +7518,15 @@ Page({
             }
             if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) {
               //-- 获取商品列表 --
-              th.data.zh_act=e.data.data;
+
+              if(is_spec){
+                th.setData({
+                  zh_act:e.data.data
+                })
+              }else{
+                th.data.zh_act=e.data.data;
+              }
+
               th.getUserBuyPromNum(e.data.data.id)
             }
           }