From d5319a70c264f43d0fc258e424b30ff19849851d Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: Thu, 24 Jun 2021 17:19:08 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AE=B6=E6=94=BF=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/components/property/addAdvert/addAdvert.html   | 3 ++-
 public/components/property/editAdvert/editAdvert.html | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/components/property/addAdvert/addAdvert.html b/public/components/property/addAdvert/addAdvert.html
index fe208cda4..9c25aa756 100755
--- a/public/components/property/addAdvert/addAdvert.html
+++ b/public/components/property/addAdvert/addAdvert.html
@@ -34,7 +34,8 @@
                                         <option selected disabled value="">必填，请选择投放位置</option>
                                         <option value="1000">小区内设备</option>
                                         <option value="2000">业主首页</option>
-                                        <option value="3000">商城首页</option>
+                                        <option value="3000">商圈首页</option>
+                                        <option value="5000">家政首页</option>
                                         <option value="4000">员工首页</option>
                                     </select>
                                 </div>
diff --git a/public/components/property/editAdvert/editAdvert.html b/public/components/property/editAdvert/editAdvert.html
index 39853d907..c541336a8 100755
--- a/public/components/property/editAdvert/editAdvert.html
+++ b/public/components/property/editAdvert/editAdvert.html
@@ -35,7 +35,8 @@
                                         <option selected disabled value="">必填，请选择投放位置</option>
                                         <option value="1000">小区内设备</option>
                                         <option value="2000">业主首页</option>
-                                        <option value="3000">商城首页</option>
+                                        <option value="3000">商圈首页</option>
+                                        <option value="5000">家政首页</option>
                                         <option value="4000">员工首页</option>
                                     </select>
                                 </div>

From 859fbd4e3ef51cf9bb4407dd7a780a5641d588ef Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: Fri, 25 Jun 2021 00:02:55 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E7=B1=BB=E5=9E=8B=20?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=20=E4=BE=BF=E6=B0=91=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/components/property/addAdvert/addAdvert.html   | 1 +
 public/components/property/editAdvert/editAdvert.html | 1 +
 2 files changed, 2 insertions(+)

diff --git a/public/components/property/addAdvert/addAdvert.html b/public/components/property/addAdvert/addAdvert.html
index 9c25aa756..1503beef9 100755
--- a/public/components/property/addAdvert/addAdvert.html
+++ b/public/components/property/addAdvert/addAdvert.html
@@ -36,6 +36,7 @@
                                         <option value="2000">业主首页</option>
                                         <option value="3000">商圈首页</option>
                                         <option value="5000">家政首页</option>
+                                        <option value="6000">便民首页</option>
                                         <option value="4000">员工首页</option>
                                     </select>
                                 </div>
diff --git a/public/components/property/editAdvert/editAdvert.html b/public/components/property/editAdvert/editAdvert.html
index c541336a8..83c26087b 100755
--- a/public/components/property/editAdvert/editAdvert.html
+++ b/public/components/property/editAdvert/editAdvert.html
@@ -37,6 +37,7 @@
                                         <option value="2000">业主首页</option>
                                         <option value="3000">商圈首页</option>
                                         <option value="5000">家政首页</option>
+                                        <option value="6000">便民首页</option>
                                         <option value="4000">员工首页</option>
                                     </select>
                                 </div>

From 40e8afa59ec9c75b5db538ef940b0e2473e34fa1 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 25 Jun 2021 17:26:31 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=B1=89=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/components/property/addUnit/addUnit.js   | 7 +------
 public/components/property/editUnit/editUnit.js | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/public/components/property/addUnit/addUnit.js b/public/components/property/addUnit/addUnit.js
index 65158393e..ef50c6f6f 100755
--- a/public/components/property/addUnit/addUnit.js
+++ b/public/components/property/addUnit/addUnit.js
@@ -61,12 +61,7 @@
                                     limit:"required",
                                     param:"",
                                     errInfo:"单元编号不能为空"
-                                },
-                                {
-                                    limit:"num",
-                                    param:"",
-                                    errInfo:"单元编号必须为数字"
-                                },
+                                }
                             ],
                             'addUnitInfo.layerCount':[
                                 {
diff --git a/public/components/property/editUnit/editUnit.js b/public/components/property/editUnit/editUnit.js
index 0cf89af7c..28f6ec9e8 100755
--- a/public/components/property/editUnit/editUnit.js
+++ b/public/components/property/editUnit/editUnit.js
@@ -42,12 +42,7 @@
                             limit: "required",
                             param: "",
                             errInfo: "单元编号不能为空"
-                        },
-                        {
-                            limit: "num",
-                            param: "",
-                            errInfo: "单元编号必须为数字"
-                        },
+                        }
                     ],
                     'editUnitInfo.layerCount': [
                         {

From ce3fb44cc09004d5d7ad1331b92039bbe7d739a2 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: Sat, 26 Jun 2021 15:18:05 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=93=E5=8C=BA=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/addMainCategory/addMainCategory.html   |  3 ++-
 .../addMainCategoryProduct.html                  |  4 ++--
 .../addMainCategoryProduct.js                    |  3 ++-
 .../admin/editMainCategory/editMainCategory.html |  3 ++-
 .../mainCategoryManage/mainCategoryManage.html   |  5 +++--
 .../mainCategoryProductManage.html               | 16 ++++++++++++----
 .../mainCategoryProductManage.js                 |  1 +
 7 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/public/components/admin/addMainCategory/addMainCategory.html b/public/components/admin/addMainCategory/addMainCategory.html
index eb4d332d9..8be154428 100644
--- a/public/components/admin/addMainCategory/addMainCategory.html
+++ b/public/components/admin/addMainCategory/addMainCategory.html
@@ -19,7 +19,8 @@
                 <div class="col-sm-10">
                   <select class="custom-select" v-model="addMainCategoryInfo.categoryType">
                     <option selected disabled value="">必填，请选择目录类别</option>
-                    <option value="120406">首页目录</option>
+                    <option value="1">家政</option>
+                    <option value="2">商圈</option>
                   </select>
                 </div>
               </div>
diff --git a/public/components/admin/addMainCategoryProduct/addMainCategoryProduct.html b/public/components/admin/addMainCategoryProduct/addMainCategoryProduct.html
index fd89250c6..7dc681261 100644
--- a/public/components/admin/addMainCategoryProduct/addMainCategoryProduct.html
+++ b/public/components/admin/addMainCategoryProduct/addMainCategoryProduct.html
@@ -19,9 +19,9 @@
                 </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="addMainCategoryProductInfo.productId" type="text" placeholder="必填，请填写商品编号"
+                  <input v-model="addMainCategoryProductInfo.productId" type="text" placeholder="必填，请填写商品(服务)编号"
                     class="form-control">
                 </div>
               </div>
diff --git a/public/components/admin/addMainCategoryProduct/addMainCategoryProduct.js b/public/components/admin/addMainCategoryProduct/addMainCategoryProduct.js
index 1fa8b33ee..8c0c1024d 100644
--- a/public/components/admin/addMainCategoryProduct/addMainCategoryProduct.js
+++ b/public/components/admin/addMainCategoryProduct/addMainCategoryProduct.js
@@ -56,7 +56,7 @@
                         },
                         {
                             limit: "maxLength",
-                            param: "200",
+                            param: "30",
                             errInfo: "商品编号太长"
                         },
                     ],
@@ -144,6 +144,7 @@
                 vc.component.addMainCategoryProductInfo = {
                     mainCategoryId: '',
                     productId: '',
+                    productName: '',
                     startTime: '',
                     endTime: '',
                     seq: '',
diff --git a/public/components/admin/editMainCategory/editMainCategory.html b/public/components/admin/editMainCategory/editMainCategory.html
index d307f151a..3d57265c7 100644
--- a/public/components/admin/editMainCategory/editMainCategory.html
+++ b/public/components/admin/editMainCategory/editMainCategory.html
@@ -19,7 +19,8 @@
                 <div class="col-sm-10">
                   <select class="custom-select" v-model="editMainCategoryInfo.categoryType">
                     <option selected disabled value="">必填，请选择目录类别</option>
-                    <option value="120406">首页目录</option>
+                    <option value="1">家政</option>
+                    <option value="2">商圈</option>
                   </select>
                 </div>
               </div>
diff --git a/public/pages/admin/mainCategoryManage/mainCategoryManage.html b/public/pages/admin/mainCategoryManage/mainCategoryManage.html
index bd8cb5b4c..d3ab18765 100644
--- a/public/pages/admin/mainCategoryManage/mainCategoryManage.html
+++ b/public/pages/admin/mainCategoryManage/mainCategoryManage.html
@@ -13,7 +13,8 @@
                         <div class="col-sm-4">
                             <select class="custom-select" v-model="mainCategoryManageInfo.conditions.categoryType">
                                 <option selected value="">请选择目录类别</option>
-                                <option value="120406">首页目录</option>
+                                <option value="1">家政</option>
+                                <option value="2">商圈</option>
                             </select>
                         </div>
                         <div class="col-sm-4">
@@ -74,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}}</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>
diff --git a/public/pages/admin/mainCategoryProductManage/mainCategoryProductManage.html b/public/pages/admin/mainCategoryProductManage/mainCategoryProductManage.html
index 2ebd76fcd..0ae5dfc83 100644
--- a/public/pages/admin/mainCategoryProductManage/mainCategoryProductManage.html
+++ b/public/pages/admin/mainCategoryProductManage/mainCategoryProductManage.html
@@ -10,7 +10,7 @@
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-                        <div class="col-sm-4">
+                        <div class="col-sm-3">
                             <select class="custom-select"
                                 v-model="mainCategoryProductManageInfo.conditions.mainCategoryId">
                                 <option selected value="">请选择目录</option>
@@ -20,13 +20,19 @@
                                 </option>
                             </select>
                         </div>
-                        <div class="col-sm-4">
+                        <div class="col-sm-3">
                             <div class="form-group">
-                                <input type="text" placeholder="请输入商品编号"
+                                <input type="text" placeholder="请输入编号"
                                     v-model="mainCategoryProductManageInfo.conditions.productId" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入名称"
+                                    v-model="mainCategoryProductManageInfo.conditions.productName" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-2">
                             <select class="custom-select" v-model="mainCategoryProductManageInfo.conditions.state">
                                 <option selected value="">请选择状态</option>
                                 <option value="10021">待审核</option>
@@ -67,7 +73,8 @@
                             <tr>
 
                                 <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>
@@ -80,6 +87,7 @@
 
                                 <td class="text-center">{{mainCategoryProduct.categoryName}}</td>
                                 <td class="text-center">{{mainCategoryProduct.productId}}</td>
+                                <td class="text-center">{{mainCategoryProduct.productName}}</td>
                                 <td class="text-center">{{mainCategoryProduct.startTime}}</td>
                                 <td class="text-center">{{mainCategoryProduct.endTime}}</td>
                                 <td class="text-center">{{mainCategoryProduct.seq}}</td>
diff --git a/public/pages/admin/mainCategoryProductManage/mainCategoryProductManage.js b/public/pages/admin/mainCategoryProductManage/mainCategoryProductManage.js
index 6e0d91e2a..4d5656bb4 100644
--- a/public/pages/admin/mainCategoryProductManage/mainCategoryProductManage.js
+++ b/public/pages/admin/mainCategoryProductManage/mainCategoryProductManage.js
@@ -16,6 +16,7 @@
                 conditions: {
                     mainCategoryId: '',
                     productId: '',
+                    productName: '',
                     state: '',
 
                 }