Commit ac3b287df7e28e08fc6a89ec8281c75002423dcc
1 parent
a2d8ab68
积分购不能购买的优化
Showing
2 changed files
with
2 additions
and
5 deletions
pages/goods/goodsInfo/goodsInfo.js
| @@ -1568,7 +1568,7 @@ Page({ | @@ -1568,7 +1568,7 @@ Page({ | ||
| 1568 | } | 1568 | } | 
| 1569 | 1569 | ||
| 1570 | //如果是积分够,is_integral_normal就要有积分购普通购买字段 | 1570 | //如果是积分够,is_integral_normal就要有积分购普通购买字段 | 
| 1571 | - if (o.prom_type == 4) { | 1571 | + if (th.data.openSpecModal_inte_normal== 1 && th.data.prom_type==4) { | 
| 1572 | newd.is_integral_normal = 1; | 1572 | newd.is_integral_normal = 1; | 
| 1573 | } | 1573 | } | 
| 1574 | 1574 | ||
| @@ -3277,7 +3277,7 @@ Page({ | @@ -3277,7 +3277,7 @@ Page({ | ||
| 3277 | th = this; | 3277 | th = this; | 
| 3278 | var user_id = getApp().globalData.user_id; | 3278 | var user_id = getApp().globalData.user_id; | 
| 3279 | if (!user_id) user_id = 0; | 3279 | if (!user_id) user_id = 0; | 
| 3280 | - if (goodsinfo.prom_type == 1) { | 3280 | + if (goodsinfo.prom_type == 1) { | 
| 3281 | await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => { | 3281 | await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => { | 
| 3282 | if (res.data.code == 0) { | 3282 | if (res.data.code == 0) { | 
| 3283 | prom = res.data.data; | 3283 | prom = res.data.data; | 
| @@ -4762,7 +4762,6 @@ Page({ | @@ -4762,7 +4762,6 @@ Page({ | ||
| 4762 | goodsInputNum: 1 | 4762 | goodsInputNum: 1 | 
| 4763 | }); //拼团直接给4 | 4763 | }); //拼团直接给4 | 
| 4764 | 4764 | ||
| 4765 | - | ||
| 4766 | //--先判断会员状态-- | 4765 | //--先判断会员状态-- | 
| 4767 | var user_info = getApp().globalData.userInfo; | 4766 | var user_info = getApp().globalData.userInfo; | 
| 4768 | if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { | 4767 | if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { | 
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -1232,8 +1232,6 @@ | @@ -1232,8 +1232,6 @@ | ||
| 1232 | <view hidden="{{!openSpecModal}}"> | 1232 | <view hidden="{{!openSpecModal}}"> | 
| 1233 | <view bindtap="closeSpecModal" class="cover-layer"></view> | 1233 | <view bindtap="closeSpecModal" class="cover-layer"></view> | 
| 1234 | <view class="spec-model"> | 1234 | <view class="spec-model"> | 
| 1235 | - | ||
| 1236 | - | ||
| 1237 | <view class="pding"> | 1235 | <view class="pding"> | 
| 1238 | <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon> | 1236 | <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon> | 
| 1239 | <view class="spec-goods"> | 1237 | <view class="spec-goods"> | 
