From 14381db0504f721334cecaf1e4a792a278c9abf5 Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Thu, 2 Feb 2023 18:44:42 +0800
Subject: [PATCH] 预存支付成功优化

---
 pages/payment/pay_success/pay_success.js   | 11 ++++++++++-
 pages/payment/pay_success/pay_success.wxml | 22 +++++++++++++++++-----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/pages/payment/pay_success/pay_success.js b/pages/payment/pay_success/pay_success.js
index ae38430..17cc053 100644
--- a/pages/payment/pay_success/pay_success.js
+++ b/pages/payment/pay_success/pay_success.js
@@ -15,6 +15,7 @@ Page({
     user_money:0,
     order_sn:"",
     pick:null,
+    pre_cut:0,//预存金额
   },
 
   /**
@@ -96,7 +97,15 @@ Page({
 				        th.setData({pick:res.data.data})
 				    });
 				};
-				
+        //--只使用预存支付，达到免单时要请求预存使用额度----
+        if(order.order_amount==0 && order.user_money==0){
+          await getApp().request.promiseGet("/api/weshop/orderMore/get/"+ e.globalData.setting.stoid+"/"+order_sn,{1:1}).then(res => {
+            if(res.data && res.data.code==0 && res.data.data){
+              let pre_cut=res.data.data.pre_cut
+              th.setData({pre_cut})
+            }
+          });
+        }
 				
 			};
       
diff --git a/pages/payment/pay_success/pay_success.wxml b/pages/payment/pay_success/pay_success.wxml
index 2dd2998..9e123c4 100644
--- a/pages/payment/pay_success/pay_success.wxml
+++ b/pages/payment/pay_success/pay_success.wxml
@@ -2,7 +2,7 @@
 <view>
   <!-- 支付成功提示 -->
   <view class="payradio">
-    <!-- 提示框 -->
+    <!-- 提示框 --> 
     <view class="Success_box flex-center">
       <view>
         <view class="flex-center">
@@ -29,8 +29,14 @@
 				<view class="pay_money" wx:if="{{options.card == 1}}">{{filters.toFix(order.account,2) }}元</view>
 				
 				<block wx:else>
-					<view class="pay_money" wx:if="{{type==1}}">{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}元</view>
-					<view class="pay_money" wx:else>{{filters.toFix(allmoney+user_money,2) }}元</view>
+					<view class="pay_money" wx:if="{{type==1}}">
+            <view wx:if="{{order.order_amount==0 && order.user_money==0 && pre_cut>0}}">{{filters.toFix(pre_cut,2)}}元</view>
+            <view wx:else>{{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}元</view>         
+          </view>
+					<view class="pay_money" wx:else>
+            <view wx:if="{{order.order_amount==0 && order.user_money==0 && pre_cut>0}}">{{filters.toFix(pre_cut,2)}}元</view>
+            <view wx:else>{{filters.toFix(allmoney+user_money,2) }}元</view>
+          </view>
 				</block>
       </view>
 
@@ -46,14 +52,20 @@
 				  <view wx:if="{{order.order_amount>0 && order.user_money>0 }}">微信支付,余额支付</view>
 				  <view wx:elif="{{order.order_amount>0}}">微信支付</view>
 				  <view wx:elif="{{order.user_money>0}}">余额支付</view>
-				  <view wx:else>免单</view>
+				  <view wx:else>
+            <view wx:if="{{pre_cut>0}}">预存抵扣</view>
+            <view wx:else>免单</view>
+          </view>
 				</view>
 				<view class="payitem flex"  wx:else>
 				    <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 wx:else>
+              <view wx:if="{{pre_cut>0}}">预存抵扣</view>
+              <view wx:else>免单</view>
+            </view>
 				</view>
 			</block>
       
--
libgit2 0.21.4