Commit 6b584732dc76ee6edefa9a7de7e20b7d2dc507eb
Merge branch 'test' into 'qa'
Test See merge request !1060
Showing
2 changed files
with
1 additions
and
10 deletions
pages/goods/goodsInfo/goodsInfo.js
| @@ -2294,15 +2294,6 @@ Page({ | @@ -2294,15 +2294,6 @@ Page({ | ||
| 2294 | th.setData({is_pop_more: 1}); | 2294 | th.setData({is_pop_more: 1}); |
| 2295 | } else { | 2295 | } else { |
| 2296 | var ind = t.currentTarget.dataset.ind; | 2296 | var ind = t.currentTarget.dataset.ind; |
| 2297 | - //回调。判断是不是优惠促销 | ||
| 2298 | - th.check_is_prom_goods(function () { | ||
| 2299 | - th.setData({ | ||
| 2300 | - openSpecModal: !0, | ||
| 2301 | - openSpecModal_ind: ind, | ||
| 2302 | - }); | ||
| 2303 | - //var is_open=th.data.config | ||
| 2304 | - th.get_off_price(); | ||
| 2305 | - }) | ||
| 2306 | //--先判断会员状态-- | 2297 | //--先判断会员状态-- |
| 2307 | var user_info = getApp().globalData.userInfo; | 2298 | var user_info = getApp().globalData.userInfo; |
| 2308 | if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { | 2299 | if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { |
pages/payment/pay_success/pay_success.wxml
| @@ -69,7 +69,7 @@ | @@ -69,7 +69,7 @@ | ||
| 69 | <!-- 跳转链接 --> | 69 | <!-- 跳转链接 --> |
| 70 | <view> | 70 | <view> |
| 71 | <!-- 个人收货信息 --> | 71 | <!-- 个人收货信息 --> |
| 72 | - <view class="pay_User fs28" wx:if="{{order.exp_type==0}}"> | 72 | + <view class="pay_User fs28" wx:if="{{order.exp_type==0 || order.exp_type==2 }}"> |
| 73 | <view class="payitem flex"> | 73 | <view class="payitem flex"> |
| 74 | <view class="pay_Receiving">收货人 :</view> | 74 | <view class="pay_Receiving">收货人 :</view> |
| 75 | <view class="pay_name ellipsis-1">{{order.consignee}}</view> | 75 | <view class="pay_name ellipsis-1">{{order.consignee}}</view> |