From 634041b8be496d19abf9c7fa4d15d0eb7f7fdf8e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 14 Dec 2020 22:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=98=E6=89=A3=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E3=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addPayFeeConfigDiscount.html              | 25 ++++++-----
 .../editPayFeeConfigDiscount.html             | 45 ++++++++++---------
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.html b/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.html
index 0a8148263..03b4ebf58 100644
--- a/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.html
+++ b/public/components/property/addPayFeeConfigDiscount/addPayFeeConfigDiscount.html
@@ -27,23 +27,26 @@
                                     </select> </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">
-                                    <input v-model="addPayFeeConfigDiscountInfo.startTime" type="text" placeholder="必填，请填写折扣起始时间"
-                                        class="form-control addPayFeeConfigDiscountStartTime" name="startTime">
+                                    <input v-model="addPayFeeConfigDiscountInfo.startTime" type="text"
+                                        placeholder="必填，请填写缴费起始时间" class="form-control addPayFeeConfigDiscountStartTime"
+                                        name="startTime">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">缴费结束时间</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addPayFeeConfigDiscountInfo.endTime" type="text"
+                                        placeholder="必填，请填写缴费结束时间" class="form-control addPayFeeConfigDiscountEndTime"
+                                        name="endTime">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">折扣终止时间</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addPayFeeConfigDiscountInfo.endTime" type="text" placeholder="必填，请填写折扣终止时间"
-                                        class="form-control addPayFeeConfigDiscountEndTime" name="endTime">
-                                </div>
-                            </div>
-                            <div class="form-group row">
-                                <label class="col-sm-2 col-form-label">上次缴费最大时间</label>
-                                <div class="col-sm-10">
-                                    <input v-model="addPayFeeConfigDiscountInfo.payMaxEndTime" type="text" placeholder="可选，填写上次缴费最大时间"
+                                    <input v-model="addPayFeeConfigDiscountInfo.payMaxEndTime" type="text"
+                                        placeholder="可选，填写折扣终止时间"
                                         class="form-control addPayFeeConfigDiscountPaymaxEndTime" name="payMaxEndTime">
                                 </div>
                             </div>
diff --git a/public/components/property/editPayFeeConfigDiscount/editPayFeeConfigDiscount.html b/public/components/property/editPayFeeConfigDiscount/editPayFeeConfigDiscount.html
index e2b54914a..35f6e3e1d 100644
--- a/public/components/property/editPayFeeConfigDiscount/editPayFeeConfigDiscount.html
+++ b/public/components/property/editPayFeeConfigDiscount/editPayFeeConfigDiscount.html
@@ -1,4 +1,5 @@
-<div id = "editPayFeeConfigDiscountModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editPayFeeConfigDiscountModel" class="modal fade" tabindex="-1" role="dialog"
+    aria-labelledby="exampleModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -7,27 +8,29 @@
                     <div>
                         <div>
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">折扣名称</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editPayFeeConfigDiscountInfo.discountId">
-         <option selected  disabled value="">必填，请选择折扣名称</option>
-         <option  value="1001">优惠</option>
-<option  value="2002">违约</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">折扣名称</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editPayFeeConfigDiscountInfo.discountId">
-         <option selected  disabled value="">必填，请选择折扣名称</option>
-         <option  value="1001">优惠</option>
-<option  value="2002">违约</option>
-  </select>         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">折扣名称</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="editPayFeeConfigDiscountInfo.discountId">
+                                        <option selected disabled value="">必填，请选择折扣名称</option>
+                                        <option value="1001">优惠</option>
+                                        <option value="2002">违约</option>
+                                    </select> </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">折扣名称</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="editPayFeeConfigDiscountInfo.discountId">
+                                        <option selected disabled value="">必填，请选择折扣名称</option>
+                                        <option value="1001">优惠</option>
+                                        <option value="2002">违约</option>
+                                    </select> </div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editPayFeeConfigDiscount()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button"
+                                    v-on:click="editPayFeeConfigDiscount()"><i class="fa fa-check"></i>&nbsp;保存</button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                    data-dismiss="modal">取消</button>
                             </div>
                         </div>
                     </div>
@@ -35,4 +38,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file