From 14dafc0bc48caa3ea8f2b3524dccf3cce1646d4f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 22 Nov 2021 18:38:19 +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/payFeeOrder/payFeeOrder.html | 7 +------
 public/pages/property/payFeeOrder/payFeeOrder.js   | 8 ++++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/public/pages/property/payFeeOrder/payFeeOrder.html b/public/pages/property/payFeeOrder/payFeeOrder.html
index 5e9c828d1..a90b4b77f 100755
--- a/public/pages/property/payFeeOrder/payFeeOrder.html
+++ b/public/pages/property/payFeeOrder/payFeeOrder.html
@@ -206,14 +206,9 @@
                         <label class="col-sm-3 col-form-label">备注：</label>
                         <label class="col-sm-8 col-form-label">{{payFeeOrderInfo.remark}}</label>
                     </div>
-                    <div class="row" v-if="payFeeOrderInfo.payType == 'qrCode'">
-                        <label class="col-sm-3 col-form-label">扫码:</label>
-                        <div class="col-sm-6">
-                            <input v-model="payFeeOrderInfo.authCode" type="text" @keyup.enter="_qrCodePayFee" placeholder="必填，请填写缴费时间">
-                        </div>
-                    </div>
                 </div>
                 <div class="modal-footer">
+                    <input v-model="payFeeOrderInfo.authCode" id="authCode" class="form-control" style="width: 60%;" v-if="payFeeOrderInfo.payType == 'qrCode'" type="text" @keyup.enter="_qrCodePayFee" placeholder="请用扫码枪扫码">
                     <button type="button" class="btn btn-secondary" @click="_closeDoPayFeeModal()">关闭</button>
                     <button type="button" class="btn btn-primary" v-if="payFeeOrderInfo.payType == 'common'" @click="_payFee()">确定收费</button>
                 </div>
diff --git a/public/pages/property/payFeeOrder/payFeeOrder.js b/public/pages/property/payFeeOrder/payFeeOrder.js
index 82ef43706..78bfd8a2b 100755
--- a/public/pages/property/payFeeOrder/payFeeOrder.js
+++ b/public/pages/property/payFeeOrder/payFeeOrder.js
@@ -179,10 +179,6 @@
              * 点击 “提交缴费”
              */
             _openPayFee: function(_type) {
-                if (_type) {
-                    $that.payFeeOrderInfo.payType = _type;
-                }
-
                 if ($that.payFeeOrderInfo.tempCycles != "" && $that.payFeeOrderInfo.tempCycles != '-102') {
                     $that.payFeeOrderInfo.cycles = $that.payFeeOrderInfo.tempCycles;
                 }
@@ -207,6 +203,10 @@
                 }
                 //关闭model
                 $("#doPayFeeModal").modal('show');
+                if (_type) {
+                    $that.payFeeOrderInfo.payType = _type;
+                    setTimeout('document.getElementById("authCode").focus()', 1000);
+                }
             },
             _closeDoPayFeeModal: function() {
                 //关闭model