From 2fd36cc0695be4bf0768b1d9d003de3bee538332 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: Sat, 10 Jul 2021 13:15:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E6=94=BF=20=3D=3D=E3=80=8B=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/addHousekeepingType/addHousekeepingType.html        | 2 +-
 public/components/admin/addMainCategory/addMainCategory.html  | 2 +-
 .../admin/deleteHousekeepingType/deleteHousekeepingType.html  | 2 +-
 .../admin/editHousekeepingType/editHousekeepingType.html      | 2 +-
 .../admin/editHousekeepingType/editHousekeepingType.js        | 2 +-
 .../components/admin/editMainCategory/editMainCategory.html   | 2 +-
 .../common/editHousekeepingServ/editHousekeepingServ.html     | 4 ++--
 public/components/property/addAdvert/addAdvert.html           | 2 +-
 .../housekeepingSjServManage/housekeepingSjServManage.html    | 4 ++--
 .../admin/housekeepingTypeManage/housekeepingTypeManage.html  | 2 +-
 public/pages/admin/mainCategoryManage/mainCategoryManage.html | 4 ++--
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/public/components/admin/addHousekeepingType/addHousekeepingType.html b/public/components/admin/addHousekeepingType/addHousekeepingType.html
index 2c0b4e04a..67ad70eb2 100644
--- a/public/components/admin/addHousekeepingType/addHousekeepingType.html
+++ b/public/components/admin/addHousekeepingType/addHousekeepingType.html
@@ -33,7 +33,7 @@
                 <div class="col-sm-10">
                   <select class="custom-select" v-model="addHousekeepingTypeInfo.typeCd">
                     <option selected disabled value="">必填，请选择类型</option>
-                    <option value="1001">家政</option>
+                    <option value="1001">服务</option>
                     <option value="2002">商城</option>
                   </select>
                 </div>
diff --git a/public/components/admin/addMainCategory/addMainCategory.html b/public/components/admin/addMainCategory/addMainCategory.html
index 8be154428..2c292f199 100644
--- a/public/components/admin/addMainCategory/addMainCategory.html
+++ b/public/components/admin/addMainCategory/addMainCategory.html
@@ -19,7 +19,7 @@
                 <div class="col-sm-10">
                   <select class="custom-select" v-model="addMainCategoryInfo.categoryType">
                     <option selected disabled value="">必填，请选择目录类别</option>
-                    <option value="1">家政</option>
+                    <option value="1">服务</option>
                     <option value="2">商圈</option>
                   </select>
                 </div>
diff --git a/public/components/admin/deleteHousekeepingType/deleteHousekeepingType.html b/public/components/admin/deleteHousekeepingType/deleteHousekeepingType.html
index d6298359a..737f0d236 100644
--- a/public/components/admin/deleteHousekeepingType/deleteHousekeepingType.html
+++ b/public/components/admin/deleteHousekeepingType/deleteHousekeepingType.html
@@ -10,7 +10,7 @@
             </div>
             <div class="modal-body">
                 <tr align="center">
-                    <th>确定删除家政服务</th>
+                    <th>确定删除服务</th>
                 </tr>
             </div>
             <div class="modal-footer">
diff --git a/public/components/admin/editHousekeepingType/editHousekeepingType.html b/public/components/admin/editHousekeepingType/editHousekeepingType.html
index 7c3ff8b01..b13866b22 100644
--- a/public/components/admin/editHousekeepingType/editHousekeepingType.html
+++ b/public/components/admin/editHousekeepingType/editHousekeepingType.html
@@ -34,7 +34,7 @@
                 <div class="col-sm-10">
                   <select class="custom-select" v-model="editHousekeepingTypeInfo.typeCd">
                     <option selected disabled value="">必填，请选择类型</option>
-                    <option value="1001">家政</option>
+                    <option value="1001">服务</option>
                     <option value="2002">商城</option>
                   </select>
                 </div>
diff --git a/public/components/admin/editHousekeepingType/editHousekeepingType.js b/public/components/admin/editHousekeepingType/editHousekeepingType.js
index 789c2e282..64cd66c21 100644
--- a/public/components/admin/editHousekeepingType/editHousekeepingType.js
+++ b/public/components/admin/editHousekeepingType/editHousekeepingType.js
@@ -101,7 +101,7 @@
                         {
                             limit: "required",
                             param: "",
-                            errInfo: "家政服务ID不能为空"
+                            errInfo: "服务ID不能为空"
                         }],
 
                     'editHousekeepingTypeInfo.typeCd': [
diff --git a/public/components/admin/editMainCategory/editMainCategory.html b/public/components/admin/editMainCategory/editMainCategory.html
index 3d57265c7..cd73404e4 100644
--- a/public/components/admin/editMainCategory/editMainCategory.html
+++ b/public/components/admin/editMainCategory/editMainCategory.html
@@ -19,7 +19,7 @@
                 <div class="col-sm-10">
                   <select class="custom-select" v-model="editMainCategoryInfo.categoryType">
                     <option selected disabled value="">必填，请选择目录类别</option>
-                    <option value="1">家政</option>
+                    <option value="1">服务</option>
                     <option value="2">商圈</option>
                   </select>
                 </div>
diff --git a/public/components/common/editHousekeepingServ/editHousekeepingServ.html b/public/components/common/editHousekeepingServ/editHousekeepingServ.html
index a54852d55..97f16b497 100644
--- a/public/components/common/editHousekeepingServ/editHousekeepingServ.html
+++ b/public/components/common/editHousekeepingServ/editHousekeepingServ.html
@@ -26,10 +26,10 @@
               <input v-model="editHousekeepingServInfo.keyword" type="text" disabled="disabled" placeholder="必填，请填写关键词,多个关键词用;分隔"
                 class="form-control">
             </div>
-            <label class="col-sm-1 col-form-label text-right">家政类型</label>
+            <label class="col-sm-1 col-form-label text-right">服务类型</label>
             <div class="col-sm-5">
               <select style="color:#101111" class="custom-select" disabled="disabled" v-model="editHousekeepingServInfo.hktId">
-                <option selected disabled value="">必填，请选择家政类型</option>
+                <option selected disabled value="">必填，请选择服务类型</option>
                 <option v-for="(item,index) in editHousekeepingServInfo.housekeepingTypes" :value="item.hktId">
                   {{item.hktName}}</option>
               </select>
diff --git a/public/components/property/addAdvert/addAdvert.html b/public/components/property/addAdvert/addAdvert.html
index bcc77be95..b5558c6f9 100755
--- a/public/components/property/addAdvert/addAdvert.html
+++ b/public/components/property/addAdvert/addAdvert.html
@@ -35,7 +35,7 @@
                                         <option value="1000">小区内设备</option>
                                         <option value="2000">业主首页</option>
                                         <option value="3000">商圈首页</option>
-                                        <option value="5000">家政首页</option>
+                                        <option value="5000">服务首页</option>
                                         <option value="6000">便民首页</option>
                                         <option value="4000">员工首页</option>
                                     </select>
diff --git a/public/pages/admin/housekeepingSjServManage/housekeepingSjServManage.html b/public/pages/admin/housekeepingSjServManage/housekeepingSjServManage.html
index 077195e9f..195e66352 100644
--- a/public/pages/admin/housekeepingSjServManage/housekeepingSjServManage.html
+++ b/public/pages/admin/housekeepingSjServManage/housekeepingSjServManage.html
@@ -25,7 +25,7 @@
                         <div class="col-sm-4">
                             <div class="form-group">
                                 <select class="custom-select" v-model="housekeepingServManageInfo.conditions.hktId">
-                                    <option selected value="">请选择家政类型</option>
+                                    <option selected value="">请选择服务类型</option>
                                     <option v-for="(item,index) in housekeepingServManageInfo.housekeepingTypes" :value="item.hktId">
                                         {{item.hktName}}
                                     </option>
@@ -68,7 +68,7 @@
                                 <th class="text-center">服务编号</th>
                                 <th class="text-center">服务名称</th>
                                 <th class="text-center">服务描述</th>
-                                <th class="text-center">家政类型</th>
+                                <th class="text-center">服务类型</th>
                                 <th class="text-center">派单方式</th>
                                 <th class="text-center">回访方式</th>
                                 <th class="text-center">销量</th>
diff --git a/public/pages/admin/housekeepingTypeManage/housekeepingTypeManage.html b/public/pages/admin/housekeepingTypeManage/housekeepingTypeManage.html
index d74c8d360..521f725a1 100644
--- a/public/pages/admin/housekeepingTypeManage/housekeepingTypeManage.html
+++ b/public/pages/admin/housekeepingTypeManage/housekeepingTypeManage.html
@@ -19,7 +19,7 @@
                         <div class="col-sm-3">
                             <select class="custom-select" v-model="housekeepingTypeManageInfo.conditions.typeCd">
                                 <option selected value="">请选择类型</option>
-                                <option value="1001">家政</option>
+                                <option value="1001">服务</option>
                                 <option value="2002">商城</option>
                             </select>
                         </div>
diff --git a/public/pages/admin/mainCategoryManage/mainCategoryManage.html b/public/pages/admin/mainCategoryManage/mainCategoryManage.html
index d3ab18765..43dc791f5 100644
--- a/public/pages/admin/mainCategoryManage/mainCategoryManage.html
+++ b/public/pages/admin/mainCategoryManage/mainCategoryManage.html
@@ -13,7 +13,7 @@
                         <div class="col-sm-4">
                             <select class="custom-select" v-model="mainCategoryManageInfo.conditions.categoryType">
                                 <option selected value="">请选择目录类别</option>
-                                <option value="1">家政</option>
+                                <option value="1">服务</option>
                                 <option value="2">商圈</option>
                             </select>
                         </div>
@@ -75,7 +75,7 @@
                             <tr v-for="mainCategory in mainCategoryManageInfo.mainCategorys">
                                 <td class="text-center">{{mainCategory.mainCategoryId}}</td>
                                 <td class="text-center">{{mainCategory.categoryName}}</td>
-                                <td class="text-center">{{mainCategory.categoryType == '1'?'家政':'商圈'}}</td>
+                                <td class="text-center">{{mainCategory.categoryType == '1'?'服务':'商圈'}}</td>
                                 <td class="text-center">{{mainCategory.startTime}}</td>
                                 <td class="text-center">{{mainCategory.endTime}}</td>
                                 <td class="text-center">{{mainCategory.seq}}</td>