From fe02056d9e28c4207814fdfe8d1c5aefdef3a084 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 16 Jun 2021 00:16:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=B4=E8=B4=B9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/pages/property/accountManage/accountManage.html | 2 +-
 public/pages/property/accountManage/accountManage.js   | 8 ++++----
 public/pages/property/payFeeOrder/payFeeOrder.html     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/pages/property/accountManage/accountManage.html b/public/pages/property/accountManage/accountManage.html
index 45a7f9ed1..b0f3cbb30 100644
--- a/public/pages/property/accountManage/accountManage.html
+++ b/public/pages/property/accountManage/accountManage.html
@@ -29,7 +29,7 @@
                             </div>
                         </div>
                         <div class="col-sm-1">
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryOwnerMethod()">
+                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryAccountMethod()">
                                 <i class="fa fa-search"></i> 查询
                             </button>
                         </div>
diff --git a/public/pages/property/accountManage/accountManage.js b/public/pages/property/accountManage/accountManage.js
index ab7d8c167..0b3960547 100644
--- a/public/pages/property/accountManage/accountManage.js
+++ b/public/pages/property/accountManage/accountManage.js
@@ -21,7 +21,7 @@
             }
         },
         _initMethod: function () {
-            vc.component._listshopAccounts(DEFAULT_PAGE, DEFAULT_ROWS);
+            vc.component._listAccounts(DEFAULT_PAGE, DEFAULT_ROWS);
         },
         _initEvent: function () {
 
@@ -42,7 +42,7 @@
                 };
 
                 //发送get请求
-                vc.http.apiGet('/account/queryAccount',
+                vc.http.apiGet('/account/queryOwnerAccount',
                     param,
                     function (json, res) {
                         var _accountManageInfo = JSON.parse(json);
@@ -58,8 +58,8 @@
                     }
                 );
             },
-            _queryshopAccountMethod: function () {
-                vc.component._listshopAccounts(DEFAULT_PAGE, DEFAULT_ROWS);
+            _queryAccountMethod: function () {
+                vc.component._listAccounts(DEFAULT_PAGE, DEFAULT_ROWS);
 
             },
             _moreCondition: function () {
diff --git a/public/pages/property/payFeeOrder/payFeeOrder.html b/public/pages/property/payFeeOrder/payFeeOrder.html
index f0bac7ac5..a5164810b 100755
--- a/public/pages/property/payFeeOrder/payFeeOrder.html
+++ b/public/pages/property/payFeeOrder/payFeeOrder.html
@@ -33,7 +33,7 @@
                                 </div>
                             </div>
                             <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">到期时间</label>
+                                <label class="col-sm-2 col-form-label">计费起始时间</label>
                                 <div class="col-sm-10">
                                     <label class=" col-form-label">{{payFeeOrderInfo.endTime}}</label>
                                 </div>

From c398d0007ac2152840822ab109d227f6e1cbab32 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 16 Jun 2021 00:31:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E5=85=B1=E4=BA=AB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/components/property/editFeeConfig/editFeeConfig.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/components/property/editFeeConfig/editFeeConfig.js b/public/components/property/editFeeConfig/editFeeConfig.js
index 458dd75d1..f30558cda 100755
--- a/public/components/property/editFeeConfig/editFeeConfig.js
+++ b/public/components/property/editFeeConfig/editFeeConfig.js
@@ -236,7 +236,7 @@
                 }
                 //自定义费用
                 if (vc.component.editFeeConfigInfo.computingFormula == '7007'
-                ||vc.component.editFeeConfigInfo.computingFormula != '4004') {
+                || vc.component.editFeeConfigInfo.computingFormula == '4004') {
                     vc.component.editFeeConfigInfo.squarePrice = "0.00";
                     vc.component.editFeeConfigInfo.additionalAmount = "0.00";
                 }