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

WXD-SEASON\season
2 parents 584111f3 d68c6c6e
Showing 2 changed files with 3 additions and 2 deletions
packageE/pages/cart/cart_wk/cart_wk.js
packageE/pages/cart/cart_wk/cart_wk.wxml
@@ -378,6 +378,7 @@ Page({
     if(ord_m && ord_m.pre_cut){
       tail_money-=ord_m.pre_cut;
+      order.pre_cut=ord_m.pre_cut;
     }
     tail_money = parseFloat(tail_money);
@@ -104,11 +104,11 @@
   </view>
   <view class='ct_one jc_sb'>
     <view class='ct_one_left'>成团金额</view>
-    <view class='ct_one_right'><text class='redwz'>￥{{filters.toFix(order.order_amount+order.user_money+order.tail_money,2)}}</text></view>
+    <view class='ct_one_right'><text class='redwz'>￥{{filters.toFix(order.order_amount+order.user_money+order.tail_money+order.pre_cut,2)}}</text></view>
   </view>
   <view class='ct_one jc_sb'>
     <view class='ct_one_left'>支付定金</view>
-    <view class='ct_one_right'><text class='redwz'>￥{{filters.toFix(order.order_amount+order.user_money,2)}}</text>
+    <view class='ct_one_right'><text class='redwz'>￥{{filters.toFix(order.order_amount+order.user_money+order.pre_cut,2)}}</text>
     </view>
   </view>
 </view>