From 14741ff5313cbbaed3465ef472ec1660dc7f964e Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Wed, 16 Oct 2019 18:07:38 +0800
Subject: [PATCH] 支付成功页面修改，提交订单确认页面

---
 pages/cart/cart2/cart2.js                  |  1 +
 pages/payment/pay_success/pay_success.js   |  4 +++-
 pages/payment/pay_success/pay_success.wxml | 11 +++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 7e40634..59df876 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -789,6 +789,7 @@ Page({
         //--------------如果使用余额---------------------
         if (th.data.bn_use_money == 1) {
           if (amoney> order_m) {
+            order_m = order_m.toFixed(2);
             th.setData({ [txt]: order_m, [txt2]:0,[txt3]:coupon_price })
           }else{
             order_m =parseFloat(order_m - amoney);
diff --git a/pages/payment/pay_success/pay_success.js b/pages/payment/pay_success/pay_success.js
index 8d4733b..4f5bb90 100644
--- a/pages/payment/pay_success/pay_success.js
+++ b/pages/payment/pay_success/pay_success.js
@@ -11,6 +11,7 @@ Page({
     order:null,
     type:1,
     allmoney:0,
+    user_money:0,
     order_sn:"",
     pick:null,
   },
@@ -40,9 +41,10 @@ Page({
               for(var i in res.data.data.pageData){
                   var item=res.data.data.pageData[i];
                   allmoney+=item.order_amount;
+                  user_money += item.user_money;
               }
               order=res.data.data.pageData[0];
-              th.setData({order:order,type:2,allmoney:allmoney,order_sn:order_sn})
+                th.setData({ order: order, type: 2, allmoney: allmoney, order_sn: order_sn, user_money: user_money})
           })
       }
       //--获取门店--
diff --git a/pages/payment/pay_success/pay_success.wxml b/pages/payment/pay_success/pay_success.wxml
index 10107d5..878c01c 100644
--- a/pages/payment/pay_success/pay_success.wxml
+++ b/pages/payment/pay_success/pay_success.wxml
@@ -2,7 +2,6 @@
 <view>
   <!-- 支付成功提示 -->
   <view class="payradio">
-
     <!-- 提示框 -->
     <view class="Success_box flex-center">
       <view>
@@ -22,17 +21,21 @@
       </view>
 
       <!-- 实付金额 -->
+
       <view class="payitem flex">
         <view>实付金额 :</view>
         <!-- {{filters.toFix()}} -->
         <view class="pay_money" wx:if="{{type==1}}">{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money)}}元</view>
-        <view class="pay_money" wx:else>{{allmoney}}元</view>
+        <view class="pay_money" wx:else>{{filters.toFix(allmoney+user_money,2)  }}元</view>
       </view>
 
       <!-- 支付方式 -->
       <view class="payitem flex">
-        <view>支付方式 :</view>
-        <view>微信支付</view>
+        <view>支付方式 :</view>    
+          <view wx:if="{{allmoney>0 && user_money>0 }}">微信支付,余额支付</view>
+          <view wx:elif="{{allmoney>0}}">微信支付,余额支付</view>
+          <view wx:elif="{{user_money>0}}">微信支付,余额支付</view>
+          <view wx:else>免单</view>
       </view>
 
     </view>
--
libgit2 0.21.4