From 50bd2c390a8ac257e069ac8f070b7ea2305981c9 Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 23 Jan 2024 13:18:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AD=BE=E7=BA=A6+=E7=AD=BE?= =?UTF-8?q?=E7=BA=A6=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BA+=E5=9B=BE?= =?UTF-8?q?=E6=96=87=E9=97=AE=E8=AF=8A+=E5=9C=B0=E5=9D=80=E6=89=80?= =?UTF-8?q?=E5=9C=A8=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/homepage/homepage.vue | 72 ++++++++++++------- pages/myinformation/myinformation.vue | 14 ++-- .../consultationplatform.vue | 32 ++++++++- .../createnewconsultation.vue | 18 +++-- pagesC/Onlinesigning/Onlinesigning.scss | 5 ++ pagesC/Onlinesigning/Onlinesigning.vue | 10 ++- 6 files changed, 112 insertions(+), 39 deletions(-) diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index 6a39177..6be9f3e 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -186,12 +186,16 @@ } else { if (this.region == 1 || this.region == 2) { if (this.checkSign == "0") { - this.$refs.uToast.show({ - title: '未签约，请先签约', - type: 'error', - duration: '1500', - url: "/pagesC/Onlinesigning/Onlinesigning" + uni.navigateTo({ + url:`/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`, + }) + // this.$refs.uToast.show({ + // title: '未签约，请先签约', + // type: 'error', + // duration:'1500', + // url: "/pagesC/Onlinesigning/Onlinesigning" + // }) } else if (this.checkSign == "01") { this.$refs.uToast.show({ title: this.infotitle, @@ -220,12 +224,16 @@ } else { if (this.region == 1 || this.region == 2) { if (this.checkSign == "0") { - this.$refs.uToast.show({ - title: this.infotitle, - type: 'error', - duration: '1500', - url: "/pagesC/Onlinesigning/Onlinesigning" + uni.navigateTo({ + url:`/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`, + }) + // this.$refs.uToast.show({ + // title: '未签约，请先签约', + // type: 'error', + // duration:'1500', + // url: "/pagesC/Onlinesigning/Onlinesigning" + // }) } else if (this.checkSign == "01") { this.$refs.uToast.show({ title: this.infotitle, @@ -305,12 +313,17 @@ } else { if (this.region == 1 || this.region == 2) { if (this.checkSign == "0") { - this.$refs.uToast.show({ - title: '未签约，请先签约', - type: 'error', - duration: '1500', - url: "/pagesC/Onlinesigning/Onlinesigning" + + uni.navigateTo({ + url:`/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`, + }) + // this.$refs.uToast.show({ + // title: '未签约，请先签约', + // type: 'error', + // duration:'1500', + // url: "/pagesC/Onlinesigning/Onlinesigning" + // }) } else if (this.checkSign == "01") { this.$refs.uToast.show({ title: this.infotitle, @@ -339,13 +352,16 @@ } else { if (this.region == 1 || this.region == 2) { if (this.checkSign == "0") { - this.$refs.uToast.show({ - title: '未签约，请先签约', - duration: '1500', - type: 'error', + uni.navigateTo({ + url:`/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`, - url: "/pagesC/Onlinesigning/Onlinesigning" }) + // this.$refs.uToast.show({ + // title: '未签约，请先签约', + // duration:'1500', + // type: 'error', + // url: "/pagesC/Onlinesigning/Onlinesigning" + // }) } else if (this.checkSign == "01") { this.$refs.uToast.show({ title: this.infotitle, @@ -373,12 +389,16 @@ } else { if (this.region == 1 || this.region == 2) { if (this.checkSign == "0") { - this.$refs.uToast.show({ - title: '未签约，请先签约', - type: 'error', - duration: '1500', - url: "/pagesC/Onlinesigning/Onlinesigning" + uni.navigateTo({ + url:`/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`, + }) + // this.$refs.uToast.show({ + // title: '未签约，请先签约', + // type: 'error', + // duration:'1500', + // url: "/pagesC/Onlinesigning/Onlinesigning" + // }) } else if (this.checkSign == "01") { this.$refs.uToast.show({ title: this.infotitle, @@ -402,4 +422,4 @@ \ No newline at end of file + diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue index c28016a..a13872c 100644 --- a/pages/myinformation/myinformation.vue +++ b/pages/myinformation/myinformation.vue @@ -418,11 +418,15 @@ } else { if (this.region == 1 || this.region == 2) { if (this.checkSign == "0") { - this.$refs.uToast.show({ - title: '未签约，请先签约', - type: 'error', - url: "/pagesC/Onlinesigning/Onlinesigning" + uni.navigateTo({ + url:`/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`, + }) + // this.$refs.uToast.show({ + // title: '未签约，请先签约', + // type: 'error', + // url: "/pagesC/Onlinesigning/Onlinesigning" + // }) } else if (this.checkSign == "01") { this.$refs.uToast.show({ title: this.infotitle, @@ -587,4 +591,4 @@ \ No newline at end of file + diff --git a/pagesB/consultationplatform/consultationplatform.vue b/pagesB/consultationplatform/consultationplatform.vue index 6302fc6..3c8840b 100644 --- a/pagesB/consultationplatform/consultationplatform.vue +++ b/pagesB/consultationplatform/consultationplatform.vue @@ -55,6 +55,9 @@ selectDepartmentNoPage, selectHospitalPerson } from '@/api/pagesB/medicine/index.js' + import { + checkSignApply + } from '@/api/pages/homepage/homepage.js' import baseurl from '../../api/baseurl'; export default { data() { @@ -68,12 +71,16 @@ HospitalPersonlist: null, HospitalPersontotal: 0, hospitalDepartmentList: null, + cardNo:'', + checkSign:'', + infotitle:'', }; }, onLoad() { this.region = Number(uni.getStorageSync('region')) this.baseurl = baseurl this.selectDepartmentinfo(); + this.cardNo=uni.getStorageSync('userinfo').cardNo }, methods: { info() { @@ -118,10 +125,29 @@ //图文问诊 goimagetextConsultation() { if (this.region != 3) { - uni.navigateTo({ - url: '/pagesB/imagetextConsultation/imagetextConsultation' + checkSignApply(this.cardNo).then(res => { + if (res.data) { + this.checkSign = res.data.code + this.infotitle = res.data.info + if (this.checkSign == "0") { + uni.navigateTo({ + url:`/pagesC/Onlinesigning/Onlinesigning?checkSign=${this.checkSign}`, + + }) + } else if (this.checkSign == "01") { + this.$refs.uToast.show({ + title: this.infotitle, + type: 'error', + }) + } else { + uni.navigateTo({ + url: '/pagesB/imagetextConsultation/imagetextConsultation' + }) + } + } }) + } else { this.info() } @@ -287,4 +313,4 @@ margin: 20rpx auto 0; } } - \ No newline at end of file + diff --git a/pagesB/createnewconsultation/createnewconsultation.vue b/pagesB/createnewconsultation/createnewconsultation.vue index f7a67f9..f188704 100644 --- a/pagesB/createnewconsultation/createnewconsultation.vue +++ b/pagesB/createnewconsultation/createnewconsultation.vue @@ -12,9 +12,12 @@ 现住址所在区 - {{address}} + --> + + {{address}} @@ -154,7 +157,7 @@ list: [], addresslength: null, imglistlength: null, - address: '请选择所属地区', //页面所属区域 + address: '', //页面所属区域 formdata: { address: '', //页面所属区域 patientId: '', @@ -178,7 +181,7 @@ onLoad(options) { this.uoloadaction = baseurl + '/nurseApplet/consultationInfo/uploadConsultationFile' this.formdata = uni.getStorageSync('userinfo') - this.formdata.address = '' + // this.formdata.address = '' this.formdata.fileUrls = [] this.infolist() this.areaInfo(); @@ -317,6 +320,13 @@ }, infolist() { detail(this.formdata.cardNo).then(res => { + if(res.data.provinceName && res.data.cityName && res.data.countyName &&res.data.townName){ + this.address=res.data.provinceName+res.data.cityName+res.data.countyName+res.data.townName + this.formdata.address=this.address + }else if(res.data.provinceName && res.data.cityName && res.data.countyName){ + this.address=res.data.provinceName+res.data.cityName+res.data.countyName + this.formdata.address=this.address + } var status = '1' if (res.code == 200) { getHospitalPersonInfo(res.data.dutyDoctorNo, status).then(res => { @@ -357,4 +367,4 @@ \ No newline at end of file + diff --git a/pagesC/Onlinesigning/Onlinesigning.scss b/pagesC/Onlinesigning/Onlinesigning.scss index 2521913..065f5d5 100644 --- a/pagesC/Onlinesigning/Onlinesigning.scss +++ b/pagesC/Onlinesigning/Onlinesigning.scss @@ -6,9 +6,14 @@ background: #FFFFFF; box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); border-radius: 5rpx; + ::v-deep .u-toast{ + margin-top: 6%; + + } ::v-deep .u-checkbox { width: 100% !important; height: 80rpx !important; + } .signing { width: 637rpx; diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue index 9226202..75f6ebb 100644 --- a/pagesC/Onlinesigning/Onlinesigning.vue +++ b/pagesC/Onlinesigning/Onlinesigning.vue @@ -636,6 +636,14 @@ }, }, onLoad(options) { + if(options.checkSign=="0"){ + this.$refs.uToast.show({ + title: '未签约，请先签约', + type: 'error', + duration:'2000', + position:'top', + }) + } var region = uni.getStorageSync('region') // 德州 if (region == 1) { @@ -691,4 +699,4 @@ \ No newline at end of file +