Merge branch 'bug_mk' into feature

src/views/modules/shequ/chaxun.vue

@@ -44,9 +44,18 @@
             {{ smatrFlag ? "关闭智能查询" : "智能查询" }}
           </div> -->
         </div>
-        <div class="rules_box" >
+        <div class="rules_box" v-show="searchData.type === 'jumin'">
           <el-tag
-          v-for="item in hotTagList"
+          v-for="item in hotTagListResi"
+          :key="item.label"
+          :type="item.label"
+          effect="plain" @click="handelClickTag(item.label)" style="margin-right: 10px;cursor: pointer;">
+          {{ item.label }}（{{item.count}}）
+        </el-tag>
+        </div>
+        <div class="rules_box" v-show="searchData.type === 'fangwu'">
+          <el-tag
+          v-for="item in hotTagListHouse"
           :key="item.label"
           :type="item.label"
           effect="plain" @click="handelClickTag(item.label)" style="margin-right: 10px;cursor: pointer;">
@@ -59,8 +68,6 @@
             >请点击此处调整</el-button
           >
         </p>
-       
-        
       </div>
     </div>
 
@@ -482,7 +489,8 @@ export default {
 
       childrenRulesData: [],
 
-      hotTagList:[],
+      hotTagListResi:[],
+      hotTagListHouse:[],
     };
   },
   computed: {
@@ -503,6 +511,7 @@ export default {
   activated() {
     this.firstSearch();
     this.getHotResidentSearch()
+    this.getHotHouseSearch()
   },
   methods: {
     async handleExport() {
@@ -545,7 +554,7 @@ export default {
       let url = '/actual/base/residentBaseInfo/hotResidentSearch'
       let {code,data,msg} = await requestPost(url)
       if(code === 0){
-        this.hotTagList = data
+        this.hotTagListResi = data
       }else{
         console.log(msg);
       }
@@ -554,7 +563,7 @@ export default {
       let url = '/actual/base/communityHouse/hotHouseSearch'
       let {code,data,msg} = await requestPost(url)
       if(code === 0){
-        this.hotTagList = data
+        this.hotTagListHouse = data
       }else{
         console.log(msg);
       }
@@ -788,11 +797,6 @@ export default {
       this.getRulesList();
     },
     handelClickTab(type) {
-      if(type === 'jumin'){
-        this.getHotResidentSearch()
-      }else{
-        this.getHotHouseSearch()
-      }
       this.searchData.type = type;
       this.handleClickSearchBtn();
     },