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

WXD-SEASON\season
2 parents 4ad1ee75 91b33569
Showing 4 changed files with 16 additions and 3 deletions
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
packageE/pages/cart/cart_wk/cart_wk.js
packageG/pages/user/order_detail/order_detail.wxml
pages/user/order_list/order_list.wxml
@@ -316,6 +316,7 @@ Page({
  
     //--------立即支付----------
     async jumpToCart4(e) {
+        var th=this;
  
 			// 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id}
 			if (parseInt(this.data.order.order_goods['0']['prom_type']) == 9) {
@@ -290,11 +290,19 @@ Page({
       teamgroup = null,
       teamlist=null,
       th = this;
+
+      let ord_m=null;
     //---获取订单---
     await getApp().request.promiseGet("/api/weshop/order/get/" + oo.stoid + "/" + ord, {}).then(res => {
       order = res.data.data;
     });
  
+    //-- 如果有数据的话 --
+    let od_m=await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + order.order_sn, {})
+    if(od_m && od_m.data.code==0 && od_m.data.data){
+      ord_m=od_m.data.data;
+    }
+
     //---获取订单从表---
     await getApp().request.promiseGet("/api/weshop/ordergoods/page", {
       data: {
@@ -368,6 +376,10 @@ Page({
  
     var tail_money = (price * order_goods.goods_num - order['order_amount'] - order['user_money']).toFixed(2);
  
+    if(ord_m && ord_m.pre_cut){
+      tail_money-=ord_m.pre_cut;
+    }
+
     tail_money = parseFloat(tail_money);
     order.tail_money = tail_money;
  
@@ -103,7 +103,7 @@
  
            <view class="item pnew" wx:if="{{order.is_zsorder==4}}">
                 <view>定金金额</view>
-                <view>￥ {{filters.toFix(order.order_amount+order.user_money,2)}}元</view>
+                <view>￥ {{filters.toFix(order.order_amount+order.user_money+order.pre_cut,2)}}元</view>
            </view>
            <view class="item pnew" wx:if="{{order.pt_tail_money>0}}">
               <view>尾款金额</view>
@@ -224,7 +224,7 @@
 	                <view wx:if="{{item.is_zsorder==4}}" 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.use_commission,2)}}
+	                  <view class="c-r">{{filters.toFix(item.order_amount+item.user_money+item.use_commission+item.pre_cut,2)}}
 	                  </view>
 	                </view>
 	                <view class="commodity_money flex baseline" wx:else>
@@ -239,7 +239,7 @@
 	                <view wx:if="{{item.pt_tail_money>0}}" class="commodity_money flex baseline">
 	                  <view>待支付尾款:</view>
 	                  <view class="fs24 c-r">￥</view>
-	                  <view class="c-r">{{filters.toFix(item.pt_tail_money+item.use_commission-item.shipping_price,2)}}
+	                  <view class="c-r">{{filters.toFix(item.pt_tail_money+item.use_commission,2)}}
 	                  </view>
 	                </view>