From 80a841629c9eabd526eca156fd3d3a11b6d73e66 Mon Sep 17 00:00:00 2001 From: shidongli Date: Wed, 8 Nov 2023 17:13:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=AD=BE=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/homepage/homepage.vue | 105 +++++++++++++++--- pagesB/mysigning/mysigning.vue | 8 +- pagesC/Onlinesigning/Onlinesigning.vue | 8 +- .../selectInstitution/selectInstitution.vue | 1 + 4 files changed, 101 insertions(+), 21 deletions(-) diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index 721deb8..0a7d8f1 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -117,11 +117,16 @@ if (this.userinfo && this.region!="3") { this.patientName = this.userinfo.patientName checkSignApply(this.userinfo.cardNo).then(res => { - if (res.data.code != 0) { - this.checkSign = true - } else { - this.checkSign = false + if(res.data){ + this.checkSign=res.data.code + this.info=res.data.info + } + // if (res.data.code == 0) { + // this.checkSign = true + // } else { + // this.checkSign = false + // } }) } else { this.patientName = '' @@ -169,14 +174,23 @@ this.family() } else { if (this.cityCode == "1" || this.cityCode == "2") { - if (!this.checkSign) { + if (this.checkSign=="0") { this.$refs.uToast.show({ title: '未签约，请先签约', type: 'error', duration: '1000', url: "/pagesC/Onlinesigning/Onlinesigning" }) - } else { + } else if(this.checkSign=="01"){ + this.$refs.uToast.show({ + title: this.info, + type: 'error', + duration: '2000', + + }) + + } + else { uni.navigateTo({ url: "/pagesB/mysigning/mysigning" }) @@ -200,14 +214,33 @@ this.family() } else { if (this.cityCode == "1" || this.cityCode == "2") { - if (!this.checkSign) { + if (this.checkSign=="0") { this.$refs.uToast.show({ - title: '未签约，请先签约', + title: this.info, type: 'error', duration: '1000', url: "/pagesC/Onlinesigning/Onlinesigning" }) - } else { + } + else if(this.checkSign=="01"){ + this.$refs.uToast.show({ + title: this.info, + type: 'error', + duration: '2000', + + }) + + } + else if(this.checkSign=="01"){ + this.$refs.uToast.show({ + title: this.info, + type: 'error', + duration: '2000', + + }) + + } + else { uni.navigateTo({ url: '/pagesB/Behaviorpoints/Behaviorpoints' }) @@ -282,14 +315,24 @@ // this.family() // } else { // if (this.cityCode == "1" || this.cityCode == "2") { - if (!this.checkSign) { + if (this.checkSign=="0") { this.$refs.uToast.show({ title: '未签约，请先签约', type: 'error', duration: '1000', url: "/pagesC/Onlinesigning/Onlinesigning" }) - } else { + } + else if(this.checkSign=="01"){ + this.$refs.uToast.show({ + title: this.info, + type: 'error', + duration: '2000', + + }) + + } + else { uni.navigateTo({ url: "/pagesC/ServiceAppointment/ServiceAppointment" }) @@ -319,9 +362,29 @@ this.family() } else { if (this.cityCode == "1" || this.cityCode == "2") { - uni.navigateTo({ - url: "/pagesC/servicerecord/servicerecord" - }) + if (this.checkSign=="0") { + this.$refs.uToast.show({ + title: '未签约，请先签约', + type: 'error', + duration: '1000', + url: "/pagesC/Onlinesigning/Onlinesigning" + }) + } + else if(this.checkSign=="01"){ + this.$refs.uToast.show({ + title: this.info, + type: 'error', + duration: '2000', + + }) + + }else{ + uni.navigateTo({ + url: "/pagesC/servicerecord/servicerecord" + }) + + } + } else { this.family() @@ -341,14 +404,24 @@ this.family() } else { if (this.cityCode == "1" || this.cityCode == "2") { - if (!this.checkSign) { + if (this.checkSign=="0") { this.$refs.uToast.show({ title: '未签约，请先签约', type: 'error', duration: '1000', url: "/pagesC/Onlinesigning/Onlinesigning" }) - } else { + } + else if(this.checkSign=="01"){ + this.$refs.uToast.show({ + title: this.info, + type: 'error', + duration: '2000', + + }) + + } + else { uni.navigateTo({ url: "/pagesC/Myappointment/Myappointment" }) diff --git a/pagesB/mysigning/mysigning.vue b/pagesB/mysigning/mysigning.vue index 5cd70e5..35eeb71 100644 --- a/pagesB/mysigning/mysigning.vue +++ b/pagesB/mysigning/mysigning.vue @@ -159,6 +159,12 @@ url: "/pages/homepage/homepage" }) }, 2000) + }else{ + this.$refs.uToast.show({ + title: res.msg, + type: 'error', + }) + } }) }, @@ -215,4 +221,4 @@ \ No newline at end of file + diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue index 876d539..60cc5d5 100644 --- a/pagesC/Onlinesigning/Onlinesigning.vue +++ b/pagesC/Onlinesigning/Onlinesigning.vue @@ -223,7 +223,7 @@ crowdNoList: null, packageList: null, packageNoList: null, - signYears: null, + signYears: 1, BasePackage: null, //基础包 PersonalityPack: null, // 个性包 packSignCost: 0, //价格 @@ -314,8 +314,8 @@ title: '签约成功', type: 'success', }) - uni.redirectTo({ - url: "/pagesB/mysigning/mysigning" + uni.switchTab({ + url: "/pages/homepage/homepage" }) } else { this.$refs.uToast.show({ @@ -568,4 +568,4 @@ \ No newline at end of file + diff --git a/pagesC/selectInstitution/selectInstitution.vue b/pagesC/selectInstitution/selectInstitution.vue index d938e79..02bd08d 100644 --- a/pagesC/selectInstitution/selectInstitution.vue +++ b/pagesC/selectInstitution/selectInstitution.vue @@ -64,6 +64,7 @@ watch: { 'query.orgName': { handler(newval, oldval) { + this.query.pageNum=1 this.getNearbyOrginfo(); } }