Merge branch 'dev' of http://bj.gitlab.cnlive.com/cnlive_project/cnlive-community-web-vue into dev

杨泽宇
2 parents 90913ccb f7398481
Showing 1 changed file with 4 additions and 3 deletions
src/views/community/houses/buildOwner.vue
@@ -56,12 +56,12 @@ const search = (): void =&gt; {
   searchData.houseId = props.houseId;
   availableResidentList(searchData)
     .then((res) => {
-      data.tableList = res.data.data;
+      data.tableList = res.data.data.list;
       data.tableList.map((item) => {
         item.houseId = props.houseId;
         item.residentId = item.id;
       });
-      data.total = res.data.data.length;
+      data.total = res.data.data.total;
       data.loading = false;
       data.selectList = [];
     })
@@ -142,7 +142,7 @@ watchEffect(() =&gt; {
 <template>
   <div>
     <!-- 搜索 -->
-    <el-form :inline="true" :model="searchData" v-loading="data.loading">
+    <el-form :inline="true" :model="searchData" >
       <el-form-item>
         <el-input
           style="width: 280px"
@@ -171,6 +171,7 @@ watchEffect(() =&gt; {
       @select-all="selectAll"
       @selection-change="handleSelectionChange"
       ref="multipleTableRef"
+      v-loading="data.loading"
     >
       <el-table-column type="selection" width="55" />
       <el-table-column label="姓名" prop="name"></el-table-column>