From 290c777be8d471b202b2099f3da2f4233ea88c75 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Wed, 26 Oct 2022 16:04:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/pages/property/.DS_Store               | Bin 12292 -> 14340 bytes
 .../pages/property/payFeeOrder/payFeeOrder.js |  31 ++++++++----------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/public/pages/property/.DS_Store b/public/pages/property/.DS_Store
index e0f654ddc655f9ee3507a0257a10437a9e47ff61..32e110833b19090f68f7627919af64a7690b8b84 100755
GIT binary patch
delta 255
zcmZokXem%&U|?W$DortDU@!nOIe-{M3-ADmHU<U-o{0+jqH#bDGf<F$p_rkB!Jna=
zA(g>xvLK`KWCI-*Rz{#K%j5$>5|ep^c?6Pj@{>RY0I@X?Yit%|{Khs}fzfv}I|mB~
zqv>V|;SH>l4=D7D7?~O9C>Wbq)aocyTN(k`CdOuylNC)jZ<L5)->kqW%fzU$nMdI=
z`@{*3n|TGEGi_Fp1riF3l1!4UK%;@cfE!4-B0Cpo-FxQA{5rZ|XC0Vqt0T|D1o4*z
SNXO(1ohh4C?=wxDpb7xjzcB#-

delta 219
zcmZoEXh~3DU|?W$DortDV9)?EIe-{M3-ADmb_NCo?uiQeqOm{@Gf<F$p@<=sA%Gzf
zNM}#Hs65%ggoTw6D9JMUzPjV&Kn2r{ml@eNvvaU;Fgk3O*LcA+IaiB!@&hgIi7R+E
z^9XEU-Mm`NnVnH)GmpY$cE*&+2gOAuzYr0WW?*0ingRqG+(5z=+5U|e-!o6<H_>He
nnCxgG&jYj#<VFS{Z7?~<WD2tzL+a#4X_3vss%MzsCJF!mb_Xs|

diff --git a/public/pages/property/payFeeOrder/payFeeOrder.js b/public/pages/property/payFeeOrder/payFeeOrder.js
index 4d1023108..5b6d43019 100755
--- a/public/pages/property/payFeeOrder/payFeeOrder.js
+++ b/public/pages/property/payFeeOrder/payFeeOrder.js
@@ -229,11 +229,11 @@
                         param: "",
                         errInfo: "实收金额不能为空"
                     },
-                        {
-                            limit: "money",
-                            param: "",
-                            errInfo: "实收金额不是有效的金额"
-                        }
+                    {
+                        limit: "money",
+                        param: "",
+                        errInfo: "实收金额不是有效的金额"
+                    }
                     ]
                 });
             },
@@ -347,8 +347,8 @@
                 vc.http.apiPost(
                     '/payment.qrCodePayment',
                     JSON.stringify(vc.component.payFeeOrderInfo), {
-                        emulateJSON: true
-                    },
+                    emulateJSON: true
+                },
                     function (json, res) {
                         let _data = JSON.parse(json);
                         if (_data.code == 404) {
@@ -391,8 +391,8 @@
                 vc.http.apiPost(
                     '/payment.checkPayFinish',
                     JSON.stringify(vc.component.payFeeOrderInfo), {
-                        emulateJSON: true
-                    },
+                    emulateJSON: true
+                },
                     function (json, res) {
                         let _data = JSON.parse(json);
                         if (_data.code == 404) {
@@ -404,12 +404,9 @@
                         }
                         $that._closeDoPayFeeModal();
                         _data = _data.data;
-                        $that.payFeeOrderInfo.receiptId = _data.receiptId;
-                        //关闭model
-                        $("#payFeeResult").modal({
-                            backdrop: "static", //点击空白处不关闭对话框
-                            show: true
-                        });
+                        setTimeout(function () {
+                            $that._queryPayFeeReceiptId(_data);
+                        }, 1000);
                     },
                     function (errInfo, error) {
                         console.log('请求失败处理');
@@ -433,8 +430,8 @@
                 vc.http.apiPost(
                     '/fee.payFee',
                     JSON.stringify(vc.component.payFeeOrderInfo), {
-                        emulateJSON: true
-                    },
+                    emulateJSON: true
+                },
                     function (json, res) {
                         let _json = JSON.parse(json)
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);