From 0b48bc1a0a853c175e0dad71aae5862cc285d7a9 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 20 Sep 2023 13:02:53 +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

---
 .../payFeeOrderConfirm.html                   | 52 +++++--------------
 1 file changed, 13 insertions(+), 39 deletions(-)

diff --git a/public/components/property/payFeeOrderConfirm/payFeeOrderConfirm.html b/public/components/property/payFeeOrderConfirm/payFeeOrderConfirm.html
index 12bcb5d48..241574028 100644
--- a/public/components/property/payFeeOrderConfirm/payFeeOrderConfirm.html
+++ b/public/components/property/payFeeOrderConfirm/payFeeOrderConfirm.html
@@ -3,9 +3,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title">
-                    <span>
-                        <span><vc:i18n name="收费确认" namespace="payFeeOrderConfirm"></vc:i18n></span>
-                    </span>
+                    <vc:i18n name="收费确认" namespace="payFeeOrderConfirm"></vc:i18n>
                 </h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
@@ -21,9 +19,7 @@
                 <div class="row"
                      v-if="payFeeOrderConfirmInfo.feeFlag != '2006012' && payFeeOrderConfirmInfo.showEndTime != ''">
                     <label class="col-sm-3 col-form-label">
-                        <span>
-                            <span><vc:i18n name="缴费时间段" namespace="payFeeOrderConfirm"></vc:i18n></span>
-                        </span>：
+                        <vc:i18n name="缴费时间段：" namespace="payFeeOrderConfirm"></vc:i18n>
                     </label>
                     <label class="col-sm-8 col-form-label">{{vc.dateFormat(payFeeOrderConfirmInfo.endTime)}} 至
                         {{vc.dateSubOneDay(payFeeOrderConfirmInfo.endTime,vc.dateFormat(payFeeOrderConfirmInfo.showEndTime),payFeeOrderConfirmInfo.feeFlag)}}</label>
@@ -31,37 +27,29 @@
                 <div class="row"
                      v-else-if="payFeeOrderConfirmInfo.feeFlag != '2006012' && payFeeOrderConfirmInfo.custEndTime != ''">
                     <label class="col-sm-3 col-form-label">
-                        <span>
-                            <span><vc:i18n name="缴费时间段" namespace="payFeeOrderConfirm"></vc:i18n></span>
-                        </span>：
+                        <vc:i18n name="缴费时间段：" namespace="payFeeOrderConfirm"></vc:i18n>
                     </label>
                     <label class="col-sm-8 col-form-label">{{vc.dateFormat(payFeeOrderConfirmInfo.endTime)}} 至
                         {{payFeeOrderConfirmInfo.custEndTime}}</label>
                 </div>
                 <div class="row">
                     <label class="col-sm-3 col-form-label">
-                        <span>
-                            <span><vc:i18n name="应收金额" namespace="payFeeOrderConfirm"></vc:i18n></span>
-                        </span>：
+                        <vc:i18n name="应收金额：" namespace="payFeeOrderConfirm"></vc:i18n>
                     </label>
                     <label class="col-sm-8 col-form-label">{{payFeeOrderConfirmInfo.totalFeePrice}}</label>
                 </div>
                 <div class="row">
                     <label class="col-sm-3 col-form-label">
-                        <span>
-                            <span><vc:i18n name="优惠金额" namespace="payFeeOrderConfirm"></vc:i18n></span>
+                            <span><vc:i18n name="优惠金额：" namespace="payFeeOrderConfirm"></vc:i18n></span>
                             <span class="fa fa-info-circle popover-show1" @mouseover="popOverShowMsg1()"
                                   @mouseleave="popOverHideMsg1()" style="cursor: pointer;" data-html="true"
                                   data-content="正数：打折减免的金额；<br>负数：需额外缴纳的滞纳金"></span>
-                        </span>：
                     </label>
                     <label class="col-sm-8 col-form-label">{{payFeeOrderConfirmInfo.totalDiscountMoney.toFixed(2)}}</label>
                 </div>
                 <div class="row">
                     <label class="col-sm-3 col-form-label">
-                        <span>
-                            <span><vc:i18n name="实收金额" namespace="payFeeOrderConfirm"></vc:i18n></span>
-                        </span>：
+                        <vc:i18n name="实收金额：" namespace="payFeeOrderConfirm"></vc:i18n>
                     </label>
                     <label class="col-sm-8 col-form-label"
                            v-if="payFeeOrderConfirmInfo.flag != null && payFeeOrderConfirmInfo.flag != '' && payFeeOrderConfirmInfo.flag == 'true'">
@@ -71,8 +59,7 @@
                 </div>
                 <div class="row">
                     <label class="col-sm-3 col-form-label">
-                        <span>
-                            <span><vc:i18n name="抵扣金额" namespace="payFeeOrderConfirm"></vc:i18n></span></span>：
+                        <vc:i18n name="抵扣金额：" namespace="payFeeOrderConfirm"></vc:i18n>
                     </label>
                     <label class="col-sm-8 col-form-label">{{payFeeOrderConfirmInfo.accountAmount >=
                         payFeeOrderConfirmInfo.receivedAmount ? payFeeOrderConfirmInfo.receivedAmount :
@@ -81,9 +68,7 @@
                 </div>
                 <div class="row">
                     <label class="col-sm-3 col-form-label">
-                        <span>
-                            <span><vc:i18n name="应缴金额" namespace="payFeeOrderConfirm"></vc:i18n></span>
-                        </span>：
+                        <vc:i18n name="应缴金额：" namespace="payFeeOrderConfirm"></vc:i18n>
                     </label>
                     <label class="col-sm-8 col-form-label">{{payFeeOrderConfirmInfo.accountAmount >=
                         payFeeOrderConfirmInfo.receivedAmount ? '0.00' : (payFeeOrderConfirmInfo.receivedAmount -
@@ -91,27 +76,20 @@
                 </div>
                 <div class="row"
                      v-if="payFeeOrderConfirmInfo.integralAmount != null && payFeeOrderConfirmInfo.integralAmount != ''">
-                    <label class="col-sm-3 col-form-label">
-                        <span>
-                            <span><vc:i18n name="积分账户抵扣金额" namespace="payFeeOrderConfirm"></vc:i18n></span>
-                        </span>：
+                    <label class="col-sm-3 col-form-label"><vc:i18n name="积分账户抵扣金额：" namespace="payFeeOrderConfirm"></vc:i18n>
                     </label>
                     <label class="col-sm-8 col-form-label">{{payFeeOrderConfirmInfo.integralAmount}}</label>
                 </div>
                 <div class="row"
                      v-if="payFeeOrderConfirmInfo.cashAmount != null && payFeeOrderConfirmInfo.cashAmount != ''">
                     <label class="col-sm-3 col-form-label">
-                        <span>
-                            <span><vc:i18n name="现金账户抵扣金额" namespace="payFeeOrderConfirm"></vc:i18n></span>
-                        </span>：
+                        <vc:i18n name="现金账户抵扣金额：" namespace="payFeeOrderConfirm"></vc:i18n>
                     </label>
                     <label class="col-sm-8 col-form-label">{{payFeeOrderConfirmInfo.cashAmount}}</label>
                 </div>
                 <div class="row">
                     <label class="col-sm-3 col-form-label">
-                        <span>
-                            <span><vc:i18n name="备注" namespace="payFeeOrderConfirm"></vc:i18n></span>
-                        </span>：
+                        <vc:i18n name="备注：" namespace="payFeeOrderConfirm"></vc:i18n>
                     </label>
                     <label class="col-sm-8 col-form-label">{{payFeeOrderConfirmInfo.remark}}</label>
                 </div>
@@ -121,15 +99,11 @@
                        v-if="payFeeOrderConfirmInfo.payType == 'qrCode'" type="text" @keyup.enter="_qrCodePayFee"
                        :placeholder="vc.i18n('请用扫码枪扫码','payFeeOrderConfirm')">
                 <button type="button" class="btn btn-secondary" @click="_closeDoPayFeeModal()">
-                    <span>
-                        <span><vc:i18n name="关闭" namespace="payFeeOrderConfirm"></vc:i18n></span>
-                    </span>
+                    <vc:i18n name="关闭" namespace="payFeeOrderConfirm"></vc:i18n>
                 </button>
                 <button type="button" class="btn btn-primary" v-if="payFeeOrderConfirmInfo.payType == 'common'"
                         @click="_payFee()">
-                    <span>
-                        <span><vc:i18n name="确定收费" namespace="payFeeOrderConfirm"></vc:i18n></span>
-                    </span>
+                    <vc:i18n name="确定收费" namespace="payFeeOrderConfirm"></vc:i18n>
                 </button>
             </div>
         </div>