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 1/4] =?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 2/4] =?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 From f5954a4e187deed1b41fc038b2096ae800976c4f Mon Sep 17 00:00:00 2001 From: shidongli Date: Mon, 13 Nov 2023 15:56:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AD=BE=E7=BA=A6=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/protocol/protocol.vue | 6 +++++- pagesC/Onlinesigning/Onlinesigning.vue | 25 ++++++++++++++----------- pagesC/choosedoctor/choosedoctor.vue | 1 + 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/components/protocol/protocol.vue b/components/protocol/protocol.vue index 814b6ca..dd27703 100644 --- a/components/protocol/protocol.vue +++ b/components/protocol/protocol.vue @@ -175,14 +175,17 @@ } }, openCamera() { + let that = this + that.meimage='' uni.chooseImage({ sizeType: ['compressed'], sourceType: ['camera'], success: function(res) { + console.log(res,'000') that.meimage = res.tempFilePaths[0] uni.saveImageToPhotosAlbum({ - filePath: tempFilePath, + filePath: that.meimage, success: (resp) => { uni.uploadFile({ url: baseurl + @@ -210,6 +213,7 @@ // //签名 userSignaturePicture(data) { let that = this + console.log(data,'9999') that.meimage = data uni.uploadFile({ url: baseurl + '/applet/sign/apply/residentSignatureUpload', diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue index e6fdb8f..f86375c 100644 --- a/pagesC/Onlinesigning/Onlinesigning.vue +++ b/pagesC/Onlinesigning/Onlinesigning.vue @@ -259,17 +259,19 @@ 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) { + } + // 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: '请输入详细地址', type: 'error', @@ -609,6 +611,7 @@ }, //接收拍照或签名 residentAutographPath(data) { + console.log(data,'1111') this.query.residentAutographPath = data.residentAutographPath // this.protocolshow = false }, diff --git a/pagesC/choosedoctor/choosedoctor.vue b/pagesC/choosedoctor/choosedoctor.vue index 7f0cd56..006c842 100644 --- a/pagesC/choosedoctor/choosedoctor.vue +++ b/pagesC/choosedoctor/choosedoctor.vue @@ -69,6 +69,7 @@ realname: { handler(newval, oldval) { console.log(newval, oldval) + this.pageNum=1; this.getDoctorListinfo(); } } From 410f44a1a09819c7e4f54cebcac61aaee01d0386 Mon Sep 17 00:00:00 2001 From: shidongli Date: Mon, 13 Nov 2023 16:26:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesB/screeningRecord/screeningRecord.vue | 7 +++++-- pagesC/Screeningdetails/Screeningdetails.vue | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pagesB/screeningRecord/screeningRecord.vue b/pagesB/screeningRecord/screeningRecord.vue index 4ce98e3..206b881 100644 --- a/pagesB/screeningRecord/screeningRecord.vue +++ b/pagesB/screeningRecord/screeningRecord.vue @@ -1,5 +1,5 @@