Commit 16c7dc0df4e7e5dd09d773347f7ae5000857d7a8
Merge branch 'dev' of http://bj.gitlab.cnlive.com/cnlive_project/cnlive-community-web-vue into dev
Showing
8 changed files
with
11 additions
and
11 deletions
src/views/community/housekeeper/changeAdmin.vue
| @@ -155,7 +155,7 @@ watchEffect(() => { | @@ -155,7 +155,7 @@ watchEffect(() => { | ||
| 155 | <Pagination | 155 | <Pagination |
| 156 | v-if="data.total > 0" | 156 | v-if="data.total > 0" |
| 157 | :total="data.total" | 157 | :total="data.total" |
| 158 | - :currentPage="searchData.pageNum" | 158 | + :currentPage="searchData.page" |
| 159 | :pageSize="searchData.pageSize" | 159 | :pageSize="searchData.pageSize" |
| 160 | @pageChange="search" | 160 | @pageChange="search" |
| 161 | ></Pagination> | 161 | ></Pagination> |
src/views/community/housekeeper/houseDetail.vue
| @@ -37,7 +37,7 @@ let data = reactive({ | @@ -37,7 +37,7 @@ let data = reactive({ | ||
| 37 | * 获取下拉数据 | 37 | * 获取下拉数据 |
| 38 | */ | 38 | */ |
| 39 | const getSelectList: void = () => { | 39 | const getSelectList: void = () => { |
| 40 | - getTableList({ pageNum: 1, pageSize: 1000, type: 0 }) | 40 | + getTableList({ page: 1, pageSize: 1000, type: 0 }) |
| 41 | .then((res) => { | 41 | .then((res) => { |
| 42 | data.options = res.data.data.list; | 42 | data.options = res.data.data.list; |
| 43 | }) | 43 | }) |
src/views/community/housekeeper/index.vue
| @@ -16,7 +16,7 @@ const searchData = reactive({ | @@ -16,7 +16,7 @@ const searchData = reactive({ | ||
| 16 | neighborhoodId: null, | 16 | neighborhoodId: null, |
| 17 | type: 0, | 17 | type: 0, |
| 18 | name: null, | 18 | name: null, |
| 19 | - pageNum: 1, | 19 | + page: 1, |
| 20 | pageSize: 10, | 20 | pageSize: 10, |
| 21 | }); | 21 | }); |
| 22 | // 展示 | 22 | // 展示 |
| @@ -203,7 +203,7 @@ watchEffect(() => { | @@ -203,7 +203,7 @@ watchEffect(() => { | ||
| 203 | <Pagination | 203 | <Pagination |
| 204 | v-if="data.total > 0" | 204 | v-if="data.total > 0" |
| 205 | :total="data.total" | 205 | :total="data.total" |
| 206 | - :currentPage="searchData.pageNum" | 206 | + :currentPage="searchData.page" |
| 207 | :pageSize="searchData.pageSize" | 207 | :pageSize="searchData.pageSize" |
| 208 | @pageChange="search" | 208 | @pageChange="search" |
| 209 | ></Pagination> | 209 | ></Pagination> |
src/views/community/houses/buildOwner.vue
| @@ -207,7 +207,7 @@ watchEffect(() => { | @@ -207,7 +207,7 @@ watchEffect(() => { | ||
| 207 | <Pagination | 207 | <Pagination |
| 208 | v-if="data.total > 0" | 208 | v-if="data.total > 0" |
| 209 | :total="data.total" | 209 | :total="data.total" |
| 210 | - :currentPage="searchData.pageNum" | 210 | + :currentPage="searchData.page" |
| 211 | :pageSize="searchData.pageSize" | 211 | :pageSize="searchData.pageSize" |
| 212 | @pageChange="search" | 212 | @pageChange="search" |
| 213 | ></Pagination> | 213 | ></Pagination> |
src/views/community/houses/index.vue
| @@ -16,7 +16,7 @@ const searchData = reactive({ | @@ -16,7 +16,7 @@ const searchData = reactive({ | ||
| 16 | buildingId: null, | 16 | buildingId: null, |
| 17 | type: 0, | 17 | type: 0, |
| 18 | roomNumber: null, | 18 | roomNumber: null, |
| 19 | - pageNum: 1, | 19 | + page: 1, |
| 20 | pageSize: 10, | 20 | pageSize: 10, |
| 21 | }); | 21 | }); |
| 22 | // 展示 | 22 | // 展示 |
| @@ -196,7 +196,7 @@ watchEffect(() => { | @@ -196,7 +196,7 @@ watchEffect(() => { | ||
| 196 | <Pagination | 196 | <Pagination |
| 197 | v-if="data.total > 0" | 197 | v-if="data.total > 0" |
| 198 | :total="data.total" | 198 | :total="data.total" |
| 199 | - :currentPage="searchData.pageNum" | 199 | + :currentPage="searchData.page" |
| 200 | :pageSize="searchData.pageSize" | 200 | :pageSize="searchData.pageSize" |
| 201 | @pageChange="search" | 201 | @pageChange="search" |
| 202 | ></Pagination> | 202 | ></Pagination> |
src/views/community/houses/relieve.vue
| @@ -137,7 +137,7 @@ watchEffect(() => { | @@ -137,7 +137,7 @@ watchEffect(() => { | ||
| 137 | <Pagination | 137 | <Pagination |
| 138 | v-if="data.total > 0" | 138 | v-if="data.total > 0" |
| 139 | :total="data.total" | 139 | :total="data.total" |
| 140 | - :currentPage="searchData.pageNum" | 140 | + :currentPage="searchData.page" |
| 141 | :pageSize="searchData.pageSize" | 141 | :pageSize="searchData.pageSize" |
| 142 | @pageChange="search" | 142 | @pageChange="search" |
| 143 | ></Pagination> | 143 | ></Pagination> |
src/views/community/residence/index.vue
| @@ -9,7 +9,7 @@ let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取a | @@ -9,7 +9,7 @@ let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取a | ||
| 9 | const searchData = reactive({ | 9 | const searchData = reactive({ |
| 10 | type: 0, | 10 | type: 0, |
| 11 | name: null, | 11 | name: null, |
| 12 | - pageNum: 1, | 12 | + page: 1, |
| 13 | pageSize: 10, | 13 | pageSize: 10, |
| 14 | }); | 14 | }); |
| 15 | // 展示 | 15 | // 展示 |
| @@ -144,7 +144,7 @@ onMounted(() => { | @@ -144,7 +144,7 @@ onMounted(() => { | ||
| 144 | <Pagination | 144 | <Pagination |
| 145 | v-if="data.total > 0" | 145 | v-if="data.total > 0" |
| 146 | :total="data.total" | 146 | :total="data.total" |
| 147 | - :currentPage="searchData.pageNum" | 147 | + :currentPage="searchData.page" |
| 148 | :pageSize="searchData.pageSize" | 148 | :pageSize="searchData.pageSize" |
| 149 | @pageChange="search" | 149 | @pageChange="search" |
| 150 | ></Pagination> | 150 | ></Pagination> |
src/views/housekeeper/buildinMganager/index.vue
| @@ -156,7 +156,7 @@ onMounted(() => { | @@ -156,7 +156,7 @@ onMounted(() => { | ||
| 156 | <Pagination | 156 | <Pagination |
| 157 | v-if="data.total > 0" | 157 | v-if="data.total > 0" |
| 158 | :total="data.total" | 158 | :total="data.total" |
| 159 | - :currentPage="searchData.pageNum" | 159 | + :currentPage="searchData.page" |
| 160 | :pageSize="searchData.pageSize" | 160 | :pageSize="searchData.pageSize" |
| 161 | @pageChange="search" | 161 | @pageChange="search" |
| 162 | ></Pagination> | 162 | ></Pagination> |