From 1eba2a2f58bb5b07c079a0590243833b8e212eb2 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Thu, 1 Dec 2022 14:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9C=88=E8=8F=9C=E5=8D=95=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E6=99=AE=E9=80=9A=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/addHousekeepingType/addHousekeepingType.html       | 5 +++--
 .../admin/editHousekeepingType/editHousekeepingType.html     | 5 +++--
 .../components/property/simplifyRoomFee/simplifyRoomFee.html | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/public/components/admin/addHousekeepingType/addHousekeepingType.html b/public/components/admin/addHousekeepingType/addHousekeepingType.html
index 119662868..58974d4df 100644
--- a/public/components/admin/addHousekeepingType/addHousekeepingType.html
+++ b/public/components/admin/addHousekeepingType/addHousekeepingType.html
@@ -21,7 +21,7 @@
                                 </div>
                             </div>
                             <div class="form-group row">
-                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="服务描述" namespace="addHousekeepingType"></vc:i18n></span></label>
+                                <label class="col-sm-2 col-form-label"><span><vc:i18n name="菜单描述" namespace="addHousekeepingType"></vc:i18n></span></label>
                                 <div class="col-sm-10">
                                     <input v-model="addHousekeepingTypeInfo.hktDesc" type="text" :placeholder="vc.i18n('选填，请填写服务描述','addHousekeepingType')" class="form-control">
                                 </div>
@@ -37,10 +37,11 @@
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="addHousekeepingTypeInfo.skipType">
                                         <option selected disabled value="">{{vc.i18n('必填，请选择跳转类型','addHousekeepingType')}}</option>
+                                        <option value="3">{{vc.i18n('普通商品','addHousekeepingType')}}</option>
                                         <option value="1">{{vc.i18n('站内','addHousekeepingType')}}</option>
                                         <option value="2">{{vc.i18n('站外','addHousekeepingType')}}</option>
                                         <option value="S">{{vc.i18n('店铺','addHousekeepingType')}}</option>
-                                        <option value="P">{{vc.i18n('商品','addHousekeepingType')}}</option>
+                                        <option value="P">{{vc.i18n('单个商品','addHousekeepingType')}}</option>
                                     </select>
                                 </div>
                             </div>
diff --git a/public/components/admin/editHousekeepingType/editHousekeepingType.html b/public/components/admin/editHousekeepingType/editHousekeepingType.html
index c51ea07c0..e47595a5d 100644
--- a/public/components/admin/editHousekeepingType/editHousekeepingType.html
+++ b/public/components/admin/editHousekeepingType/editHousekeepingType.html
@@ -32,7 +32,7 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">
-                                    <span><vc:i18n name="服务描述" namespace="editHousekeepingType"></vc:i18n></span>
+                                    <span><vc:i18n name="菜单描述" namespace="editHousekeepingType"></vc:i18n></span>
                                 </label>
                                 <div class="col-sm-10">
                                     <input v-model="editHousekeepingTypeInfo.hktDesc" type="text"
@@ -59,10 +59,11 @@
                                         <option selected disabled value="">
                                             {{vc.i18n('必填，请选择跳转类型','editHousekeepingType')}}
                                         </option>
+                                        <option value="3">{{vc.i18n('普通商品','editHousekeepingType')}}</option>
                                         <option value="1">{{vc.i18n('站内','editHousekeepingType')}}</option>
                                         <option value="2">{{vc.i18n('站外','editHousekeepingType')}}</option>
                                         <option value="S">{{vc.i18n('店铺','editHousekeepingType')}}</option>
-                                        <option value="P">{{vc.i18n('商品','editHousekeepingType')}}</option>
+                                        <option value="P">{{vc.i18n('单个商品','editHousekeepingType')}}</option>
                                     </select>
                                 </div>
                             </div>
diff --git a/public/components/property/simplifyRoomFee/simplifyRoomFee.html b/public/components/property/simplifyRoomFee/simplifyRoomFee.html
index 653a3ebbb..b86702e2a 100755
--- a/public/components/property/simplifyRoomFee/simplifyRoomFee.html
+++ b/public/components/property/simplifyRoomFee/simplifyRoomFee.html
@@ -49,11 +49,11 @@
                     v-on:click="_openProxyFeeModal()">
                 <span><vc:i18n name="按量缴费" namespace="simplifyRoomFee"></vc:i18n></span>
             </button>
-            <!-- <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+            <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
                     v-if="vc.hasPrivilege('502022073042960005')"
                     v-on:click="_openAddMeterWaterSimplifyModal()">
                 <span><vc:i18n name="水电抄表" namespace="simplifyRoomFee"></vc:i18n></span>
-            </button> -->
+            </button>
             <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
                     v-if="vc.hasPrivilege('502022073006890006')"
                     v-on:click="_openRoomCreateFeeComboModal()">