From 07e1278567aa72d4f610abd500f75fe8cb56285a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sat, 11 Oct 2025 10:30:42 +0800
Subject: [PATCH] v1.9 admin账户中部分页面宽度等问题优化 更加协调

---
 src/api/user/menuApi.js                              |  40 +++++++++++++++++++++++++++++++++++-----
 src/components/community/CommunityUnitTree.vue       |   3 ++-
 src/components/community/editCommunityWechat.vue     |  70 ++++++++++++++++++----------------------------------------------------
 src/components/community/selectAdminCommunity.vue    |   4 ++--
 src/components/community/selectAdminOneCommunity.vue |  83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/components/fee/CommunityFeeTypeTree.vue          |   3 ++-
 src/components/fee/EditCommunityPayment.vue          |   4 ++--
 src/components/fee/communityFloorTree.vue            |   3 ++-
 src/components/fee/communityRoomTree.vue             |   3 ++-
 src/components/inspection/AInspectionTaskMap.vue     |  18 +++++++++---------
 src/components/inspection/AdminRouteTask.vue         |   2 +-
 src/components/org/DeleteOrg.vue                     |   2 +-
 src/components/staff/DeleteSystemUser.vue            |   2 +-
 src/components/staff/ResetSystemUserPwd.vue          |   2 +-
 src/components/work/CommunityRepairTree.vue          |   3 ++-
 src/i18n/commonLang.js                               |   2 ++
 src/views/aCommunity/adminCarDetailList.vue          |   2 +-
 src/views/aCommunity/adminOwnerDetail.vue            | 269 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------
 src/views/aCommunity/adminRoomDetail.vue             | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------
 src/views/community/communityWechatList.vue          |   2 +-
 src/views/complaint/adminComplaintDetailList.vue     |   1 +
 src/views/fee/adminPayFeeDetailList.vue              | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------
 src/views/fee/adminRoomFeeList.vue                   |   2 +-
 src/views/fee/communityPaymentList.vue               |   2 +-
 src/views/mall/housekeepingSjServList.vue            |   6 +++---
 src/views/mall/merchantManageList.vue                |   3 ++-
 src/views/mall/productSjList.vue                     |   5 ++---
 src/views/mall/userIntegralList.vue                  |   8 +++++---
 src/views/owner/adminOwnerList.vue                   |  17 +++++++++--------
 src/views/report/communityFeeSummaryList.vue         |   6 +++---
 src/views/report/operationalAnalysisList.vue         |   6 +++---
 src/views/role/roleList.vue                          |   2 +-
 src/views/staff/aStaffCommunityList.vue              |   2 +-
 src/views/staff/aStaffDetailList.vue                 |   2 +-
 src/views/user/userLoginList.vue                     |   3 ++-
 src/views/work/adminRepairList.vue                   |   2 +-
 36 files changed, 516 insertions(+), 432 deletions(-)
 create mode 100644 src/components/community/selectAdminOneCommunity.vue

diff --git a/src/api/user/menuApi.js b/src/api/user/menuApi.js
index 5ea0ff1..625419b 100644
--- a/src/api/user/menuApi.js
+++ b/src/api/user/menuApi.js
@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 import { getCommunityId } from "@/utils/vc"
+import { Message } from 'element-ui'
 export function _getMenuCatalog() {
   return new Promise((resolve, reject) => {
     request({
@@ -137,14 +138,24 @@ export function jumpToMall(url) {
       }
     }).then(response => {
       const res = response.data
-      if (res.code === 0) {
+      if (res.code == 0) {
         let _url = res.data.url;
         window.open(_url);
         resolve(res)
       } else {
-        reject(new Error(res.msg || '获取项目列表失败'))
+        Message({
+          message: res.msg,
+          type: 'error',
+          duration: 5 * 1000
+        })
+        reject(new Error(res.msg || '跳转失败'))
       }
     }).catch(error => {
+      Message({
+        message: error,
+        type: 'error',
+        duration: 5 * 1000
+      })
       reject(error)
     })
   })
@@ -161,14 +172,24 @@ export function jumpToIot(url) {
       }
     }).then(response => {
       const res = response.data
-      if (res.code === 0) {
+      if (res.code == 0) {
         let _url = res.data.url;
         window.open(_url);
         resolve(res)
       } else {
-        reject(new Error(res.msg || '获取项目列表失败'))
+        Message({
+          message: res.msg,
+          type: 'error',
+          duration: 5 * 1000
+        })
+        reject(new Error(res.msg || '跳转失败'))
       }
     }).catch(error => {
+      Message({
+        message: error,
+        type: 'error',
+        duration: 5 * 1000
+      })
       reject(error)
     })
   })
@@ -188,13 +209,22 @@ export function jumpToPlugin(url) {
       //发送get请求
       const res = response.data
       if (res.code != 0) {
-        this.$message.warning(res.msg);
+        Message({
+          message: res.msg,
+          type: 'error',
+          duration: 5 * 1000
+        })
         return;
       }
       let _url = res.data.url;
       window.open(_url);
       resolve(res)
     }).catch(error => {
+      Message({
+        message: error,
+        type: 'error',
+        duration: 5 * 1000
+      })
       reject(error)
     })
   })
diff --git a/src/components/community/CommunityUnitTree.vue b/src/components/community/CommunityUnitTree.vue
index d894832..f25b626 100644
--- a/src/components/community/CommunityUnitTree.vue
+++ b/src/components/community/CommunityUnitTree.vue
@@ -84,6 +84,7 @@ export default {
 
 <style scoped>
 .tree-card {
-  height: 100%;
+  max-height: 80vh;
+  overflow-y: auto;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/community/editCommunityWechat.vue b/src/components/community/editCommunityWechat.vue
index 72cfa9f..5148775 100644
--- a/src/components/community/editCommunityWechat.vue
+++ b/src/components/community/editCommunityWechat.vue
@@ -1,59 +1,25 @@
 <template>
-  <el-dialog 
-    :title="$t('editCommunityWechat.title')" 
-    :visible.sync="visible" 
-    width="50%"
-    @close="handleClose"
-  >
-    <el-form 
-      ref="form" 
-      :model="form" 
-      :rules="rules" 
-      label-width="120px"
-      label-position="right"
-    >
-      <el-form-item 
-        :label="$t('editCommunityWechat.name')" 
-        prop="name"
-      >
-        <el-input 
-          v-model="form.name" 
-          :placeholder="$t('editCommunityWechat.placeholder.name')"
-        />
+  <el-dialog :title="$t('common.update')" :visible.sync="visible" width="50%" @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="right">
+      <el-form-item :label="$t('editCommunityWechat.name')" prop="name">
+        <el-input v-model="form.name" :placeholder="$t('editCommunityWechat.placeholder.name')" />
       </el-form-item>
-      
+
       <el-form-item label="APPID" prop="appId">
-        <el-input 
-          v-model="form.appId" 
-          :placeholder="$t('editCommunityWechat.placeholder.appId')"
-        />
+        <el-input v-model="form.appId" :placeholder="$t('editCommunityWechat.placeholder.appId')" />
       </el-form-item>
-      
-      <el-form-item 
-        :label="$t('editCommunityWechat.appSecret')" 
-        prop="appSecret"
-      >
-        <el-input 
-          v-model="form.appSecret" 
-          type="password"
-          show-password
-          :placeholder="$t('editCommunityWechat.placeholder.appSecret')"
-        />
+
+      <el-form-item :label="$t('editCommunityWechat.appSecret')" prop="appSecret">
+        <el-input v-model="form.appSecret" type="password" show-password
+          :placeholder="$t('editCommunityWechat.placeholder.appSecret')" />
       </el-form-item>
-      
-      <el-form-item 
-        :label="$t('editCommunityWechat.description')" 
-        prop="remarks"
-      >
-        <el-input 
-          v-model="form.remarks" 
-          type="textarea"
-          :placeholder="$t('editCommunityWechat.placeholder.remarks')"
-          :rows="3"
-        />
+
+      <el-form-item :label="$t('editCommunityWechat.description')" prop="remarks">
+        <el-input v-model="form.remarks" type="textarea" :placeholder="$t('editCommunityWechat.placeholder.remarks')"
+          :rows="3" />
       </el-form-item>
     </el-form>
-    
+
     <div slot="footer" class="dialog-footer">
       <el-button @click="visible = false">
         {{ $t('communityWechat.cancel') }}
@@ -133,8 +99,8 @@ export default {
         if (valid) {
           try {
             const res = await updateAdminSmallWeChat(this.form)
-            if (res.code === 0) {
-              this.$message.success(this.$t('communityWechat.editSuccess'))
+            if (res.code == 0) {
+              this.$message.success(res.msg)
               this.visible = false
               this.$emit('success')
             } else {
@@ -142,7 +108,7 @@ export default {
             }
           } catch (error) {
             console.error('更新公众号失败:', error)
-            this.$message.error(this.$t('communityWechat.editFailed'))
+            this.$message.error(error)
           }
         }
       })
diff --git a/src/components/community/selectAdminCommunity.vue b/src/components/community/selectAdminCommunity.vue
index b1af7a7..c8dd48a 100644
--- a/src/components/community/selectAdminCommunity.vue
+++ b/src/components/community/selectAdminCommunity.vue
@@ -52,8 +52,8 @@ export default {
 
 <style lang="scss" scoped>
 .community-selector {
-  height: 100%;
-  
+  max-height: 80vh;
+  overflow-y: auto;
   .community-list {
     list-style: none;
     padding: 0;
diff --git a/src/components/community/selectAdminOneCommunity.vue b/src/components/community/selectAdminOneCommunity.vue
new file mode 100644
index 0000000..d86eaec
--- /dev/null
+++ b/src/components/community/selectAdminOneCommunity.vue
@@ -0,0 +1,83 @@
+<template>
+  <el-card class="community-selector">
+    <div class="treeview attendance-staff">
+      <ul class="community-list">
+        <li 
+          v-for="(item, index) in communityList" 
+          :key="index" 
+          @click="selectCommunity(item)"
+          :class="{'selected': selectedCommunityId === item.communityId}">
+          {{ item.name }}
+        </li>
+      </ul>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import { listAdminCommunitys } from '@/api/owner/adminOwnerApi'
+
+export default {
+  name: 'SelectAdminOneCommunity',
+  data() {
+    return {
+      communityList: [],
+      selectedCommunityId: ''
+    }
+  },
+  created() {
+    this.loadCommunities()
+  },
+  methods: {
+    loadCommunities() {
+      const params = {
+        page: 1,
+        row: 100
+      }
+      
+      listAdminCommunitys(params).then(res => {
+        this.communityList = res.data
+        if(this.communityList.length > 0) {
+          this.selectCommunity(this.communityList[0])
+        }
+      }).catch(error => {
+        console.log(error)
+        this.$message.error(this.$t('adminOwner.fetchCommunityError'))
+      })
+    },
+    selectCommunity(community) {
+      this.selectedCommunityId = community.communityId
+      this.$emit('changeCommunity', community)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.community-selector {
+  max-height: 80vh;
+  overflow-y: auto;
+  .community-list {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+    
+    li {
+      padding: 10px;
+      cursor: pointer;
+      transition: all 0.3s;
+      color: #606060;
+      font-size: 14px;
+      
+      &:hover {
+        background-color: #f5f7fa;
+      }
+      
+      &.selected {
+        background-color: #409EFF;
+        color: white;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/fee/CommunityFeeTypeTree.vue b/src/components/fee/CommunityFeeTypeTree.vue
index 934104a..a6734eb 100644
--- a/src/components/fee/CommunityFeeTypeTree.vue
+++ b/src/components/fee/CommunityFeeTypeTree.vue
@@ -64,6 +64,7 @@ export default {
 
 <style scoped>
 .tree-card {
-  height: 100%;
+  max-height: 80vh;
+  overflow-y: auto;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/fee/EditCommunityPayment.vue b/src/components/fee/EditCommunityPayment.vue
index 063154a..c0577a0 100644
--- a/src/components/fee/EditCommunityPayment.vue
+++ b/src/components/fee/EditCommunityPayment.vue
@@ -185,11 +185,11 @@ export default {
             paymentKeys: this.paymentKeys
           }
           await updateAdminPaymentPool(payload)
-          this.$message.success(this.$t('common.updateSuccess'))
+          this.$message.success(this.$t('common.operationSuccess'))
           this.visible = false
           this.$emit('success')
         } catch (error) {
-          this.$message.error(error.message || this.$t('common.updateFailed'))
+          this.$message.error(error || this.$t('common.updateFailed'))
         }
       })
     }
diff --git a/src/components/fee/communityFloorTree.vue b/src/components/fee/communityFloorTree.vue
index f3dd11b..0b26d2f 100644
--- a/src/components/fee/communityFloorTree.vue
+++ b/src/components/fee/communityFloorTree.vue
@@ -61,6 +61,7 @@ export default {
 
 <style scoped>
 .tree-card {
-  height: 100%;
+  max-height: 80vh;
+  overflow-y: auto;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/fee/communityRoomTree.vue b/src/components/fee/communityRoomTree.vue
index 696f5bf..3510bed 100644
--- a/src/components/fee/communityRoomTree.vue
+++ b/src/components/fee/communityRoomTree.vue
@@ -114,6 +114,7 @@ export default {
 
 <style scoped>
 .tree-card {
-  height: 100%;
+  max-height: 80vh;
+  overflow-y: auto;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/inspection/AInspectionTaskMap.vue b/src/components/inspection/AInspectionTaskMap.vue
index 7cee16d..c1e533c 100644
--- a/src/components/inspection/AInspectionTaskMap.vue
+++ b/src/components/inspection/AInspectionTaskMap.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import { queryAdminInspectionTaskDetail } from '@/api/inspection/aInspectionPlanDetailApi'
+import { queryAdminInspectionTaskDetail } from '@/api/inspection/adminInspectionTaskDetailApi'
 
 export default {
   name: 'AInspectionTaskMap',
@@ -28,11 +28,11 @@ export default {
         this.points = data
         this.initMapView()
       } catch (error) {
-        this.$message.error(this.$t('common.fetchError'))
+        console.error(error)
+        this.$message.error(error)
       }
     },
     initMapView() {
-     let TMap = {}
       if (!this.points || this.points.length === 0) return
 
       // 这里需要根据实际地图API实现地图初始化
@@ -41,31 +41,31 @@ export default {
       
       // 示例：使用腾讯地图API
       if (window.TMap) {
-        const center = new TMap.LatLng(this.points[0].lat, this.points[0].lng)
-        this.map = new TMap.Map(document.getElementById('aInspectionTaskMap'), {
+        const center = new window.TMap.LatLng(this.points[0].lat, this.points[0].lng)
+        this.map = new window.TMap.Map(document.getElementById('aInspectionTaskMap'), {
           center: center,
           zoom: 17
         })
         
         // 添加标记点
         const markers = this.points.map(point => ({
-          position: new TMap.LatLng(point.lat, point.lng),
+          position: new window.TMap.LatLng(point.lat, point.lng),
           properties: {
             title: point.inspectionName,
             status: point.state
           }
         }))
         
-        new TMap.MultiMarker({
+        new window.TMap.MultiMarker({
           map: this.map,
           styles: {
-            normal: new TMap.MarkerStyle({
+            normal: new window.TMap.MarkerStyle({
               width: 25,
               height: 35,
               src: '/img/inspection.png',
               anchor: { x: 16, y: 32 }
             }),
-            done: new TMap.MarkerStyle({
+            done: new window.TMap.MarkerStyle({
               width: 25,
               height: 35,
               src: '/img/inspection_done.png',
diff --git a/src/components/inspection/AdminRouteTask.vue b/src/components/inspection/AdminRouteTask.vue
index b4ec05e..68a7af1 100644
--- a/src/components/inspection/AdminRouteTask.vue
+++ b/src/components/inspection/AdminRouteTask.vue
@@ -57,7 +57,7 @@ export default {
           this.switchTask(this.tasks[0])
         }
       } catch (error) {
-        this.$message.error(this.$t('common.fetchError'))
+        this.$message.error(error)
       } finally {
         this.loading = false
       }
diff --git a/src/components/org/DeleteOrg.vue b/src/components/org/DeleteOrg.vue
index 140733c..07c6c6b 100644
--- a/src/components/org/DeleteOrg.vue
+++ b/src/components/org/DeleteOrg.vue
@@ -33,7 +33,7 @@
           orgId: this.currentOrg.id
         }).then(response => {
             console.log(response)
-          this.$message.success(this.$t('org.deleteSuccess'))
+          this.$message.success(response.msg)
           this.visible = false
           this.$emit('refresh')
         },error => {
diff --git a/src/components/staff/DeleteSystemUser.vue b/src/components/staff/DeleteSystemUser.vue
index 543c459..b45a3a3 100644
--- a/src/components/staff/DeleteSystemUser.vue
+++ b/src/components/staff/DeleteSystemUser.vue
@@ -40,7 +40,7 @@ export default {
         this.$emit('success')
         this.handleClose()
       } catch (error) {
-        this.$message.error(this.$t('systemUser.delete.error'))
+        this.$message.error(error)
       }
     }
   }
diff --git a/src/components/staff/ResetSystemUserPwd.vue b/src/components/staff/ResetSystemUserPwd.vue
index 41421cb..86ee02b 100644
--- a/src/components/staff/ResetSystemUserPwd.vue
+++ b/src/components/staff/ResetSystemUserPwd.vue
@@ -43,7 +43,7 @@ export default {
         this.$emit('success')
         this.handleClose()
       } catch (error) {
-        this.$message.error(this.$t('systemUser.resetPwd.error'))
+        this.$message.error(error)
       }
     }
   }
diff --git a/src/components/work/CommunityRepairTree.vue b/src/components/work/CommunityRepairTree.vue
index c892c5e..f84334c 100644
--- a/src/components/work/CommunityRepairTree.vue
+++ b/src/components/work/CommunityRepairTree.vue
@@ -63,6 +63,7 @@ export default {
 
 <style lang="scss" scoped>
 .tree-card {
-  height: 100%;
+  max-height: 80vh;
+  overflow-y: auto;
 }
 </style>
\ No newline at end of file
diff --git a/src/i18n/commonLang.js b/src/i18n/commonLang.js
index 73b9b71..99e2480 100644
--- a/src/i18n/commonLang.js
+++ b/src/i18n/commonLang.js
@@ -72,6 +72,7 @@ export const messages = {
         required:'Required',
         invalid:'Invalid',
         explanation:'Explanation',
+        manage:'Manage'
       }
     },
     zh: {
@@ -147,6 +148,7 @@ export const messages = {
         required:'必填',
         invalid:'无效',
         explanation:'说明',
+        manage:'管理'
       }
     }
   } 
\ No newline at end of file
diff --git a/src/views/aCommunity/adminCarDetailList.vue b/src/views/aCommunity/adminCarDetailList.vue
index fd5be98..88dccce 100644
--- a/src/views/aCommunity/adminCarDetailList.vue
+++ b/src/views/aCommunity/adminCarDetailList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="admin-car-detail">
+  <div class="admin-car-detail padding">
     <div class="white-bg padding-left padding-right padding-top border-radius-top">
       <div class="flex justify-between">
         <div class="text-title">
diff --git a/src/views/aCommunity/adminOwnerDetail.vue b/src/views/aCommunity/adminOwnerDetail.vue
index 919a19f..850e5eb 100644
--- a/src/views/aCommunity/adminOwnerDetail.vue
+++ b/src/views/aCommunity/adminOwnerDetail.vue
@@ -1,152 +1,155 @@
 <template>
-  <div class="white-bg padding-lg padding-top border-radius">
-    <div class="flex justify-between">
-      <div class="text-title">{{ $t('adminOwnerDetail.ownerInfo') }}</div>
-      <div>
-        <el-button type="primary" size="small" style="margin-left:10px" @click="goBack">
-          <i class="el-icon-close"></i>{{ $t('common.back') }}
-        </el-button>
+  <div class="padding">
+    <div class="white-bg padding border-radius">
+      <div class="flex justify-between">
+        <div class="text-title">{{ $t('adminOwnerDetail.ownerInfo') }}</div>
+        <div>
+          <el-button type="primary" size="small" style="margin-left:10px" @click="goBack">
+            <i class="el-icon-close"></i>{{ $t('common.back') }}
+          </el-button>
+        </div>
       </div>
-    </div>
 
-    <div class="flex justify-start margin-top">
-      <div class="text-center vc-float-left" style="width: 150px;" v-if="adminOwnerDetailInfo.faceUrl">
-        <img width="120px" height="140px" class="border-radius" :src="adminOwnerDetailInfo.faceUrl"
-          @error="errorLoadImg" />
-      </div>
-      <div class="text-center vc-float-left" style="width: 150px;" v-else>
-        <img width="120px" height="140px" class="border-radius" src="/img/noPhoto.jpg" />
-      </div>
+      <div class="flex justify-start margin-top">
+        <div class="text-center vc-float-left" style="width: 150px;" v-if="adminOwnerDetailInfo.faceUrl">
+          <img width="120px" height="140px" class="border-radius" :src="adminOwnerDetailInfo.faceUrl"
+            @error="errorLoadImg" />
+        </div>
+        <div class="text-center vc-float-left" style="width: 150px;" v-else>
+          <img width="120px" height="140px" class="border-radius" src="/img/noPhoto.jpg" />
+        </div>
 
-      <el-row style="min-height: 160px;width: 100%;" class="text-left margin-left">
-        <el-col :span="24">
-          <el-row>
-            <el-col :span="6">
-              <div class="form-group">
-                <label class="col-form-label">{{ $t('adminOwnerDetail.name') }}：</label>
-                <label>{{ adminOwnerDetailInfo.name }}</label>
-              </div>
-            </el-col>
-            <el-col :span="6" v-if="adminOwnerDetailInfo.personType == 'P'">
-              <div class="form-group">
-                <label class="col-form-label">{{ $t('adminOwnerDetail.sex') }}：</label>
-                <label>{{ adminOwnerDetailInfo.sex == '0' ? $t('common.male') : (adminOwnerDetailInfo.sex == '1' ?
-                  $t('common.female') : '') }}</label>
-              </div>
-            </el-col>
-            <el-col :span="6">
-              <div class="form-group">
-                <label class="col-form-label">{{ $t('adminOwnerDetail.communityName') }}：</label>
-                <label>{{ adminOwnerDetailInfo.communityName }}</label>
-              </div>
-            </el-col>
-            <el-col :span="6">
-              <div class="form-group">
-                <label class="col-form-label">{{ $t('adminOwnerDetail.personType') }}：</label>
-                <label>{{ adminOwnerDetailInfo.personTypeName }}</label>
-              </div>
-            </el-col>
-            <el-col :span="6">
-              <div class="form-group">
-                <label class="col-form-label">{{ $t('adminOwnerDetail.personRole') }}：</label>
-                <label>{{ adminOwnerDetailInfo.personRoleName }}</label>
-              </div>
-            </el-col>
-            <el-col :span="6">
-              <div class="form-group">
-                <label class="col-form-label">{{ $t('adminOwnerDetail.idCard') }}：</label>
-                <label>{{ adminOwnerDetailInfo.idCard }}</label>
-              </div>
-            </el-col>
-            <el-col :span="6">
-              <div class="form-group">
-                <label class="col-form-label">{{ $t('adminOwnerDetail.contact') }}：</label>
-                <label>{{ adminOwnerDetailInfo.link }}</label>
-              </div>
-            </el-col>
-            <el-col :span="6">
-              <div class="form-group">
-                <label class="col-form-label">{{ $t('adminOwnerDetail.backupPhone') }}：</label>
-                <label>{{ adminOwnerDetailInfo.concactLink }}</label>
-              </div>
-            </el-col>
-            <el-col :span="6" v-if="adminOwnerDetailInfo.personType == 'C'">
-              <div class="form-group">
-                <label class="col-form-label">{{ $t('adminOwnerDetail.contactPerson') }}：</label>
-                <label>{{ adminOwnerDetailInfo.concactPerson }}</label>
-              </div>
-            </el-col>
-            <el-col :span="6">
-              <div class="form-group">
-                <label class="col-form-label">{{ $t('adminOwnerDetail.creator') }}：</label>
-                <label>{{ adminOwnerDetailInfo.userName }}</label>
-              </div>
-            </el-col>
-            <el-col :span="12">
-              <div class="form-group">
-                <label class="col-form-label">{{ $t('adminOwnerDetail.remark') }}：</label>
-                <label>{{ adminOwnerDetailInfo.remark }}</label>
-              </div>
-            </el-col>
-          </el-row>
-
-          <div v-for="(item, index) in adminOwnerDetailInfo.ownerAttrDtos" :key="index">
-            <el-row v-if="index % 4 == 0">
+        <el-row style="min-height: 160px;width: 100%;" class="text-left margin-left">
+          <el-col :span="24">
+            <el-row>
+              <el-col :span="6">
+                <div class="form-group">
+                  <label class="col-form-label">{{ $t('adminOwnerDetail.name') }}：</label>
+                  <label>{{ adminOwnerDetailInfo.name }}</label>
+                </div>
+              </el-col>
+              <el-col :span="6" v-if="adminOwnerDetailInfo.personType == 'P'">
+                <div class="form-group">
+                  <label class="col-form-label">{{ $t('adminOwnerDetail.sex') }}：</label>
+                  <label>{{ adminOwnerDetailInfo.sex == '0' ? $t('common.male') : (adminOwnerDetailInfo.sex == '1' ?
+                    $t('common.female') : '') }}</label>
+                </div>
+              </el-col>
+              <el-col :span="6">
+                <div class="form-group">
+                  <label class="col-form-label">{{ $t('adminOwnerDetail.communityName') }}：</label>
+                  <label>{{ adminOwnerDetailInfo.communityName }}</label>
+                </div>
+              </el-col>
+              <el-col :span="6">
+                <div class="form-group">
+                  <label class="col-form-label">{{ $t('adminOwnerDetail.personType') }}：</label>
+                  <label>{{ adminOwnerDetailInfo.personTypeName }}</label>
+                </div>
+              </el-col>
               <el-col :span="6">
                 <div class="form-group">
-                  <label class="col-form-label">{{ item.specName }}：</label>
-                  <label>{{ item.valueName }}</label>
+                  <label class="col-form-label">{{ $t('adminOwnerDetail.personRole') }}：</label>
+                  <label>{{ adminOwnerDetailInfo.personRoleName }}</label>
                 </div>
               </el-col>
-              <el-col :span="6" v-if="index < adminOwnerDetailInfo.ownerAttrDtos.length - 1">
+              <el-col :span="6">
+                <div class="form-group">
+                  <label class="col-form-label">{{ $t('adminOwnerDetail.idCard') }}：</label>
+                  <label>{{ adminOwnerDetailInfo.idCard }}</label>
+                </div>
+              </el-col>
+              <el-col :span="6">
                 <div class="form-group">
-                  <label class="col-form-label">{{ adminOwnerDetailInfo.ownerAttrDtos[index + 1].specName }}：</label>
-                  <label>{{ adminOwnerDetailInfo.ownerAttrDtos[index + 1].valueName }}</label>
+                  <label class="col-form-label">{{ $t('adminOwnerDetail.contact') }}：</label>
+                  <label>{{ adminOwnerDetailInfo.link }}</label>
                 </div>
               </el-col>
-              <el-col :span="6" v-if="index < adminOwnerDetailInfo.ownerAttrDtos.length - 2">
+              <el-col :span="6">
                 <div class="form-group">
-                  <label class="col-form-label">{{ adminOwnerDetailInfo.ownerAttrDtos[index + 2].specName }}：</label>
-                  <label>{{ adminOwnerDetailInfo.ownerAttrDtos[index + 2].valueName }}</label>
+                  <label class="col-form-label">{{ $t('adminOwnerDetail.backupPhone') }}：</label>
+                  <label>{{ adminOwnerDetailInfo.concactLink }}</label>
                 </div>
               </el-col>
-              <el-col :span="6" v-if="index < adminOwnerDetailInfo.ownerAttrDtos.length - 3">
+              <el-col :span="6" v-if="adminOwnerDetailInfo.personType == 'C'">
+                <div class="form-group">
+                  <label class="col-form-label">{{ $t('adminOwnerDetail.contactPerson') }}：</label>
+                  <label>{{ adminOwnerDetailInfo.concactPerson }}</label>
+                </div>
+              </el-col>
+              <el-col :span="6">
                 <div class="form-group">
-                  <label class="col-form-label">{{ adminOwnerDetailInfo.ownerAttrDtos[index + 3].specName }}：</label>
-                  <label>{{ adminOwnerDetailInfo.ownerAttrDtos[index + 3].valueName }}</label>
+                  <label class="col-form-label">{{ $t('adminOwnerDetail.creator') }}：</label>
+                  <label>{{ adminOwnerDetailInfo.userName }}</label>
+                </div>
+              </el-col>
+              <el-col :span="12">
+                <div class="form-group">
+                  <label class="col-form-label">{{ $t('adminOwnerDetail.remark') }}：</label>
+                  <label>{{ adminOwnerDetailInfo.remark }}</label>
                 </div>
               </el-col>
             </el-row>
-          </div>
-        </el-col>
-      </el-row>
-    </div>
 
-    <Divider />
+            <div v-for="(item, index) in adminOwnerDetailInfo.ownerAttrDtos" :key="index">
+              <el-row v-if="index % 4 == 0">
+                <el-col :span="6">
+                  <div class="form-group">
+                    <label class="col-form-label">{{ item.specName }}：</label>
+                    <label>{{ item.valueName }}</label>
+                  </div>
+                </el-col>
+                <el-col :span="6" v-if="index < adminOwnerDetailInfo.ownerAttrDtos.length - 1">
+                  <div class="form-group">
+                    <label class="col-form-label">{{ adminOwnerDetailInfo.ownerAttrDtos[index + 1].specName }}：</label>
+                    <label>{{ adminOwnerDetailInfo.ownerAttrDtos[index + 1].valueName }}</label>
+                  </div>
+                </el-col>
+                <el-col :span="6" v-if="index < adminOwnerDetailInfo.ownerAttrDtos.length - 2">
+                  <div class="form-group">
+                    <label class="col-form-label">{{ adminOwnerDetailInfo.ownerAttrDtos[index + 2].specName }}：</label>
+                    <label>{{ adminOwnerDetailInfo.ownerAttrDtos[index + 2].valueName }}</label>
+                  </div>
+                </el-col>
+                <el-col :span="6" v-if="index < adminOwnerDetailInfo.ownerAttrDtos.length - 3">
+                  <div class="form-group">
+                    <label class="col-form-label">{{ adminOwnerDetailInfo.ownerAttrDtos[index + 3].specName }}：</label>
+                    <label>{{ adminOwnerDetailInfo.ownerAttrDtos[index + 3].valueName }}</label>
+                  </div>
+                </el-col>
+              </el-row>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
 
-    <div class="margin-top-sm">
-      <el-tabs v-model="adminOwnerDetailInfo._currentTab" @tab-click="handleTabClick(adminOwnerDetailInfo._currentTab)">
-        <el-tab-pane :label="$t('adminOwnerDetail.house')" name="aRoomDetailRoom"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.car')" name="aRoomDetailCar"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.contract')" name="aRoomDetailContract"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.member')" name="aRoomDetailMember"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.modifyRecord')" name="aOwnerDetailHis"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.houseFee')" name="aOwnerDetailRoomFee"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.paymentHistory')" name="aRoomDetailHisFee"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.account')" name="aOwnerDetailAccount"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.coupon')" name="aOwnerDetailCoupon"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.ownerBinding')" name="aOwnerDetailAppUser"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.complaint')" name="aRoomDetailComplaint"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.repair')" name="aRoomDetailRepair"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.visitor')" name="aOwnerDetailVisit"
-          v-if="adminOwnerDetailInfo.link"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.paymentReceipt')" name="aRoomDetailReceipt"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.depositReceipt')" name="aOwnerDetailAcctReceipt"></el-tab-pane>
-        <el-tab-pane :label="$t('adminOwnerDetail.faceSync')" name="aOwnerDetailAccessControl"></el-tab-pane>
-      </el-tabs>
-    </div>
+      <Divider />
+
+      <div class="margin-top-sm">
+        <el-tabs v-model="adminOwnerDetailInfo._currentTab"
+          @tab-click="handleTabClick(adminOwnerDetailInfo._currentTab)">
+          <el-tab-pane :label="$t('adminOwnerDetail.house')" name="aRoomDetailRoom"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.car')" name="aRoomDetailCar"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.contract')" name="aRoomDetailContract"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.member')" name="aRoomDetailMember"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.modifyRecord')" name="aOwnerDetailHis"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.houseFee')" name="aOwnerDetailRoomFee"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.paymentHistory')" name="aRoomDetailHisFee"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.account')" name="aOwnerDetailAccount"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.coupon')" name="aOwnerDetailCoupon"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.ownerBinding')" name="aOwnerDetailAppUser"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.complaint')" name="aRoomDetailComplaint"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.repair')" name="aRoomDetailRepair"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.visitor')" name="aOwnerDetailVisit"
+            v-if="adminOwnerDetailInfo.link"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.paymentReceipt')" name="aRoomDetailReceipt"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.depositReceipt')" name="aOwnerDetailAcctReceipt"></el-tab-pane>
+          <el-tab-pane :label="$t('adminOwnerDetail.faceSync')" name="aOwnerDetailAccessControl"></el-tab-pane>
+        </el-tabs>
+      </div>
 
-    <component :is="adminOwnerDetailInfo._currentTab" :ref="adminOwnerDetailInfo._currentTab"></component>
+      <component :is="adminOwnerDetailInfo._currentTab" :ref="adminOwnerDetailInfo._currentTab"></component>
+    </div>
   </div>
 </template>
 
@@ -265,11 +268,11 @@ export default {
       this.adminOwnerDetailInfo._currentTab = tab
       setTimeout(() => {
         if (this.$refs[tab] && this.$refs[tab].open) {
-            this.$refs[tab].open({
-              ownerId: this.adminOwnerDetailInfo.ownerId,
-              ownerName: this.adminOwnerDetailInfo.name,
-              link: this.adminOwnerDetailInfo.link,
-            })
+          this.$refs[tab].open({
+            ownerId: this.adminOwnerDetailInfo.ownerId,
+            ownerName: this.adminOwnerDetailInfo.name,
+            link: this.adminOwnerDetailInfo.link,
+          })
         }
       }, 500)
     },
diff --git a/src/views/aCommunity/adminRoomDetail.vue b/src/views/aCommunity/adminRoomDetail.vue
index 09b894e..4b0ccb9 100644
--- a/src/views/aCommunity/adminRoomDetail.vue
+++ b/src/views/aCommunity/adminRoomDetail.vue
@@ -1,126 +1,132 @@
 <template>
-  <div class="white-bg padding-lg padding-top border-radius">
-    <div class="flex justify-between">
-      <div class="text-title">{{ $t('adminRoomDetail.title') }}</div>
-      <div>
-        <el-button type="primary" size="small" style="margin-left:10px" @click="goBack">
-          <i class="el-icon-close"></i>{{ $t('adminRoomDetail.back') }}
-        </el-button>
+  <div class="padding">
+    <div class="white-bg padding-lg padding-top border-radius">
+      <div class="flex justify-between">
+        <div class="text-title">{{ $t('adminRoomDetail.title') }}</div>
+        <div>
+          <el-button type="primary" size="small" style="margin-left:10px" @click="goBack">
+            <i class="el-icon-close"></i>{{ $t('adminRoomDetail.back') }}
+          </el-button>
+        </div>
       </div>
-    </div>
 
-    <!-- 房屋信息 -->
-    <div class="margin-top">
-      <el-row style="min-height: 160px;">
-        <el-col :span="24">
-          <el-form class="text-left">
-            <el-row>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminRoomDetailInfo.roomCode')">
-                  <label>{{ adminRoomDetailInfo.floorNum }}-{{ adminRoomDetailInfo.unitNum }}-{{
-                    adminRoomDetailInfo.roomNum }}</label>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminRoomDetailInfo.floor')">
-                  <label>{{ adminRoomDetailInfo.layer }}</label>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminRoomDetailInfo.roomArea')">
-                  <label>{{ adminRoomDetailInfo.builtUpArea }}</label>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminRoomDetailInfo.roomType')">
-                  <label>{{ adminRoomDetailInfo.roomSubTypeName }}</label>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminRoomDetailInfo.roomStatus')">
-                  <label>{{ adminRoomDetailInfo.stateName }}</label>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminRoomDetailInfo.indoorArea')">
-                  <label>{{ adminRoomDetailInfo.roomArea }}</label>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminRoomDetailInfo.rent')">
-                  <label>{{ adminRoomDetailInfo.roomRent }}</label>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminRoomDetailInfo.validity')">
-                  <label>{{ adminRoomDetailInfo.startTime }}~{{ adminRoomDetailInfo.endTime }}</label>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminRoomDetailInfo.ownerName')">
-                  <label>{{ adminRoomDetailInfo.ownerName }}</label>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminRoomDetailInfo.contact')">
-                  <label>{{ adminRoomDetailInfo.link }}</label>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item :label="$t('adminRoomDetailInfo.remark')">
-                  <label>{{ adminRoomDetailInfo.remark }}</label>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminRoomDetailInfo.communityName')">
-                  <label>{{ adminRoomDetailInfo.communityName }}</label>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-col>
-      </el-row>
-    </div>
+      <!-- 房屋信息 -->
+      <div class="margin-top">
+        <el-row style="min-height: 160px;">
+          <el-col :span="24">
+            <el-form class="text-left">
+              <el-row>
+                <el-col :span="6">
+                  <el-form-item :label="$t('adminRoomDetailInfo.roomCode')">
+                    <label>{{ adminRoomDetailInfo.floorNum }}-{{ adminRoomDetailInfo.unitNum }}-{{
+                      adminRoomDetailInfo.roomNum }}</label>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item :label="$t('adminRoomDetailInfo.floor')">
+                    <label>{{ adminRoomDetailInfo.layer }}</label>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item :label="$t('adminRoomDetailInfo.roomArea')">
+                    <label>{{ adminRoomDetailInfo.builtUpArea }}</label>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item :label="$t('adminRoomDetailInfo.roomType')">
+                    <label>{{ adminRoomDetailInfo.roomSubTypeName }}</label>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item :label="$t('adminRoomDetailInfo.roomStatus')">
+                    <label>{{ adminRoomDetailInfo.stateName }}</label>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item :label="$t('adminRoomDetailInfo.indoorArea')">
+                    <label>{{ adminRoomDetailInfo.roomArea }}</label>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item :label="$t('adminRoomDetailInfo.rent')">
+                    <label>{{ adminRoomDetailInfo.roomRent }}</label>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item :label="$t('adminRoomDetailInfo.validity')">
+                    <label>{{ adminRoomDetailInfo.startTime }}~{{ adminRoomDetailInfo.endTime }}</label>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item :label="$t('adminRoomDetailInfo.ownerName')">
+                    <label>{{ adminRoomDetailInfo.ownerName }}</label>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item :label="$t('adminRoomDetailInfo.contact')">
+                    <label>{{ adminRoomDetailInfo.link }}</label>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item :label="$t('adminRoomDetailInfo.remark')">
+                    <label>{{ adminRoomDetailInfo.remark }}</label>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item :label="$t('adminRoomDetailInfo.communityName')">
+                    <label>{{ adminRoomDetailInfo.communityName }}</label>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </el-col>
+        </el-row>
+      </div>
 
-    <divider></divider>
+      <divider></divider>
 
-    <div class="margin-top-sm">
-      <el-tabs v-model="adminRoomDetailInfo._currentTab" @tab-click="handleTabClick(adminRoomDetailInfo._currentTab)">
-        <el-tab-pane :label="$t('adminRoomDetail.owner')" name="aRoomDetailOwner"></el-tab-pane>
-        <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.member')" name="aRoomDetailMember">
-        </el-tab-pane>
-        <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.ownerRoom')" name="aRoomDetailRoom">
-        </el-tab-pane>
-        <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.ownerCar')" name="aRoomDetailCar">
-        </el-tab-pane>
-        <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.contract')"
-          name="aRoomDetailContract">
-        </el-tab-pane>
-        <el-tab-pane :label="$t('adminRoomDetail.roomFee')" name="aRoomDetailRoomFee">
-        </el-tab-pane>
-        <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.carFee')" name="aRoomDetailCarFee">
-        </el-tab-pane>
-        <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.paymentHistory')"
-          name="aRoomDetailHisFee">
-        </el-tab-pane>
-        <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.receipt')"
-          name="aRoomDetailReceipt">
-        </el-tab-pane>
-        <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.repair')" name="aRoomDetailRepair">
-        </el-tab-pane>
-        <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.complaint')"
-          name="aRoomDetailComplaint">
-        </el-tab-pane>
-        <el-tab-pane :label="$t('adminRoomDetail.meterReading')" name="aRoomDetailMeterWaterLog">
-        </el-tab-pane>
-        <el-tab-pane :label="$t('adminRoomDetail.historyOwner')" name="aRoomDetailHisOwner">
-        </el-tab-pane>
-      </el-tabs>
-    </div>
+      <div class="margin-top-sm">
+        <el-tabs v-model="adminRoomDetailInfo._currentTab" @tab-click="handleTabClick(adminRoomDetailInfo._currentTab)">
+          <el-tab-pane :label="$t('adminRoomDetail.owner')" name="aRoomDetailOwner"></el-tab-pane>
+          <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.member')"
+            name="aRoomDetailMember">
+          </el-tab-pane>
+          <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.ownerRoom')"
+            name="aRoomDetailRoom">
+          </el-tab-pane>
+          <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.ownerCar')" name="aRoomDetailCar">
+          </el-tab-pane>
+          <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.contract')"
+            name="aRoomDetailContract">
+          </el-tab-pane>
+          <el-tab-pane :label="$t('adminRoomDetail.roomFee')" name="aRoomDetailRoomFee">
+          </el-tab-pane>
+          <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.carFee')"
+            name="aRoomDetailCarFee">
+          </el-tab-pane>
+          <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.paymentHistory')"
+            name="aRoomDetailHisFee">
+          </el-tab-pane>
+          <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.receipt')"
+            name="aRoomDetailReceipt">
+          </el-tab-pane>
+          <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.repair')"
+            name="aRoomDetailRepair">
+          </el-tab-pane>
+          <el-tab-pane v-if="adminRoomDetailInfo.ownerId" :label="$t('adminRoomDetail.complaint')"
+            name="aRoomDetailComplaint">
+          </el-tab-pane>
+          <el-tab-pane :label="$t('adminRoomDetail.meterReading')" name="aRoomDetailMeterWaterLog">
+          </el-tab-pane>
+          <el-tab-pane :label="$t('adminRoomDetail.historyOwner')" name="aRoomDetailHisOwner">
+          </el-tab-pane>
+        </el-tabs>
+      </div>
 
-    <component :is="adminRoomDetailInfo._currentTab" :ref="adminRoomDetailInfo._currentTab"
-      :roomId="adminRoomDetailInfo.roomId" :ownerId="adminRoomDetailInfo.ownerId"
-      :ownerName="adminRoomDetailInfo.ownerName" :link="adminRoomDetailInfo.link"></component>
+      <component :is="adminRoomDetailInfo._currentTab" :ref="adminRoomDetailInfo._currentTab"
+        :roomId="adminRoomDetailInfo.roomId" :ownerId="adminRoomDetailInfo.ownerId"
+        :ownerName="adminRoomDetailInfo.ownerName" :link="adminRoomDetailInfo.link"></component>
+    </div>
   </div>
 </template>
 
diff --git a/src/views/community/communityWechatList.vue b/src/views/community/communityWechatList.vue
index a7d6435..96dfc65 100644
--- a/src/views/community/communityWechatList.vue
+++ b/src/views/community/communityWechatList.vue
@@ -7,7 +7,7 @@
 
       <el-col :span="20">
         <el-card>
-          <div slot="header" class="clearfix">
+          <div slot="header" class="flex justify-between">
             <span>{{ $t('communityWechat.title') }}</span>
             <el-button v-if="communityId && tableData.length === 0" type="primary" size="small" class="float-right"
               @click="openAddDialog">
diff --git a/src/views/complaint/adminComplaintDetailList.vue b/src/views/complaint/adminComplaintDetailList.vue
index d5ebd46..b41ec54 100644
--- a/src/views/complaint/adminComplaintDetailList.vue
+++ b/src/views/complaint/adminComplaintDetailList.vue
@@ -137,6 +137,7 @@ export default {
         const { data } = await getComplaintDetail(params)
         if (data && data.length > 0) {
           Object.assign(this.complaintDetail, data[0])
+          this.handleTabClick(this.activeTab)
         }
       } catch (error) {
         this.$message.error(this.$t('complaintDetail.fetchError'))
diff --git a/src/views/fee/adminPayFeeDetailList.vue b/src/views/fee/adminPayFeeDetailList.vue
index 3df98bc..ba18c4e 100644
--- a/src/views/fee/adminPayFeeDetailList.vue
+++ b/src/views/fee/adminPayFeeDetailList.vue
@@ -5,78 +5,62 @@
         <select-admin-community ref="selectCommunity" @changeCommunity="handleCommunityChange" />
       </el-col>
       <el-col :span="20">
-        <el-card>
-          <div slot="header" class="clearfix flex justify-between">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix text-left">
             <span>{{ $t('adminPayFeeDetail.search.title') }}</span>
           </div>
-          <el-form :model="searchForm" label-width="auto">
-            <el-row :gutter="20">
-              <el-col :span="6">
-                <el-form-item :label="$t('adminPayFeeDetail.search.startTime')">
-                  <el-date-picker v-model="searchForm.startTime" type="datetime"
-                    :placeholder="$t('adminPayFeeDetail.search.startTimePlaceholder')" style="width: 100%" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminPayFeeDetail.search.endTime')">
-                  <el-date-picker v-model="searchForm.endTime" type="datetime"
-                    :placeholder="$t('adminPayFeeDetail.search.endTimePlaceholder')" style="width: 100%" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminPayFeeDetail.search.paymentMethod')">
-                  <el-select v-model="searchForm.primeRate"
-                    :placeholder="$t('adminPayFeeDetail.search.paymentMethodPlaceholder')" style="width: 100%">
-                    <el-option v-for="item in paymentMethods" :key="item.statusCd" :label="item.name"
-                      :value="item.statusCd" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminPayFeeDetail.search.feeStatus')">
-                  <el-select v-model="searchForm.state" :placeholder="$t('adminPayFeeDetail.search.feeStatusPlaceholder')"
-                    style="width: 100%">
-                    <el-option v-for="item in feeStatuses" :key="item.statusCd" :label="item.name"
-                      :value="item.statusCd" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="6">
-                <el-form-item :label="$t('adminPayFeeDetail.search.feeType')">
-                  <el-select v-model="searchForm.feeTypeCd"
-                    :placeholder="$t('adminPayFeeDetail.search.feeTypePlaceholder')" style="width: 100%">
-                    <el-option v-for="item in feeTypes" :key="item.statusCd" :label="item.name" :value="item.statusCd" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminPayFeeDetail.search.feeStartTime')">
-                  <el-date-picker v-model="searchForm.feeStartTime" type="datetime"
-                    :placeholder="$t('adminPayFeeDetail.search.feeStartTimePlaceholder')" style="width: 100%" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminPayFeeDetail.search.feeEndTime')">
-                  <el-date-picker v-model="searchForm.feeEndTime" type="datetime"
-                    :placeholder="$t('adminPayFeeDetail.search.feeEndTimePlaceholder')" style="width: 100%" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item :label="$t('adminPayFeeDetail.search.payerObjName')">
-                  <el-input v-model="searchForm.payerObjName"
-                    :placeholder="$t('adminPayFeeDetail.search.payerObjNamePlaceholder')" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24" style="text-align: right">
-                <el-button type="primary" @click="handleSearch">{{ $t('common.search') }}</el-button>
-                <el-button @click="handleReset">{{ $t('common.reset') }}</el-button>
-              </el-col>
-            </el-row>
-          </el-form>
+          <el-row :gutter="20">
+            <el-col :span="4">
+              <el-date-picker v-model="searchForm.startTime" type="datetime"
+                :placeholder="$t('adminPayFeeDetail.search.startTimePlaceholder')" class="w-full" />
+            </el-col>
+            <el-col :span="4">
+              <el-date-picker v-model="searchForm.endTime" type="datetime"
+                :placeholder="$t('adminPayFeeDetail.search.endTimePlaceholder')" class="w-full" />
+            </el-col>
+            <el-col :span="4">
+              <el-select v-model="searchForm.primeRate"
+                :placeholder="$t('adminPayFeeDetail.search.paymentMethodPlaceholder')" clearable class="w-full">
+                <el-option v-for="item in paymentMethods" :key="item.statusCd" :label="item.name"
+                  :value="item.statusCd" />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select v-model="searchForm.state" :placeholder="$t('adminPayFeeDetail.search.feeStatusPlaceholder')"
+                clearable class="w-full">
+                <el-option v-for="item in feeStatuses" :key="item.statusCd" :label="item.name"
+                  :value="item.statusCd" />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select v-model="searchForm.feeTypeCd"
+                :placeholder="$t('adminPayFeeDetail.search.feeTypePlaceholder')" clearable class="w-full">
+                <el-option v-for="item in feeTypes" :key="item.statusCd" :label="item.name" :value="item.statusCd" />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-date-picker v-model="searchForm.feeStartTime" type="datetime"
+                :placeholder="$t('adminPayFeeDetail.search.feeStartTimePlaceholder')" class="w-full" />
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" style="margin-top: 20px;">
+            <el-col :span="4">
+              <el-date-picker v-model="searchForm.feeEndTime" type="datetime"
+                :placeholder="$t('adminPayFeeDetail.search.feeEndTimePlaceholder')" class="w-full" />
+            </el-col>
+            <el-col :span="4">
+              <el-input v-model="searchForm.payerObjName"
+                :placeholder="$t('adminPayFeeDetail.search.payerObjNamePlaceholder')" clearable />
+            </el-col>
+            <el-col :span="4">
+              <el-button type="primary" @click="handleSearch">
+                {{ $t('common.search') }}
+              </el-button>
+              <el-button @click="handleReset" style="margin-left: 10px;">
+                {{ $t('common.reset') }}
+              </el-button>
+            </el-col>
+          </el-row>
         </el-card>
 
         <el-card style="margin-top: 20px">
diff --git a/src/views/fee/adminRoomFeeList.vue b/src/views/fee/adminRoomFeeList.vue
index f926eec..cffdab0 100644
--- a/src/views/fee/adminRoomFeeList.vue
+++ b/src/views/fee/adminRoomFeeList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="admin-room-fee-container">
+  <div class="admin-room-fee-container padding">
     <el-row :gutter="10">
       <el-col :span="4" class="tree-container">
         <community-room-tree ref="communityTree" @select-room="handleSelectRoom" />
diff --git a/src/views/fee/communityPaymentList.vue b/src/views/fee/communityPaymentList.vue
index 01b1f0d..2660b2f 100644
--- a/src/views/fee/communityPaymentList.vue
+++ b/src/views/fee/communityPaymentList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="community-payment-container">
+  <div class="community-payment-container padding">
     <el-row :gutter="20">
       <el-col :span="4" class="">
         <select-admin-community :community-id="searchForm.communityId"
diff --git a/src/views/mall/housekeepingSjServList.vue b/src/views/mall/housekeepingSjServList.vue
index a198743..50f9076 100644
--- a/src/views/mall/housekeepingSjServList.vue
+++ b/src/views/mall/housekeepingSjServList.vue
@@ -10,11 +10,11 @@
           <el-input v-model="searchForm.servName" :placeholder="$t('housekeepingSjServ.search.servName')" clearable
             @keyup.enter.native="handleSearch" />
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-select v-model="searchForm.hktId" :placeholder="$t('housekeepingSjServ.search.hktId')" clearable>
             <el-option v-for="item in housekeepingTypes" :key="item.hktId" :label="item.hktName" :value="item.hktId" />
           </el-select>
-        </el-col>
+        </el-col> -->
         <el-col :span="4">
           <el-button type="primary" @click="handleSearch">
             <i class="el-icon-search"></i>
@@ -104,7 +104,7 @@ export default {
   },
   created() {
     this.getList()
-    this.getHousekeepingTypes()
+    //this.getHousekeepingTypes()
   },
   methods: {
     async getList() {
diff --git a/src/views/mall/merchantManageList.vue b/src/views/mall/merchantManageList.vue
index ba56a91..bb2a098 100644
--- a/src/views/mall/merchantManageList.vue
+++ b/src/views/mall/merchantManageList.vue
@@ -56,6 +56,7 @@
 
 <script>
 import { queryMerchant } from '@/api/mall/merchantManageApi'
+import {jumpToMall} from '@/api/user/menuApi'
 
 export default {
   name: 'MerchantManageList',
@@ -112,7 +113,7 @@ export default {
       this.getList()
     },
     handleManage() {
-      this.$router.push('/mall/merchantManage')
+      jumpToMall('/#/pages/admin/merchantManage')
     },
     handleSizeChange(val) {
       this.page.size = val
diff --git a/src/views/mall/productSjList.vue b/src/views/mall/productSjList.vue
index d746945..d6b58e1 100644
--- a/src/views/mall/productSjList.vue
+++ b/src/views/mall/productSjList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="product-sj-container">
+  <div class="product-sj-container ">
     <!-- 查询条件 -->
     <el-card class="search-wrapper">
       <div slot="header" class="clearfix text-left">
@@ -154,8 +154,7 @@ export default {
 
 <style lang="scss" scoped>
 .product-sj-container {
-  padding: 0;
-  margin: 0;
+    padding: 20px;
 
   .search-wrapper {
     margin-bottom: 20px;
diff --git a/src/views/mall/userIntegralList.vue b/src/views/mall/userIntegralList.vue
index 00398dd..3960dc6 100644
--- a/src/views/mall/userIntegralList.vue
+++ b/src/views/mall/userIntegralList.vue
@@ -61,6 +61,7 @@
 <script>
 import { queryIntegralList } from '@/api/mall/userIntegralApi'
 import Pagination from '@/components/mall/Pagination'
+import {jumpToMall} from '@/api/user/menuApi'
 
 export default {
   name: 'UserIntegralList',
@@ -114,9 +115,10 @@ export default {
     },
     handleManage() {
       const path = this.searchForm.objType === '6006'
-        ? '/pages/admin/userIntegral'
-        : '/pages/admin/storeIntegral'
-      this.$router.push({ path })
+        ? '/#/pages/admin/userIntegral'
+        : '/#/pages/admin/storeIntegral'
+     // this.$router.push({ path })
+      jumpToMall(path)
     },
     switchIntegralType(type) {
       this.searchForm.objType = type
diff --git a/src/views/owner/adminOwnerList.vue b/src/views/owner/adminOwnerList.vue
index a508f9a..5130fe3 100644
--- a/src/views/owner/adminOwnerList.vue
+++ b/src/views/owner/adminOwnerList.vue
@@ -10,7 +10,7 @@
             <span>{{ $t('adminOwner.searchTitle') }}</span>
           </div>
           <el-form :inline="true" :model="searchForm" class="search-form ">
-            <el-form-item :label="$t('adminOwner.personRole')">
+            <el-form-item >
               <el-select v-model="searchForm.personRole" :placeholder="$t('adminOwner.selectPersonRole')">
                 <el-option :label="$t('adminOwner.all')" value=""></el-option>
                 <el-option v-for="item in personRoles" :key="item.statusCd" :label="item.name"
@@ -18,7 +18,7 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item :label="$t('adminOwner.personType')">
+            <el-form-item >
               <el-select v-model="searchForm.personType" :placeholder="$t('adminOwner.selectPersonType')">
                 <el-option :label="$t('adminOwner.all')" value=""></el-option>
                 <el-option :label="$t('adminOwner.personal')" value="P"></el-option>
@@ -26,26 +26,27 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item :label="$t('adminOwner.customerName')">
+            <el-form-item >
               <el-input v-model="searchForm.name" :placeholder="$t('adminOwner.inputCustomerName')"></el-input>
             </el-form-item>
 
-            <el-form-item :label="$t('adminOwner.roomNumber')">
+            <el-form-item >
               <el-input v-model="searchForm.roomName" :placeholder="$t('adminOwner.inputRoomNumber')"></el-input>
             </el-form-item>
 
-            <el-form-item :label="$t('adminOwner.contact')">
+            <el-form-item >
               <el-input v-model="searchForm.link" :placeholder="$t('adminOwner.inputContact')" type="number"></el-input>
             </el-form-item>
 
-            <el-form-item :label="$t('adminOwner.idCard')">
-              <el-input v-model="searchForm.idCard" :placeholder="$t('adminOwner.inputIdCard')"></el-input>
-            </el-form-item>
+           
 
             <el-form-item>
               <el-button type="primary" @click="queryOwner">{{ $t('adminOwner.search') }}</el-button>
               <el-button @click="resetOwner">{{ $t('adminOwner.reset') }}</el-button>
             </el-form-item>
+            <el-form-item >
+              <el-input v-model="searchForm.idCard" :placeholder="$t('adminOwner.inputIdCard')"></el-input>
+            </el-form-item>
           </el-form>
         </el-card>
 
diff --git a/src/views/report/communityFeeSummaryList.vue b/src/views/report/communityFeeSummaryList.vue
index b78f9b7..7bb54a5 100644
--- a/src/views/report/communityFeeSummaryList.vue
+++ b/src/views/report/communityFeeSummaryList.vue
@@ -2,7 +2,7 @@
   <div class="community-fee-summary-container">
     <el-row class="animated fadeInRight" :gutter="20">
       <el-col :span="4">
-        <select-admin-community @changeCommunity="handleCommunityChange" />
+        <select-admin-one-community @changeCommunity="handleCommunityChange" />
       </el-col>
       <el-col :span="20">
         <el-card class="box-card">
@@ -104,12 +104,12 @@
 
 <script>
 import { getCommunityFeeSummary } from '@/api/report/communityFeeSummaryApi'
-import SelectAdminCommunity from '@/components/community/selectAdminCommunity'
+import SelectAdminOneCommunity from '@/components/community/selectAdminOneCommunity'
 
 export default {
   name: 'CommunityFeeSummaryList',
   components: {
-    SelectAdminCommunity
+    SelectAdminOneCommunity
   },
   data() {
     return {
diff --git a/src/views/report/operationalAnalysisList.vue b/src/views/report/operationalAnalysisList.vue
index 7b84729..24aead1 100644
--- a/src/views/report/operationalAnalysisList.vue
+++ b/src/views/report/operationalAnalysisList.vue
@@ -2,7 +2,7 @@
   <div class="operational-analysis-container">
     <el-row class="animated fadeInRight ecommerce">
       <el-col :span="4">
-        <select-admin-community @changeCommunity="handleCommunityChange" />
+        <select-admin-one-community @changeCommunity="handleCommunityChange" />
       </el-col>
       <el-col :span="20">
         <el-row>
@@ -18,14 +18,14 @@
 </template>
 
 <script>
-import SelectAdminCommunity from '@/components/community/selectAdminCommunity'
+import SelectAdminOneCommunity from '@/components/community/selectAdminOneCommunity'
 import { getCommunityOperationalAnalysis } from '@/api/report/operationalAnalysisApi'
 import * as echarts from 'echarts'
 
 export default {
   name: 'OperationalAnalysisList',
   components: {
-    SelectAdminCommunity
+    SelectAdminOneCommunity
   },
   data() {
     return {
diff --git a/src/views/role/roleList.vue b/src/views/role/roleList.vue
index 9ca1cd3..dcb6f13 100644
--- a/src/views/role/roleList.vue
+++ b/src/views/role/roleList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="role-container">
+  <div class="role-container padding">
     <el-row>
       <el-col :span="4" class="role-left">
         <role-div @switch-role="handleSwitchRole" />
diff --git a/src/views/staff/aStaffCommunityList.vue b/src/views/staff/aStaffCommunityList.vue
index 90cbf6c..5e423fc 100644
--- a/src/views/staff/aStaffCommunityList.vue
+++ b/src/views/staff/aStaffCommunityList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="padding">
     <el-row :gutter="20">
       <el-col :span="4">
         <el-card class="box-card">
diff --git a/src/views/staff/aStaffDetailList.vue b/src/views/staff/aStaffDetailList.vue
index 2d6f9ce..410ca9b 100644
--- a/src/views/staff/aStaffDetailList.vue
+++ b/src/views/staff/aStaffDetailList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="padding">
     <el-card class="box-card">
       <div class="flex justify-between">
         <div class="text-title">{{ $t('aStaffDetailList.staffInfo') }}</div>
diff --git a/src/views/user/userLoginList.vue b/src/views/user/userLoginList.vue
index f2a6407..d403eee 100644
--- a/src/views/user/userLoginList.vue
+++ b/src/views/user/userLoginList.vue
@@ -162,7 +162,8 @@ export default {
   padding: 20px;
 
   .store-list-card {
-    height: 100%;
+    max-height: 80vh;
+    overflow-y: auto;
 
     .store-list {
       .store-ul {
diff --git a/src/views/work/adminRepairList.vue b/src/views/work/adminRepairList.vue
index bca61ee..907c7ae 100644
--- a/src/views/work/adminRepairList.vue
+++ b/src/views/work/adminRepairList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="admin-repair-container">
+  <div class="admin-repair-container padding">
     <div class="flex-container">
       <div class="tree-container">
         <community-repair-tree ref="communityRepairTree" @selectCommunity="handleSelectCommunity" 
--
libgit2 0.21.4