From e382dc59191b9c6af494a98ccaf3a27ce04637bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Mon, 13 Nov 2023 14:45:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesC/seekadvicefrom/seekadvicefrom.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pagesC/seekadvicefrom/seekadvicefrom.vue b/pagesC/seekadvicefrom/seekadvicefrom.vue index 706b16f..427187b 100644 --- a/pagesC/seekadvicefrom/seekadvicefrom.vue +++ b/pagesC/seekadvicefrom/seekadvicefrom.vue @@ -469,7 +469,7 @@ that.newsList.push({ senderName: that.currentItem.doctorName, content: JSON.parse(res.data).message, - messageType: JSON.parse(res.data).messageType + messageType: Number(JSON.parse(res.data).messageType) }) setTimeout(() => { let query = uni.createSelectorQuery().in(this); @@ -767,4 +767,4 @@ bottom: 38rpx; } } - \ No newline at end of file + From 5ae165d3f8a87ffa064fe5227c0b097d70d4035a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Mon, 13 Nov 2023 15:12:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 5 +++-- pages/message/message.vue | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pages.json b/pages.json index 0cec339..4ce742a 100644 --- a/pages.json +++ b/pages.json @@ -12,8 +12,9 @@ }, { "path": "pages/message/message", "style": { - "enablePullDownRefresh": false, - "navigationBarTitleText": "消息中心" + "navigationBarTitleText": "消息中心", + "onReachBottomDistance": 40, //距离底部多远时触发 单位为px + "enablePullDownRefresh": true //设置参数为true } }, { "path": "pages/homepage/homepage", diff --git a/pages/message/message.vue b/pages/message/message.vue index 3524ef7..696f8df 100644 --- a/pages/message/message.vue +++ b/pages/message/message.vue @@ -51,7 +51,7 @@ - 服务推送 + {{item.senderName}} {{item.sendTime}} @@ -137,7 +137,16 @@ } }) }, - } + }, + onReachBottom() { //上滑加载 + }, + onPullDownRefresh() { //下拉刷新 + this.info(); + setTimeout(function() { + uni.stopPullDownRefresh(); + }, 1000); + + }, } @@ -199,4 +208,4 @@ } } } - + \ No newline at end of file From 14ff1bd760684427a8ced718e50ea918149a1d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Mon, 13 Nov 2023 15:15:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesC/addsugar/addsugar.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/pagesC/addsugar/addsugar.vue b/pagesC/addsugar/addsugar.vue index 907c5bd..69fbd0e 100644 --- a/pagesC/addsugar/addsugar.vue +++ b/pagesC/addsugar/addsugar.vue @@ -161,7 +161,6 @@ } }) uni.onSocketMessage(res => { - console.log("webScoket监听收到的信息", res); this.uploadType = 2 this.number = JSON.parse(res.data).fbg this.$forceUpdate() From 4efa42d5ddce2e5bd6fecd93bc527de3c40f0990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 13 Nov 2023 15:46:38 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=AD=BE=E7=BA=A6?= =?UTF-8?q?=E5=92=8C=E6=9C=8D=E5=8A=A1=E9=A2=84=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesC/Onlinesigning/Onlinesigning.vue | 21 +++++++++++---------- pagesC/appointmenttime/appointmenttime.vue | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue index e6fdb8f..7ee71e4 100644 --- a/pagesC/Onlinesigning/Onlinesigning.vue +++ b/pagesC/Onlinesigning/Onlinesigning.vue @@ -259,16 +259,17 @@ title: '请选择现住区县', type: 'error', }) - } else if (!this.query.townName) { - this.$refs.uToast.show({ - title: '请选择乡镇/街道', - type: 'error', - }) - } else if (!this.query.committeeName) { - this.$refs.uToast.show({ - title: '请选择村/社区', - type: 'error', - }) + // } + // else if (!this.query.townName) { + // this.$refs.uToast.show({ + // title: '请选择乡镇/街道', + // type: 'error', + // }) + // } else if (!this.query.committeeName) { + // this.$refs.uToast.show({ + // title: '请选择村/社区', + // type: 'error', + // }) } else if (!this.query.address) { this.$refs.uToast.show({ title: '请输入详细地址', diff --git a/pagesC/appointmenttime/appointmenttime.vue b/pagesC/appointmenttime/appointmenttime.vue index 0a8c7f1..b11a24f 100644 --- a/pagesC/appointmenttime/appointmenttime.vue +++ b/pagesC/appointmenttime/appointmenttime.vue @@ -89,7 +89,7 @@ this.$refs.uToast.show({ title: '预约成功', type: 'success', - url: '/pagesC/ServiceAppointment/ServiceAppointment' + // url: '/pagesC/ServiceAppointment/ServiceAppointment' }) } else if (res.code == '500') { this.$refs.uToast.show({ From 6d6d9f7835388f08599e9f2f8efbf9b0427c5d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 13 Nov 2023 15:56:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=88=91=E7=9A=84=20?= =?UTF-8?q?=E7=AD=BE=E7=BA=A6=E4=BF=A1=E6=81=AF=E5=9C=B0=E5=8C=BA=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/myinformation/myinformation.vue | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue index 77942e9..563ba54 100644 --- a/pages/myinformation/myinformation.vue +++ b/pages/myinformation/myinformation.vue @@ -383,9 +383,17 @@ }, // 签约信息 Signing() { - uni.navigateTo({ - url: '/pagesB/mysigning/mysigning' - }) + if (uni.getStorageSync('region') == 3) { + this.$refs.uToast.show({ + title: '当前地区不支持，请选择其它地区', + type: 'error', + }) + } else { + uni.navigateTo({ + url: '/pagesB/mysigning/mysigning' + }) + } + }, //去登陆 gologin() { @@ -527,4 +535,4 @@ + \ No newline at end of file