From bd4da68f9f67af36ae46f75e1eaf8c52a9e24c57 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 18 Jul 2023 10:05:55 +0800
Subject: [PATCH] =?UTF-8?q?bug#383=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F,?=
 =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86=E5=9C=B0=E5=9B=BE=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  2 +-
 .../scss/modules/management/detail-main.scss  |  6 ++---
 .../scss/modules/management/edit-main.scss    |  2 ++
 .../modules/base/community/buildForm.vue      | 10 ++++++--
 .../modules/base/community/buildTable.vue     |  3 +++
 .../modules/base/community/community.vue      |  3 +++
 .../modules/base/community/communityForm.vue  | 11 ++++-----
 .../modules/base/community/communityTable.vue |  4 ++++
 .../modules/base/community/roomDetail.vue     | 23 ++++++++++---------
 .../modules/base/community/roomTable.vue      |  4 ++++
 10 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 26f72c928..fa8c1ec7e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -155,7 +155,7 @@ export default {
     position: relative;
     max-height: 83vh;
     box-sizing: border-box;
-    padding: 0 0 16px !important;
+    padding: 0 0 16px ;
     .dialog-h-content {
       max-height: calc(83vh - 80px);
       box-sizing: border-box;
diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss
index cf7cc4fd6..9da31f665 100644
--- a/src/assets/scss/modules/management/detail-main.scss
+++ b/src/assets/scss/modules/management/detail-main.scss
@@ -104,11 +104,11 @@
 
 
 .m-detail-btn{
-  margin-top:30px;
-  margin-right:16px;
-  // margin-bottom:20px;
   display: flex;
   justify-content: flex-end;
+  padding-right: 16px;
+  height: 50px;
+  align-items: center;
 
   .item_btn {
     font-size: 14px;
diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss
index ad12366ec..79904ea6c 100644
--- a/src/assets/scss/modules/management/edit-main.scss
+++ b/src/assets/scss/modules/management/edit-main.scss
@@ -43,6 +43,8 @@
   display: flex;
   justify-content: flex-end;
   padding-right: 16px;
+  height: 50px;
+  align-items: center;
 }
 //取消按钮
 ::v-deep .el-button--default {
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index e0f733997..ee695991a 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -163,10 +163,16 @@ export default {
         this.dataForm.longitude = longitude
       }
       this.$nextTick(() => {
-        this.initMap(this.dataForm.latitude||latitude, this.dataForm.longitude||longitude);
+        const latitudeParam = this.dataForm.latitude !== undefined && this.dataForm.latitude != 0
+        ? this.dataForm.latitude
+        : latitude;
+        const longitudeParam = this.dataForm.longitude !== undefined && this.dataForm.longitude != 0
+        ? this.dataForm.longitude
+        : longitude;
+        this.initMap(latitudeParam, longitudeParam);
+
       })
     },
-
     async handleComfirm() {
       this.btnDisable = true
       setTimeout(() => {
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 2d511101a..b038502e5 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -991,4 +991,7 @@ export default {
   padding-left: 0px;
   padding-right: 0px;
 }
+::v-deep .el-dialog__body{
+  padding: 0; 
+ }
 </style>
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index da2f0835e..3d68a2f7f 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -1113,4 +1113,7 @@ export default {
   // flex: 1;
   width: calc(100% - 300px);
 }
+::v-deep .el-dialog__body{
+  padding: 0; 
+ }
 </style>
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index d8eee2ba3..63e963450 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -279,12 +279,12 @@ export default {
         this.dataForm.latitude = latitude
         this.dataForm.longitude = longitude
       }
-      if (!map) {
+      // if (!map) {
         this.initMap(this.dataForm.latitude, this.dataForm.longitude);
-      } else {
-        map.setCenter(this.dataForm.latitude, this.dataForm.longitude);
-        map.setMarker(this.dataForm.latitude, this.dataForm.longitude);
-      }
+      // } else {
+      //   map.setCenter(this.dataForm.latitude, this.dataForm.longitude);
+      //   map.setMarker(this.dataForm.latitude, this.dataForm.longitude);
+      // }
       await this.loadAgency()
       await this.loadGrid()
       await this.loadProperty()
@@ -294,7 +294,6 @@ export default {
     },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
     initMap (latitude, longitude) {
-
       map = new daiMap(
         document.getElementById("app_community"),
         { latitude, longitude },
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 5b798401a..2f7661ee0 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -1372,4 +1372,8 @@ export default {
 .el-message.is-closable .el-message__content {
 	line-height: 20px;
 }
+
+::v-deep .el-dialog__body{
+  padding: 0; 
+ }
 </style>
diff --git a/src/views/modules/base/community/roomDetail.vue b/src/views/modules/base/community/roomDetail.vue
index a6b8bcada..dac59ed75 100644
--- a/src/views/modules/base/community/roomDetail.vue
+++ b/src/views/modules/base/community/roomDetail.vue
@@ -42,11 +42,11 @@
           <div class="m-info-prop">
             <span class="u-info-title u-info-title-80">联系电话：</span>
             <span class="info-mingan">{{
-              dataForm.showOwnerPhone ? dataForm.showOwnerPhone : "--"
+              dataForm.ownerPhone ? dataForm.ownerPhone : "--"
             }}</span>
-            <img v-show="showFlagMobileBtn &&dataForm.showOwnerPhone"  src="../../../../assets/img/yanjing1.png" alt=""  style="margin-left: 10px">
+            <img v-show="showFlagMobileBtn &&dataForm.ownerPhone"  src="../../../../assets/img/yanjing1.png" alt=""  style="margin-left: 10px">
             <img v-show="!showFlagMobileBtn" src="../../../../assets/img/yanjing2.png" alt=""  style="margin-left: 10px">
-            <el-button v-if="view_real_data && dataForm.showOwnerPhone"
+            <el-button v-if="view_real_data && dataForm.ownerPhone"
                        type="text"
                        class="div-table-button--blue"
                        size="small"
@@ -55,11 +55,11 @@
           <div class="m-info-prop">
             <span class="u-info-title u-info-title-80">证件号：</span>
             <span class="info-mingan">{{
-              dataForm.showOwnerIdCard ? dataForm.showOwnerIdCard : "--"
+              dataForm.ownerIdCard ? dataForm.ownerIdCard : "--"
             }}</span>
-             <img v-show="showFlagIdCardBtn &&dataForm.showOwnerIdCard" src="../../../../assets/img/yanjing1.png" alt="" width="14px"  style="margin-left: 10px">
+             <img v-show="showFlagIdCardBtn &&dataForm.ownerIdCard" src="../../../../assets/img/yanjing1.png" alt="" width="14px"  style="margin-left: 10px">
                 <img v-show="!showFlagIdCardBtn" src="../../../../assets/img/yanjing2.png" alt="" width="14px"  style="margin-left: 10px">
-            <el-button v-if="view_real_data && dataForm.showOwnerIdCard"
+            <el-button v-if="view_real_data && dataForm.ownerIdCard"
                        type="text"
                        class="div-table-button--blue"
                        size="small"
@@ -161,23 +161,24 @@ export default {
     },
 
     async handleTuomin (type) {
-      const url = `/actual/base/communityHouse/getHouseInfoById/${this.houseId}`;
+      const url = `/actual/base/communityHouse/getClearHouseDeatilById/${this.houseId}`;
 
       const { data, code, msg } = await requestPost(url);
 
       if (code === 0) {
+        console.log(data);
         if (type === "phone") {
-          this.$set(this.dataForm, "showOwnerPhone", data.showOwnerPhone);
+          this.$set(this.dataForm, "ownerPhone", data.ownerPhone);
           this.showFlagMobileBtn = !this.showFlagMobileBtn
           if(this.showFlagMobileBtn){
-              this.$set(this.dataForm, 'showOwnerPhone', data.showOwnerPhone.substr(0,3) +'****'+ data.showOwnerPhone.substr(7,4) )
+              this.$set(this.dataForm, 'ownerPhone', data.ownerPhone.substr(0,3) +'****'+ data.ownerPhone.substr(7,4) )
             }
         }
         if (type === "idcard") {
-          this.$set(this.dataForm, "showOwnerIdCard", data.showOwnerIdCard);
+          this.$set(this.dataForm, "ownerIdCard", data.ownerIdCard);
           this.showFlagIdCardBtn = !this.showFlagIdCardBtn
           if(this.showFlagIdCardBtn){
-              this.$set(this.dataForm, 'showOwnerIdCard', data.showOwnerIdCard.substr(0,11) +'****'+ data.showOwnerIdCard.substr(16,2) )
+              this.$set(this.dataForm, 'ownerIdCard', data.ownerIdCard.substr(0,11) +'****'+ data.ownerIdCard.substr(16,2) )
             }
         }
       } else {
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 42ec69417..8791bdff9 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -1080,4 +1080,8 @@ export default {
   padding-left: 0px;
   padding-right: 0px;
 }
+
+::v-deep .el-dialog__body{
+  padding: 0; 
+ }
 </style>