From 719fe5aedb40834ead6541a3f0651e1a085ea678 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 15 Jul 2024 11:20:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=BA=E7=A9=BA=E5=81=9C=E6=AD=A2=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/app.js | 2 +- src/utils/request.js | 2 +- src/views/Enjoyableservices/index.vue | 76 +++++++++++++------------ src/views/activity/index.vue | 2 +- src/views/appeal/index.vue | 2 +- src/views/communityPublicity/index.vue | 2 +- src/views/message/index.vue | 2 +- src/views/messages/index.vue | 2 +- src/views/mine/myActivity/index.vue | 2 +- src/views/mine/mySatisfaction/index.vue | 2 +- src/views/search/index.vue | 2 +- 11 files changed, 50 insertions(+), 46 deletions(-) diff --git a/src/store/modules/app.js b/src/store/modules/app.js index 9d9b056..4fc9487 100644 --- a/src/store/modules/app.js +++ b/src/store/modules/app.js @@ -9,7 +9,7 @@ const state = { } const mutations = { SET_USER_INFO(state, userInfo) { - console.log(userInfo,'seeeeeeeeeeeeeeeee'); + console.log(userInfo,'用户信息'); state.userInfo = userInfo; state.agencyId = userInfo.agencyId; state.realNameFlag = userInfo.realName; diff --git a/src/utils/request.js b/src/utils/request.js index 38c20d5..7a7a120 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -9,7 +9,7 @@ import { Tips } from '@/utils/index' const service = axios.create({ baseURL: baseApi, withCredentials: true, // send cookies when cross-domain requests - timeout: 50000 // 等待时间 + timeout: 80000 // 等待时间 }) // request拦截器 request interceptor diff --git a/src/views/Enjoyableservices/index.vue b/src/views/Enjoyableservices/index.vue index 456e023..b9e06f2 100644 --- a/src/views/Enjoyableservices/index.vue +++ b/src/views/Enjoyableservices/index.vue @@ -1,54 +1,58 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue index 58ac8bf..15a12de 100644 --- a/src/views/activity/index.vue +++ b/src/views/activity/index.vue @@ -62,7 +62,7 @@ export default { console.log(res); if (res.code === 0) { this.loading = false; - if (res.data.list.length < this.pageSize) { + if (!res.data || res.data.list.length < this.pageSize) { this.finished = true; } this.activityList = this.activityList.concat(res.data.list); diff --git a/src/views/appeal/index.vue b/src/views/appeal/index.vue index 80f9a9d..f0c2d0b 100644 --- a/src/views/appeal/index.vue +++ b/src/views/appeal/index.vue @@ -63,7 +63,7 @@ export default { let res = await collects(parm) if (res.code === 0) { this.loading = false; - if (res.data.list.length < this.pageSize) { + if (!res.data || res.data.list.length < this.pageSize) { this.finished = true; } this.list = this.list.concat(res.data.list); diff --git a/src/views/communityPublicity/index.vue b/src/views/communityPublicity/index.vue index b710fe4..c5ce6f2 100644 --- a/src/views/communityPublicity/index.vue +++ b/src/views/communityPublicity/index.vue @@ -111,7 +111,7 @@ export default { item.newContent = this.extractChineseCharactersAndPunctuation(item.content) } }) - if (res.data.list.length < this.pageSize) { + if (!res.data || res.data.list.length < this.pageSize) { this.finished = true; } this.PublicityList = this.PublicityList.concat(res.data.list); diff --git a/src/views/message/index.vue b/src/views/message/index.vue index c3b679c..ebdf58d 100644 --- a/src/views/message/index.vue +++ b/src/views/message/index.vue @@ -52,7 +52,7 @@ export default { // 加载状态结束 this.loading = false // 数据全部加载完成 - if (this.list.length >= this.total) { + if (!res.data || this.list.length >= this.total) { this.finished = true } else { this.pageNo++ diff --git a/src/views/messages/index.vue b/src/views/messages/index.vue index 8c3e135..ba3bed8 100644 --- a/src/views/messages/index.vue +++ b/src/views/messages/index.vue @@ -84,7 +84,7 @@ export default { let res = await querystaffmessage(parm) this.loading = false if (res.code === 0) { - if (res.data.length < this.pageSize) { + if (!res.data || res.data.length < this.pageSize) { this.finished = true; } this.MessageList = res.data diff --git a/src/views/mine/myActivity/index.vue b/src/views/mine/myActivity/index.vue index a4d8a28..6f4a06c 100644 --- a/src/views/mine/myActivity/index.vue +++ b/src/views/mine/myActivity/index.vue @@ -54,7 +54,7 @@ export default { let res = await communityActivity(parm) if (res.code === 0) { this.loading = false; - if (res.data.list.length < this.pageSize) { + if (!res.data || res.data.list.length < this.pageSize) { this.finished = true; } this.list = this.list.concat(res.data.list); diff --git a/src/views/mine/mySatisfaction/index.vue b/src/views/mine/mySatisfaction/index.vue index d8598dd..8c5bc17 100644 --- a/src/views/mine/mySatisfaction/index.vue +++ b/src/views/mine/mySatisfaction/index.vue @@ -47,7 +47,7 @@ export default { let res = await inspRecord(parm) if (res.code === 0) { this.loading = false; - if (res.data.list.length < this.pageSize) { + if (!res.data || res.data.list.length < this.pageSize) { this.finished = true; } this.list = this.list.concat(res.data.list); diff --git a/src/views/search/index.vue b/src/views/search/index.vue index 6be8eb1..8eab7a4 100644 --- a/src/views/search/index.vue +++ b/src/views/search/index.vue @@ -67,7 +67,7 @@ export default { let res = await keyWordSearch(parm) this.loading = false if (res.code === 0) { - if (res.data.list.length < this.pageSize) { + if ( !res.data || res.data.list.length < this.pageSize) { this.finished = true; } this.tableList =this.tableList.concat(res.data.list); From e6cf5f47ec243db125fb85833419925eba331cf8 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Mon, 15 Jul 2024 13:24:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=B5=E5=AD=90=E9=97=A8=E7=89=8C?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/houseQR/index.vue | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/houseQR/index.vue b/src/views/houseQR/index.vue index c5457fc..672bd21 100644 --- a/src/views/houseQR/index.vue +++ b/src/views/houseQR/index.vue @@ -45,7 +45,7 @@
- + {{ item.title }}
@@ -85,27 +85,33 @@ export default { }, { imgSrc: require('@/assets/images/houseQR/2.png'), - title: '我有诉求' + title: '我有诉求', + path:'/event' }, { imgSrc: require('@/assets/images/houseQR/3.png'), - title: '社区讯息' + title: '社区讯息', + path:'/communityPublicity' }, { imgSrc: require('@/assets/images/houseQR/4.png'), - title: '社区活动' + title: '社区活动', + path:'/activity' }, { imgSrc: require('@/assets/images/houseQR/5.png'), - title: '居民议事' + title: '居民议事', + path:'/discussion' }, { imgSrc: require('@/assets/images/houseQR/6.png'), - title: '满意度测评' + title: '满意度测评', + path:'/mySatisfaction' }, { imgSrc: require('@/assets/images/houseQR/7.png'), - title: '可享服务' + title: '可享服务', + path:'/Enjoyableservices' }, { imgSrc: require('@/assets/images/houseQR/8.png'), @@ -146,15 +152,9 @@ export default { this.formData = res.data }) }, - handelCLickJump(index) { - if (index === 0) { - if (this.formData.qrCode) { - location.assign(this.formData.qrCode) - } else { - Notify({ type: 'primary', message: '未找到图片！' }) - } - } else if (index === 1) { - this.$router.push({ path: '/event' }) + handelCLickJump(item) { + if (item.path) { + this.$router.push({ path: item.path }) } else { Notify({ type: 'primary', message: '功能持续开放中，敬请期待！' }) }