Merge branch '1122' into dev

src/views/dataBoard/renfang/index.vue

@@ -411,9 +411,10 @@
     </div>
 
     <resi-details
-      @close="displayedResiId = ''"
+      @close="popupShow = false"
       :resi-id="displayedResiId"
-      v-if="displayedResiId"
+      :popupShow='popupShow'
+      v-if="popupShow"
     />
 
     <house-details
@@ -508,6 +509,8 @@ export default {
       displayedHouseId: "",
 
       pandectData: {},
+
+      popupShow:false
     };
   },
 
@@ -591,6 +594,7 @@ export default {
     handleClickDotBtn(type, info) {
       if (type == "watch-resi") {
         this.displayedResiId = info.user_id;
+        this.popupShow = true
       } else if (type == "watch-house") {
         this.displayedHouseId = info.house_id;
       }