From 4cd32cad8f4ff7c00603effb8243985e0f4ad0d0 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 12 Jul 2023 10:53:53 +0800
Subject: [PATCH] fix amout & vtest 1.1.39

---
 src/pages/site/confirm/confirm.vue              |  4 ++--
 src/subpackage/common/pages/pay_type_select.vue | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/pages/site/confirm/confirm.vue b/src/pages/site/confirm/confirm.vue
index 9203127..caf2cda 100644
--- a/src/pages/site/confirm/confirm.vue
+++ b/src/pages/site/confirm/confirm.vue
@@ -66,7 +66,7 @@
                 </view>
                 <view class="si-reason">
                     <view class="si-tit">
-                        <text class="red">* </text>占用原因<text class="tip">必填，占用原因将显示在看板对应占用的场地</text>
+                        占用原因<text class="tip">占用原因将显示在看板对应占用的场地</text>
                     </view>
                     <view class="sr-frame">
                         <textarea placeholder="多行输入…"  v-model="ocReaon"></textarea>
@@ -184,7 +184,7 @@ export default {
                 reason: ocReaon,
             }
 
-            if(ocReaon === '')return util.showNone('请填写占用原因！');
+            // if(ocReaon === '')return util.showNone('请填写占用原因！');
 
             if(isOrder&&ocUsage == 4)return this.toOrderPaySelect({
                 exQuery: {
diff --git a/src/subpackage/common/pages/pay_type_select.vue b/src/subpackage/common/pages/pay_type_select.vue
index 95ec467..78937d3 100644
--- a/src/subpackage/common/pages/pay_type_select.vue
+++ b/src/subpackage/common/pages/pay_type_select.vue
@@ -155,13 +155,14 @@ export default {
 
         // 挂账订单支付提交
         takeUpBbocPay(){
-            let { optionsQuery, payMethodsID, otherTypeRemark, selectedCard } = this;
+            let { optionsQuery, payMethodsID, otherTypeRemark, selectedCard, payAmount } = this;
             let _data = {
                     brand_id: optionsQuery.brand_id || '',
-                    amount: +optionsQuery.amount || '',
+                    // amount: +optionsQuery.amount || '',
                     reason: optionsQuery?.exQuery?.reason || '',
                     order_no: optionsQuery?.exQuery?.order_no || '',
-                    take_up_pay_type: this.getPayMethodsName(payMethodsID)
+                    take_up_pay_type: this.getPayMethodsName(payMethodsID),
+                    amount: +payAmount,
                 }
             if(payMethodsID === 4)_data['take_up_pay_type'] = otherTypeRemark || '其它';
             if(payMethodsID === 3&&selectedCard?.card_no)_data['card_no'] = selectedCard.card_no || '';
@@ -180,10 +181,11 @@ export default {
 
         // 1 -> 客户订场， 2-> 散客， 3-> 锁场, 提交
         takeUpSubmit(){
-            let { exQuery, payMethodsID, otherTypeRemark, selectedCard } = this;
+            let { exQuery, payMethodsID, otherTypeRemark, selectedCard, payAmount } = this;
             let _data = {
                     ...exQuery,
-                    take_up_pay_type: this.getPayMethodsName(payMethodsID) || ''
+                    take_up_pay_type: this.getPayMethodsName(payMethodsID) || '',
+                    amount: +payAmount,
                 }
             if(payMethodsID === 4)_data['take_up_pay_type'] = otherTypeRemark || '其它';
             if(payMethodsID === 3&&selectedCard?.card_no)_data['card_no'] = selectedCard.card_no || '';