Commit 7bbf86c387e801bafecba2dd5569c4945838d86d
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
2 changed files
with
12 additions
and
2 deletions
pages/cart/cart/cart.js
| ... | ... | @@ -540,7 +540,7 @@ Page({ |
| 540 | 540 | |
| 541 | 541 | var prom = null; |
| 542 | 542 | var now = ut.gettimestamp(); |
| 543 | - await getApp().request.promiseGet(`/api/weshop/activitylist/listGoodActInfo2`, { | |
| 543 | + await getApp().request.promiseGet(`/api/weshop/activitylist/listGoodActInfo2New`, { | |
| 544 | 544 | data: { |
| 545 | 545 | "store_id": oo.stoid, |
| 546 | 546 | "goods_id": item.goods_id, |
| ... | ... | @@ -4366,11 +4366,21 @@ Page({ |
| 4366 | 4366 | var user_id = getApp().globalData.user_id; |
| 4367 | 4367 | if (!user_id) user_id = 0; |
| 4368 | 4368 | var gd = e.currentTarget.dataset.gd; |
| 4369 | + var item2 = e.currentTarget.dataset.item; | |
| 4370 | + | |
| 4369 | 4371 | var good_url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd; |
| 4372 | + | |
| 4373 | + if(item2.prom_type>0){ | |
| 4374 | + good_url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd + "&prom_id=" + item2.prom_id + "&prom_type="+item2.prom_type; | |
| 4375 | + getApp().goto(good_url); | |
| 4376 | + return false; | |
| 4377 | + } | |
| 4378 | + | |
| 4370 | 4379 | var url = "/api/weshop/activitylist/getGoodActInfo"; |
| 4371 | 4380 | var req_data = { |
| 4372 | 4381 | store_id: os.stoid, goodsidlist: gd, is_detail: 1, user_id: user_id |
| 4373 | 4382 | }; |
| 4383 | + | |
| 4374 | 4384 | //获取秒杀的多规格 |
| 4375 | 4385 | getApp().request.promiseGet(url, { data: req_data }).then(res => { |
| 4376 | 4386 | if (res.data.code == 0 && res.data.data) { | ... | ... |
pages/cart/cart/cart.wxml
| ... | ... | @@ -63,7 +63,7 @@ |
| 63 | 63 | </block> |
| 64 | 64 | <block wx:else><view class="order-raido flex-vertical " style="width: 45rpx"></view></block> |
| 65 | 65 | |
| 66 | - <navigator class="goods-img rel" bindtap="go_gd" data-gd="{{items.goods_id}}"> | |
| 66 | + <navigator class="goods-img rel" bindtap="go_gd" data-item="{{items}}" data-gd="{{items.goods_id}}"> | |
| 67 | 67 | <image class="wh100" src="{{items.original_img}}" binderror="bind_bnerr2" data-errorimg="requestData[{{pidx}}].goods[{{idx}}].original_img" data-url="{{items.original_img}}"></image> |
| 68 | 68 | <block wx:if="{{items.is_gift}}"> |
| 69 | 69 | <view style="background-color:red" class="abs flex-center fs26" wx:if="{{items.is_gift==1}}">赠品</view> | ... | ... |