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

yvan.ni
2 parents 01fedba4 4cdba023
Showing 5 changed files with 16 additions and 7 deletions
pages/team/team_ping/team_ping.js
pages/team/team_ping/team_ping.wxml
pages/user/order_detail/order_detail.wxml
pages/user/order_list/order_list.js
pages/user/order_list/order_list.wxml
@@ -131,7 +131,15 @@ Page({
       })
-
+      //获取预存使用金额
+      await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + order[i].order_sn, {
+      }).then(res => {
+        if (res.data.code == 0 && res.data.data) {
+          // data[ind].use_commission = res.data.data.use_commission;
+          order[i].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退
+          order[i].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退
+        }
+      })
       if (order[i].is_zsorder== 4) {
@@ -8,7 +8,7 @@
   <view class='tsi' class="swiper-tab-list {{currentTab==3 ? 'on' : ''}}" data-current="3" bindtap="swichNav">拼团失败</view>
 </view>
-<!--单号显示-->
+<!--单号显示--> 
 <view class='wu' wx:if="{{order.length>0}}">
   <view class='pd' wx:for="{{order}}" wx:key>
     <view class='pd-list' bindtap="go_team_success" data-ordsn="{{item.order_sn}}">
@@ -65,12 +65,12 @@
               <block wx:if="{{item.is_zsorder==4}}">
                   <view>金额：<text class="xc-wc">￥</text></view>
-                  <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount+item.pt_tail_money,2)}}</view>
+                  <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount+item.pt_tail_money+item.pre_cut,2)}}</view>
               </block>
               <block wx:else>
                 <view>金额：<text class="xc-wc">￥</text></view>
-                <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount,2)}}</view>
+                <view class='foot-l-wz fs35'>{{filters.toFix(item.user_money+item.order_amount+item.pre_cut,2)}}</view>
               </block>
@@ -142,7 +142,7 @@
             <view class="item">
               <view>订单总价</view>
-              <view>￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money+order.use_commission,2)}}元</view>
+              <view>￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money+order.use_commission+order.pre_cut,2)}}元</view>
             </view>
            <view class="item-line"></view>
@@ -352,6 +352,7 @@ Page({
           if (res.data.code == 0 && res.data.data) {
             data[ind].use_commission = res.data.data.use_commission;
             data[ind].pre_cut = res.data.data.pre_cut; //是否使用预存，如果是使用预存不能单品退，只能整单退
+            data[ind].pre_json = res.data.data.pre_json; //是否使用预存，如果是使用预存不能单品退，只能整单退
           }
         })
@@ -198,7 +198,7 @@
 	                <view class="commodity_money flex baseline">
 	                  <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
 	                  <view class="fs24 c-r">￥</view>
-	                  <view class="c-r">{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money+item.use_commission,2)}}
+	                  <view class="c-r">{{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money+item.use_commission+item.pre_cut,2)}}
 	                  </view>
 	                </view>
@@ -214,7 +214,7 @@
 	                  <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
 	                  <view class="fs24 c-r">￥</view>
 	                     <view class="c-r">
-										 {{filters.toFix(item.order_amount+item.user_money+item.use_commission,2)}}
+										 {{filters.toFix(item.order_amount+item.user_money+item.use_commission+item.pre_cut,2)}}
 	                     <text wx:if="{{item.coupon_price}}">+{{item.coupon_price}}元优惠券</text>
 	                     <text wx:if="{{item.integral}}">+{{item.integral}}积分</text>
 	                  </view>