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

前端开发-罗建龙
2 parents 14381db0 5a731ff7
Showing 2 changed files with 12 additions and 2 deletions
pages/cart/cart/cart.js
pages/cart/cart/cart.wxml
@@ -540,7 +540,7 @@ Page({
               var prom = null;
               var now = ut.gettimestamp();
-              await getApp().request.promiseGet(`/api/weshop/activitylist/listGoodActInfo2`, {
+              await getApp().request.promiseGet(`/api/weshop/activitylist/listGoodActInfo2New`, {
                 data: {
                   "store_id": oo.stoid,
                   "goods_id": item.goods_id,
@@ -4366,11 +4366,21 @@ Page({
     var user_id = getApp().globalData.user_id;
     if (!user_id) user_id = 0;
     var gd = e.currentTarget.dataset.gd;
+    var item2 = e.currentTarget.dataset.item;
+
     var good_url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd;
+
+    if(item2.prom_type>0){
+      good_url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd + "&prom_id=" + item2.prom_id + "&prom_type="+item2.prom_type;
+      getApp().goto(good_url);
+      return false;
+    }
+
     var url = "/api/weshop/activitylist/getGoodActInfo";
     var req_data = {
       store_id: os.stoid, goodsidlist: gd, is_detail: 1, user_id: user_id
     };
+
     //获取秒杀的多规格
     getApp().request.promiseGet(url, { data: req_data }).then(res => {
       if (res.data.code == 0 && res.data.data) {
@@ -63,7 +63,7 @@
           </block>
           <block wx:else><view class="order-raido flex-vertical " style="width: 45rpx"></view></block>
-          <navigator class="goods-img rel" bindtap="go_gd" data-gd="{{items.goods_id}}">
+          <navigator class="goods-img rel" bindtap="go_gd" data-item="{{items}}"  data-gd="{{items.goods_id}}">
             <image class="wh100" src="{{items.original_img}}" binderror="bind_bnerr2" data-errorimg="requestData[{{pidx}}].goods[{{idx}}].original_img" data-url="{{items.original_img}}"></image>
             <block wx:if="{{items.is_gift}}">
                <view style="background-color:red" class="abs flex-center fs26" wx:if="{{items.is_gift==1}}">赠品</view>