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 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 diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue index f86375c..adc9e00 100644 --- a/pagesC/Onlinesigning/Onlinesigning.vue +++ b/pagesC/Onlinesigning/Onlinesigning.vue @@ -259,7 +259,7 @@ title: '请选择现住区县', type: 'error', }) - } + // } // else if (!this.query.townName) { // this.$refs.uToast.show({ // title: '请选择乡镇/街道', @@ -270,8 +270,7 @@ // title: '请选择村/社区', // type: 'error', // }) - // } - else if (!this.query.address) { + } else if (!this.query.address) { this.$refs.uToast.show({ title: '请输入详细地址', type: 'error', @@ -388,7 +387,7 @@ type: 'success', duration: 1500, back: 1, - + }) // uni.switchTab({ // url: "/pages/homepage/homepage" @@ -611,7 +610,6 @@ }, //接收拍照或签名 residentAutographPath(data) { - console.log(data,'1111') this.query.residentAutographPath = data.residentAutographPath // this.protocolshow = false }, 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() 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({ 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 +