From ac962cea64edbea450ec33c02a98946794c492e5 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: Sat, 10 Jul 2021 13:34:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=81=E8=BF=9E=E7=BB=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/addAccountBond/addAccountBond.html |  4 +--
 .../common/addAccountBond/addAccountBond.js   | 33 +++----------------
 .../property/editAdvert/editAdvert.html       |  2 +-
 .../accountBondManage/accountBondManage.html  | 15 ++++++---
 .../accountBondManage/accountBondManage.js    | 25 ++++++++++++--
 5 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/public/components/common/addAccountBond/addAccountBond.html b/public/components/common/addAccountBond/addAccountBond.html
index 8e0fb1270..eea263bd4 100644
--- a/public/components/common/addAccountBond/addAccountBond.html
+++ b/public/components/common/addAccountBond/addAccountBond.html
@@ -12,8 +12,8 @@
                 <div class="col-sm-10">
                     <select class="custom-select" v-model="addAccountBondInfo.objId" 
                      @change="setAddBondName(addAccountBondInfo.objId)" >
-                        <option selected disabled value="">必填，请选择物品类型</option>
-                        <option v-for="(item,index) in addAccountBondInfo.shopTypes"
+                        <option selected disabled value="">必填，请选择店铺类型</option>
+                        <option v-for="(item,index) in accountBondManageInfo.shopTypes"
                                 :key="index"
                                 v-bind:value="item.shopTypeId">
                             {{item.typeName}}
diff --git a/public/components/common/addAccountBond/addAccountBond.js b/public/components/common/addAccountBond/addAccountBond.js
index 260f9068d..1c918afa7 100644
--- a/public/components/common/addAccountBond/addAccountBond.js
+++ b/public/components/common/addAccountBond/addAccountBond.js
@@ -13,13 +13,11 @@
                 bondMonth: '',
                 objId: '',
                 bondType: '6006',
-                remark: '',
-                shopTypes : []
-
+                remark: ''
             }
         },
         _initMethod: function () {
-            $that._listAddShopTypes();
+           
         },
         _initEvent: function () {
             vc.on('addAccountBond', 'openAddAccountBondModal', function () {
@@ -117,30 +115,8 @@
 
                     });
             },
-            _listAddShopTypes:function(){
-
-               var param = {
-                params: {
-                    page: 1,
-                    row: 100
-                }
-            };
-               //发送get请求
-               vc.http.apiGet('/shopType/queryShopType',
-                             param,
-                             function(json,res){
-                                var _shopTypeManageInfo=JSON.parse(json);
-                                vc.component.addAccountBondInfo.total = _shopTypeManageInfo.total;
-                                vc.component.addAccountBondInfo.records = _shopTypeManageInfo.records;
-                                vc.component.addAccountBondInfo.shopTypes = _shopTypeManageInfo.data;
-                             },function(errInfo,error){
-                                console.log('请求失败处理');
-                             }
-                           );
-            },
             setAddBondName:function(_objId){
-
-                $that.addAccountBondInfo.shopTypes.forEach(item => {
+                $that.accountBondManageInfo.shopTypes.forEach(item => {
                     if (item.shopTypeId == _objId) {
                         $that.addAccountBondInfo.bondName = item.typeName;
                     }
@@ -153,8 +129,7 @@
                     bondMonth: '',
                     objId: '',
                     bondType: '6006',
-                    remark: '',
-                    shopTypes : []
+                    remark: ''
 
                 };
             }
diff --git a/public/components/property/editAdvert/editAdvert.html b/public/components/property/editAdvert/editAdvert.html
index 3fe79a6b2..26bd3ea25 100755
--- a/public/components/property/editAdvert/editAdvert.html
+++ b/public/components/property/editAdvert/editAdvert.html
@@ -36,7 +36,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/accountBondManage/accountBondManage.html b/public/pages/admin/accountBondManage/accountBondManage.html
index ca4fbb72a..2973be810 100644
--- a/public/pages/admin/accountBondManage/accountBondManage.html
+++ b/public/pages/admin/accountBondManage/accountBondManage.html
@@ -18,13 +18,20 @@
                         </div>
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <input type="text" placeholder="请输入店铺类型"
-                                    v-model="accountBondManageInfo.conditions.objId" class=" form-control">
+                                    <select class="custom-select" v-model="accountBondManageInfo.conditions.objId"  >
+                                        <option value="">请选择物品类型</option>
+                                        <option v-for="(item,index) in accountBondManageInfo.shopTypes" :value="item.shopTypeId">
+                                            {{item.typeName}}
+                                        </option>
+                                    </select>
                             </div>
                         </div>
+                        <div class="col-sm-1">
+                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryAccountBondMethod()">
+                                <i class="glyphicon glyphicon-search"></i> 查询
+                            </button>
+                        </div>
                     </div>
-
-
                 </div>
             </div>
         </div>
diff --git a/public/pages/admin/accountBondManage/accountBondManage.js b/public/pages/admin/accountBondManage/accountBondManage.js
index 951a5839c..ea63fa046 100644
--- a/public/pages/admin/accountBondManage/accountBondManage.js
+++ b/public/pages/admin/accountBondManage/accountBondManage.js
@@ -16,11 +16,13 @@
                     bondName: '',
                     objId: '',
 
-                }
+                },
+                shopTypes : []
             }
         },
         _initMethod: function () {
             vc.component._listAccountBonds(DEFAULT_PAGE, DEFAULT_ROWS);
+            $that._listAddShopTypes();
         },
         _initEvent: function () {
 
@@ -76,7 +78,26 @@
                 } else {
                     vc.component.accountBondManageInfo.moreCondition = true;
                 }
-            }
+            },
+            _listAddShopTypes:function(){
+                var param = {
+                 params: {
+                     page: 1,
+                     row: 100
+                 }
+             };
+                //发送get请求
+                vc.http.apiGet('/shopType/queryShopType',
+                              param,
+                              function(json,res){
+                                 var _shopTypeManageInfo=JSON.parse(json);
+                                 vc.component.accountBondManageInfo.shopTypes = _shopTypeManageInfo.data;
+                              },function(errInfo,error){
+                                 console.log('请求失败处理');
+                              }
+                            );
+             },
+            
 
 
         }