diff --git a/api/request.js b/api/request.js index a674cb4..1c5af34 100644 --- a/api/request.js +++ b/api/request.js @@ -4,7 +4,8 @@ import baseurl from './baseurl.js' var request = function(config) { return new Promise((resolve, rejected) => { if (config.url != '/nurseApplet/chatRecord/updateReadStatus' && config.url != - "/nurseApplet/chatRecord/sendMessage") { + "/nurseApplet/chatRecord/sendMessage" && config.url != + `/applet/sign/apply/checkSignApply/` + uni.getStorageSync('userinfo').cardNo) { uni.showLoading({ title: '' }); @@ -27,4 +28,4 @@ var request = function(config) { }) } -export default request +export default request \ No newline at end of file diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index 7943b1d..024d236 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -115,16 +115,8 @@ uni.setStorageSync("region", 3) } this.region = uni.getStorageSync('region') - // if (this.region) { - // if (this.region == "1" || this.region == "2") { - // } else { - // this.family() - // } - - // } - - if (this.userinfo) { + if (this.userinfo && this.region!="3") { this.patientName = this.userinfo.patientName checkSignApply(this.userinfo.cardNo).then(res => { if (res.data.code != 0) { @@ -163,7 +155,7 @@ // 家医功能提示 family() { this.$refs.uToast.show({ - title: '请切换城市,再操作家医相关功能', + title: '当前绑定地市不支持', type: 'error', duration: '3000', @@ -177,7 +169,7 @@ } else { if (this.region == "3") { this.family() - } else{ + } else { if (this.cityCode == "1" || this.cityCode == "2") { if (!this.checkSign) { this.$refs.uToast.show({ @@ -193,9 +185,9 @@ } } else { this.family() - + } - + } @@ -208,7 +200,7 @@ } else { if (this.region == "3") { this.family() - } else{ + } else { if (this.cityCode == "1" || this.cityCode == "2") { if (!this.checkSign) { this.$refs.uToast.show({ @@ -222,15 +214,15 @@ url: '/pagesB/Behaviorpoints/Behaviorpoints' }) } - + } else { this.family() - + } - + } - + } }, @@ -327,18 +319,18 @@ } else { if (this.region == "3") { this.family() - } else{ + } else { if (this.cityCode == "1" || this.cityCode == "2") { uni.navigateTo({ url: "/pagesC/servicerecord/servicerecord" }) - + } else { this.family() } - + } - + } }, @@ -349,7 +341,7 @@ } else { if (this.region == "3") { this.family() - } else{ + } else { if (this.cityCode == "1" || this.cityCode == "2") { if (!this.checkSign) { this.$refs.uToast.show({ @@ -363,11 +355,11 @@ url: "/pagesC/Myappointment/Myappointment" }) } - + } else { this.family() } - + }