Merge branch 'bug_mk' into dev

src/views/modules/base/resi.vue

@@ -1189,20 +1189,16 @@ export default {
               this.$refs.myResiSearch.form.attentionCrowds.push(
                 newVal.params.category
               );
-            this.handleSearchFrom();
             } else if(newVal.params.category === 'CHRONIC_DISEASE_FLAG' ||newVal.params.category === 'SERIOUS_ILLNESS_FLAG'||newVal.params.category === 'DISABILITY_FLAG'){
               this.$refs.myResiSearch.form.healthStatus.push(
                 newVal.params.category
               );
-            this.handleSearchFrom();
             }else if(newVal.params.category === 'SPECIAL_CROWD_FLAG'){
               this.$refs.myResiSearch.form.specialCategoryCodes = ["anzhibangjiao","shequjiaozheng","xidurenyuan","buliangqingshaonian","zhaoshizhaohuojingshenbing","xiejiaorenyuan"];
-            this.handleSearchFrom();
             }else if(newVal.params.category === 'PARTY_FLAG'){
               this.$refs.myResiSearch.form.partyFlag =1;
-              this.handleSearchFrom();
             }
-
+            this.handleSearchFrom();
           });
         }
       },

src/views/modules/home/index.vue

@@ -29,21 +29,21 @@
 
           <div class="mewq">
             <div class="boxss">
-              <div style="margin-top: 10px;">
+              <div style="margin-top: 10px;" @click="handelClickToResi">
                 <span style="color: #2683DB; font-size: 25px;">{{ pandectData.totalResidents }}</span>
                 <br>
                 <span style="color: #858585; font-size: 12px;">居民总数</span>
               </div>
             </div>
             <div class="boxss">
-              <div style="margin-top: 10px;">
+              <div style="margin-top: 10px;"  @click="handelClickToResi">
                 <span style="color: #2683DB; font-size: 25px;">{{ pandectData.permanentResiCount }}</span>
                 <br>
                 <span style="color: #858585; font-size: 12px;">常住人口</span>
               </div>
             </div>
             <div class="boxss">
-              <div style="margin-top: 10px;">
+              <div style="margin-top: 10px;"  @click="handelClickToResi">
                 <span style="color: #2683DB; font-size: 25px;">{{ pandectData.floatingResiCount }}</span>
                 <br>
                 <span style="color: #858585; font-size: 12px;">流动人口</span>
@@ -594,7 +594,7 @@ export default {
       this.$router.push({
         name: "base-resi",
         params: {
-          category: e.residentCategory,
+          category: e.residentCategory || null,
         },
       });
     },