Commit daaded4dcdeda5d8375ead380e817a07d4d1f84c
Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa
Showing
2 changed files
with
3 additions
and
2 deletions
packageE/pages/cart/cart2_inte/cart2_inte.js
| ... | ... | @@ -1233,7 +1233,7 @@ Page({ |
| 1233 | 1233 | |
| 1234 | 1234 | var integrals = 0; |
| 1235 | 1235 | var get_datas = { |
| 1236 | - user_id: getApp().globalData.user_id, store_id: o.stoid, | |
| 1236 | + user_id: getApp().globalData.user_id, store_id: os.stoid, | |
| 1237 | 1237 | }; |
| 1238 | 1238 | await getApp().request.promiseGet("/api/weshop/users/getAllPoints", { |
| 1239 | 1239 | data: get_datas | ... | ... |
packageE/pages/cart/cart2_inte/cart2_inte.wxml
| ... | ... | @@ -214,10 +214,11 @@ |
| 214 | 214 | </view> |
| 215 | 215 | </view> |
| 216 | 216 | |
| 217 | + | |
| 217 | 218 | <view class="btn-wrap shadow-1" wx:if="{{show_submit}}"> |
| 218 | 219 | <view class="pay-amount"> |
| 219 | 220 | <view class="payable">应付金额：<text class="co-red">￥{{formData.order_amount}}</text></view> |
| 220 | - <view class="payable">应付积分：<text class="co-red">{{formData.integral}}积分</text></view> | |
| 221 | + <view hidden="{{can_use_ord_prom && can_use_ord_prom[bn_pick] }}" class="payable">应付积分：<text class="co-red">{{formData.integral}}积分</text></view> | |
| 221 | 222 | </view> |
| 222 | 223 | <button disabled="{{submit || !same_ok}}" class="tips-btn" formType="submit" id="submitOrder">提交订单</button> |
| 223 | 224 | </view> | ... | ... |