Commit cd2b013a4e2bd3ff89de672a65e6d36ca1d7ab70
Merge branch 'dev' into 'test'
购买积分购商品，团购商品按照普通商品价格进行购买 See merge request !115
Showing
2 changed files
with
3 additions
and
3 deletions
pages/goods/goodsInfo/goodsInfo.js
| @@ -1501,9 +1501,9 @@ Page({ | @@ -1501,9 +1501,9 @@ Page({ | ||
| 1501 | async check_prom(gid, prom_type, prom_id) { | 1501 | async check_prom(gid, prom_type, prom_id) { |
| 1502 | var ee = this, | 1502 | var ee = this, |
| 1503 | th = ee; | 1503 | th = ee; |
| 1504 | - if (prom_type == 3 || prom_type == 0) { | 1504 | + if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 4) { |
| 1505 | this.setData({ | 1505 | this.setData({ |
| 1506 | - prom_type: prom_type, | 1506 | + prom_type: 0, |
| 1507 | isshow: 1, | 1507 | isshow: 1, |
| 1508 | }); | 1508 | }); |
| 1509 | return false; | 1509 | return false; |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -689,7 +689,7 @@ | @@ -689,7 +689,7 @@ | ||
| 689 | <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view> | 689 | <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view> |
| 690 | 690 | ||
| 691 | <!---- 普通商品购买 -----> | 691 | <!---- 普通商品购买 -----> |
| 692 | - <block wx:if="{{prom_type==0}}"> | 692 | + <block wx:if="{{prom_type==0 || prom_type==2 || prom_type==3 || prom_type==4}}"> |
| 693 | 693 | ||
| 694 | <block wx:if="{{sele_g.store_count>0}}"> | 694 | <block wx:if="{{sele_g.store_count>0}}"> |
| 695 | <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view> | 695 | <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view> |