From 416179de8bc2ef08acac6e184168aeb2a5e5b209 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 13 Apr 2022 13:31:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=8A=84=E8=A1=A8=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/meterTypeManage/meterTypeManage.html | 15 ++++++++++-----
 .../payFeeConfigDiscountManage.html               |  8 +++++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/public/pages/property/meterTypeManage/meterTypeManage.html b/public/pages/property/meterTypeManage/meterTypeManage.html
index 9b408e831..302938f8a 100644
--- a/public/pages/property/meterTypeManage/meterTypeManage.html
+++ b/public/pages/property/meterTypeManage/meterTypeManage.html
@@ -30,12 +30,10 @@
                                 <td class="text-center">{{meterType.createTime}}</td>
                                 <td class="text-center">
                                     <div class="btn-group">
-                                        <button class="btn-white btn btn-xs"
-                                            v-on:click="_openEditMeterTypeModel(meterType)">修改</button>
+                                        <button class="btn-white btn btn-xs" v-on:click="_openEditMeterTypeModel(meterType)">修改</button>
                                     </div>
                                     <div class="btn-group">
-                                        <button class="btn-white btn btn-xs"
-                                            v-on:click="_openDeleteMeterTypeModel(meterType)">删除</button>
+                                        <button class="btn-white btn btn-xs" v-on:click="_openDeleteMeterTypeModel(meterType)">删除</button>
                                     </div>
                                 </td>
 
@@ -50,7 +48,14 @@
                         </tfoot>
                     </table>
                     <!-- 分页 -->
-                    <vc:create path="frame/pagination"></vc:create>
+                    <div class="row margin-top-xs">
+                        <div class="col-sm-9">
+                            <div> 如果一个房屋有多个电表水表 可以 这里新建多个 比如电表1 电表2</div>
+                        </div>
+                        <div class="col-sm-3 float-right">
+                            <vc:create path="frame/pagination"></vc:create>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html b/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
index e14fe3330..ddbcbf754 100755
--- a/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
+++ b/public/pages/property/payFeeConfigDiscountManage/payFeeConfigDiscountManage.html
@@ -61,9 +61,11 @@
                     <!-- 分页 -->
                     <div class="row margin-top-xs">
                         <div class="col-sm-9">
-                            <div> 缴费起始时间：缴费时间必须大于缴费起始时间才会享受折扣</div>
-                            <div> 缴费结束时间：缴费时间必须小于缴费结束时间才会享受折扣</div>
-                            <div> 折扣终止时间：交完费后的时间不能大于折扣终止时间</div>
+                            <div> 缴费起始时间和缴费结束时间：这个约束缴费的时间，也就是前台收银员操作缴费的时间</div>
+                            <div> 折扣终止时间：这个表示最大缴费到什么时候</div>
+                            <div> 如果本年度费用不能享受优惠 那么在折扣设置中规则选择打折无欠费规则，并且欠费时长为0</div>
+                            <div> 这样所有欠费的费用则不享受优惠，本年度的费用属于欠费所以不享受优惠</div>
+
                         </div>
                         <div class="col-sm-3 float-right">
                             <vc:create path="frame/pagination"></vc:create>