diff --git a/public/components/property/importMeterWaterFee/importMeterWaterFee.js b/public/components/property/importMeterWaterFee/importMeterWaterFee.js
index 082767ae7..fad8483a6 100755
--- a/public/components/property/importMeterWaterFee/importMeterWaterFee.js
+++ b/public/components/property/importMeterWaterFee/importMeterWaterFee.js
@@ -66,7 +66,7 @@
                     vc.toast('Excel文件大小不能超过2M');
                     return;
                 }
-                var param = new FormData();
+                let param = new FormData();
                 param.append("uploadFile", vc.component.importMeterWaterFeeInfo.excelTemplate);
                 param.append('communityId', vc.component.importMeterWaterFeeInfo.communityId);
                 param.append('feeTypeCd', vc.component.importMeterWaterFeeInfo.feeTypeCd);
diff --git a/public/import/importRoom.xlsx b/public/import/importRoom.xlsx
index dfb70ee5e..655b46e6f 100644
Binary files a/public/import/importRoom.xlsx and b/public/import/importRoom.xlsx differ
diff --git a/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.html b/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.html
index 5c83f61d5..20bb2dfbf 100644
--- a/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.html
+++ b/public/pages/property/batchPayFeeOrder/batchPayFeeOrder.html
@@ -152,17 +152,28 @@
                         <label class="col-sm-3 col-form-label"><span><vc:i18n name="金额" namespace="batchPayFeeOrder"></vc:i18n></span>：</label>
                         <label class="col-sm-9 col-form-label">{{batchPayFeeOrderInfo.feePrices}}<span><vc:i18n name="元" namespace="batchPayFeeOrder"></vc:i18n></span></label>
                     </div>
-                    <div class="row form-group">
-                        <label class="col-sm-3 col-form-label"><span><vc:i18n name="支付方式" namespace="batchPayFeeOrder"></vc:i18n></span>:</label>
+                    <div class="row form-group"  v-if="batchPayFeeOrderInfo.payType == 'common'">
+                        <label class="col-sm-3 col-form-label"><vc:i18n name="支付方式:" namespace="batchPayFeeOrder"></vc:i18n></label>
                         <div class="col-sm-9">
                             <select class="custom-select" v-model="batchPayFeeOrderInfo.primeRate">
-                                <option selected disabled value="">{{vc.i18n('必填','batchPayFeeOrder')}}，请选择支付方式</option>
+                                <option selected disabled value="">{{vc.i18n('必填，请选择支付方式','batchPayFeeOrder')}}</option>
                                 <option v-for="(item,index) in batchPayFeeOrderInfo.primeRates" :key="index" v-if="item.statusCd != '5' && item.statusCd != '6'"
                                         :value="item.statusCd">{{item.name}}
                                 </option>
                             </select>
                         </div>
                     </div>
+                    <div class="row form-group"  v-else>
+                        <label class="col-sm-3 col-form-label"><vc:i18n name="支付方式:" namespace="batchPayFeeOrder"></vc:i18n></label>
+                        <div class="col-sm-9">
+                            <select class="custom-select" v-model="batchPayFeeOrderInfo.primeRate">
+                                <option selected disabled value="">{{vc.i18n('必填，请选择支付方式','batchPayFeeOrder')}}</option>
+                                <option v-for="(item,index) in batchPayFeeOrderInfo.primeRates" :key="index" v-if="item.statusCd == '3' || item.statusCd == '4'"
+                                        :value="item.statusCd">{{item.name}}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
                 <div class="modal-footer">
                     <input v-model="batchPayFeeOrderInfo.authCode" id="authCode" class="form-control" style="width: 60%;" v-if="batchPayFeeOrderInfo.payType == 'qrCode'" type="text" @keyup.enter="_qrCodePayFee" :placeholder="vc.i18n('请用扫码枪扫码','batchPayFeeOrder')">
diff --git a/public/pages/property/owePayFeeOrder/owePayFeeOrder.html b/public/pages/property/owePayFeeOrder/owePayFeeOrder.html
index 2738ef648..8bc29ac68 100755
--- a/public/pages/property/owePayFeeOrder/owePayFeeOrder.html
+++ b/public/pages/property/owePayFeeOrder/owePayFeeOrder.html
@@ -105,10 +105,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title">
-                        <span>
-                            <span><vc:i18n name="收费确认" namespace="owePayFeeOrder"></vc:i18n></span>
-                        </span>
+                    <h5 class="modal-title"><vc:i18n name="收费确认" namespace="owePayFeeOrder"></vc:i18n>
                     </h5>
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                         <span aria-hidden="true">&times;</span>
@@ -142,20 +139,25 @@
                             </span>:
                         </label>
                         <div class="col-sm-9">
-                            <select class="custom-select" v-model="owePayFeeOrderInfo.primeRate">
+                            <select class="custom-select" v-model="owePayFeeOrderInfo.primeRate"  v-if="owePayFeeOrderInfo.payType == 'common'">
                                 <option selected disabled value="">{{vc.i18n('必填，请选择支付方式','owePayFeeOrder')}}</option>
                                 <option v-for="(item,index) in owePayFeeOrderInfo.primeRates" :key="index"
                                         v-if="item.statusCd != '5' && item.statusCd != '6'"
                                         :value="item.statusCd">{{item.name}}
                                 </option>
                             </select>
+                            <select class="custom-select" v-model="owePayFeeOrderInfo.primeRate"  v-else>
+                                <option selected disabled value="">{{vc.i18n('必填，请选择支付方式','owePayFeeOrder')}}</option>
+                                <option v-for="(item,index) in owePayFeeOrderInfo.primeRates" :key="index"
+                                        v-if="item.statusCd == '3' || item.statusCd == '4'"
+                                        :value="item.statusCd">{{item.name}}
+                                </option>
+                            </select>
                         </div>
                     </div>
                     <div class="row">
                         <label class="col-sm-3 col-form-label">
-                            <span>
-                                <span><vc:i18n name="备注" namespace="owePayFeeOrder"></vc:i18n></span>
-                            </span>：
+                            <vc:i18n name="备注：" namespace="owePayFeeOrder"></vc:i18n>
                         </label>
                         <label class="col-sm-9 col-form-label">
                             <textarea :placeholder="vc.i18n('可填，请填写备注','owePayFeeOrder')" class="form-control"
@@ -167,14 +169,10 @@
                 <div class="modal-footer">
                     <input v-model="owePayFeeOrderInfo.authCode" id="authCode" class="form-control" style="width: 60%;" v-if="owePayFeeOrderInfo.payType == 'qrCode'" type="text" @keyup.enter="_qrCodePayFee" :placeholder="vc.i18n('请用扫码枪扫码','payFeeOrderConfirm')">
                     <button type="button" class="btn btn-secondary" @click="_closeDoOwePayFeeModal()">
-                        <span>
-                            <span><vc:i18n name="关闭" namespace="owePayFeeOrder"></vc:i18n></span>
-                        </span>
+                        <vc:i18n name="关闭" namespace="owePayFeeOrder"></vc:i18n>
                     </button>
                     <button type="button" class="btn btn-primary" @click="_doPayFee()" v-if="owePayFeeOrderInfo.payType == 'common'">
-                        <span>
-                            <span><vc:i18n name="确定收费" namespace="owePayFeeOrder"></vc:i18n></span>
-                        </span>
+                        <vc:i18n name="确定收费" namespace="owePayFeeOrder"></vc:i18n>
                     </button>
                 </div>
             </div>
@@ -194,17 +192,10 @@
                     </button>
                 </div>
                 <div class="modal-body">
-                    <p>
-                        <span>
-                            <span><vc:i18n name="缴费成功" namespace="owePayFeeOrder"></vc:i18n></span>
-                        </span>
-                    </p>
+                    <p><vc:i18n name="缴费成功" namespace="owePayFeeOrder"></vc:i18n></p>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" @click="_back()">
-                        <span>
-                            <span><vc:i18n name="返回" namespace="owePayFeeOrder"></vc:i18n></span>
-                        </span>
+                    <button type="button" class="btn btn-secondary" @click="_back()"><vc:i18n name="返回" namespace="owePayFeeOrder"></vc:i18n>
                     </button>
                     <!-- <button type="button" class="btn btn-primary" @click="_printAndBack()"><span><span><vc:i18n name="打印收据" namespace="owePayFeeOrder"></vc:i18n></span></span></button> -->
                 </div>
diff --git a/public/pages/property/payFeeOrder/payFeeOrder.html b/public/pages/property/payFeeOrder/payFeeOrder.html
index de73eebbf..72022c5cb 100755
--- a/public/pages/property/payFeeOrder/payFeeOrder.html
+++ b/public/pages/property/payFeeOrder/payFeeOrder.html
@@ -221,22 +221,15 @@
                             <div class="form-group row">
                                 <div class="col-sm-6">
                                     <button type="button" class="btn btn-success btn-lg btn-block"
+                                    v-if="payFeeOrderInfo.primeRate == '3' || payFeeOrderInfo.primeRate == '4'"
                                         @click="_openPayFee('qrCode')">
-                                        <span>
-                                            <span>
-                                                <vc:i18n name="扫码收费" namespace="payFeeOrder"></vc:i18n>
-                                            </span>
-                                        </span>
+                                        <vc:i18n name="扫码收费" namespace="payFeeOrder"></vc:i18n>
                                     </button>
                                 </div>
                                 <div class="col-sm-6">
                                     <button type="button" class="btn btn-primary btn-lg btn-block"
                                         v-if="payFeeOrderInfo.offlinePayFeeSwitch !='2'" @click="_openPayFee('common')">
-                                        <span>
-                                            <span>
-                                                <vc:i18n name="提交收费" namespace="payFeeOrder"></vc:i18n>
-                                            </span>
-                                        </span>
+                                        <vc:i18n name="提交收费" namespace="payFeeOrder"></vc:i18n>
                                     </button>
                                 </div>
                             </div>
diff --git a/public/pages/property/roomCreateFee/roomCreateFee.html b/public/pages/property/roomCreateFee/roomCreateFee.html
index ac7a7aa5b..fbdd85af0 100755
--- a/public/pages/property/roomCreateFee/roomCreateFee.html
+++ b/public/pages/property/roomCreateFee/roomCreateFee.html
@@ -347,11 +347,7 @@
                                             <button class="btn btn-link btn-xs"
                                                 v-if="fee.state != '2009001' && vc.hasPrivilege('502020090427190001')"
                                                 v-on:click="_editFee(fee)">
-                                                <span>
-                                                    <span>
                                                         <vc:i18n name="变更" namespace="listRoomFee"></vc:i18n>
-                                                    </span>
-                                                </span>
                                             </button>
                                             <a target="_blank"
                                                 :href="'/#/pages/fee/feeDetail?feeId='+fee.feeId">