wxd / MShopWeApp

Commit 5ea73552c8fc8f38253587836fcf114eee061cc1

Authored by yvan.ni
2 parents 01fedba4 4cdba023

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 5 changed files with 16 additions and 7 deletions
pages/team/team_ping/team_ping.js
  View file @5ea7355
... ... @@ -131,7 +131,15 @@ Page({
131 131  
132 132 })
133 133  
134   -
  134 + //获取预存使用金额
  135 + await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + order[i].order_sn, {
  136 + }).then(res => {
  137 + if (res.data.code == 0 && res.data.data) {
  138 + // data[ind].use_commission = res.data.data.use_commission;
  139 + order[i].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退
  140 + order[i].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退
  141 + }
  142 + })
135 143  
136 144  
137 145 if (order[i].is_zsorder== 4) {
... ...
pages/team/team_ping/team_ping.wxml
  View file @5ea7355
... ... @@ -8,7 +8,7 @@
8 8 <view class='tsi' class="swiper-tab-list {{currentTab==3 ? 'on' : ''}}" data-current="3" bindtap="swichNav">拼团失败</view>
9 9 </view>
10 10  
11   -<!--单号显示-->
  11 +<!--单号显示-->
12 12 <view class='wu' wx:if="{{order.length>0}}">
13 13 <view class='pd' wx:for="{{order}}" wx:key>
14 14 <view class='pd-list' bindtap="go_team_success" data-ordsn="{{item.order_sn}}">
... ... @@ -65,12 +65,12 @@
65 65 <block wx:if="{{item.is_zsorder==4}}">
66 66  
67 67 <view>金额：<text class="xc-wc">￥</text></view>
68   - <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount+item.pt_tail_money,2)}}</view>
  68 + <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount+item.pt_tail_money+item.pre_cut,2)}}</view>
69 69  
70 70 </block>
71 71 <block wx:else>
72 72 <view>金额：<text class="xc-wc">￥</text></view>
73   - <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount,2)}}</view>
  73 + <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount+item.pre_cut,2)}}</view>
74 74 </block>
75 75  
76 76  
... ...
pages/user/order_detail/order_detail.wxml
  View file @5ea7355
... ... @@ -142,7 +142,7 @@
142 142  
143 143 <view class="item">
144 144 <view>订单总价</view>
145   - <view>￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money+order.use_commission,2)}}元</view>
  145 + <view>￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money+order.use_commission+order.pre_cut,2)}}元</view>
146 146 </view>
147 147  
148 148 <view class="item-line"></view>
... ...
pages/user/order_list/order_list.js
  View file @5ea7355
... ... @@ -352,6 +352,7 @@ Page({
352 352 if (res.data.code == 0 && res.data.data) {
353 353 data[ind].use_commission = res.data.data.use_commission;
354 354 data[ind].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退
  355 + data[ind].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退
355 356 }
356 357 })
357 358  
... ...
pages/user/order_list/order_list.wxml
  View file @5ea7355
... ... @@ -198,7 +198,7 @@
198 198 <view class="commodity_money flex baseline">
199 199 <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
200 200 <view class="fs24 c-r">￥</view>
201   - <view class="c-r">{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money+item.use_commission,2)}}
  201 + <view class="c-r">{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money+item.use_commission+item.pre_cut,2)}}
202 202 </view>
203 203  
204 204 </view>
... ... @@ -214,7 +214,7 @@
214 214 <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
215 215 <view class="fs24 c-r">￥</view>
216 216 <view class="c-r">
217   - {{filters.toFix(item.order_amount+item.user_money+item.use_commission,2)}}
  217 + {{filters.toFix(item.order_amount+item.user_money+item.use_commission+item.pre_cut,2)}}
218 218 <text wx:if="{{item.coupon_price}}">+{{item.coupon_price}}元优惠券</text>
219 219 <text wx:if="{{item.integral}}">+{{item.integral}}积分</text>
220 220 </view>
... ...