修改

pages/medicalservice/medicalservice.vue

@@ -43,6 +43,7 @@
 
 <script>
 	import {
+		mapState,
 		mapActions
 	} from "vuex";
 	import {
@@ -72,12 +73,9 @@
 			this.getHeathHousing();
 		},
 		methods: {
-			// 第一种 直接映射
-			...mapActions(["openPopup"]),
 			goAppointmentscreening() {
-				this.openPopup();
-				setTimeout(e => {
 				// 筛查预约
+
 				if (!this.userInfo) {
 					uni.showModal({
 						title: "提示",
@@ -94,7 +92,8 @@
 							}
 						},
 					})
-					} else {
+				}
+				 else {
 					getScreening(this.patientId).then(res => {
 						if (res.code == 200) {
 							let userinfo = JSON.stringify(this.userInfo)
@@ -110,7 +109,12 @@
 						}
 					})
 				}
-				}, 0)
+				// uni.navigateTo({
+				// 		url: '/pagesB/screenorder/screenorder'
+				// })
+				// uni.navigateTo({
+				// 		url: '/pagesB/orderlist/orderlist'
+				// })
 			},
 			//跳转健康常识item
 			gohealthitem(item) {
@@ -128,6 +132,7 @@
 						url: '/pages/login/login'
 					})
 				}
+
 			},
 			// 健康常识
 			getHeathHousing() {
@@ -141,6 +146,8 @@
 				})
 			},
 			//新人福利
+			// 第一种 直接映射
+			...mapActions(["openPopup"]),
 			gomaterialbenefits() {
 				// 第二种引入
 				// this.$store.dispatch("openPopup");
@@ -181,6 +188,7 @@
 							url: '/pages/login/login'
 						})
 					}
+
 				}, 0)
 			},
 			//健康常识
@@ -199,11 +207,10 @@
 						url: '/pages/login/login'
 					})
 				}
+
 			},
 			// 筛查结果
 			result() {
-				this.openPopup();
-				setTimeout(e => {
 				const value = uni.getStorageSync('openid');
 				const value2 = uni.getStorageSync('patientId');
 				if (value && value2) {
@@ -218,10 +225,13 @@
 						url: '/pages/login/login'
 					})
 				}
-				}, 50)
+
+
+
 			},
 			//跳转商城
 			goshopping() {
+				// this.openPopup();
 				setTimeout(e => {
 					const value = uni.getStorageSync('openid');
 					const value2 = uni.getStorageSync('patientId');
@@ -237,27 +247,34 @@
 							url: '/pages/login/login'
 						})
 					}
+
 				}, 0)
 			},
 			//问诊平台
 			goconsultationplatform() {
-				this.openPopup();
-				setTimeout(e => {
 				const value = uni.getStorageSync('openid');
 				const value2 = uni.getStorageSync('patientId');
-					if (value && value2) {
+				const value3 = uni.getStorageSync('region');
+				if (value && value2 &&value3!=3) {
 					uni.navigateTo({
 						url: '/pagesB/consultationplatform/consultationplatform',
 					})
-					} else {
+				} else if(!value && !value2) {
 					this.$refs.uToast.show({
 						title: '您未登录,请先登录',
 						type: 'error',
 						duration: '1000',
 						url: '/pages/login/login'
 					})
+				}else if(value3==3){
+					this.$refs.uToast.show({
+						title: '请重新选择区域',
+						type: 'error',
+						duration: '1000',
+
+					})
 				}
-				}, 0)
+
 			},
 		},
 		//1.分享给朋友

pagesB/consultationplatform/consultationplatform.vue

@@ -71,20 +71,17 @@
 			};
 		},
 		onLoad() {
+			this.region = uni.getStorageSync('region')
 			this.baseurl = baseurl
-			this.info()
 			this.selectDepartmentinfo();
 		},
 		methods: {
 			info() {
-				this.region = uni.getStorageSync('region')
-				if (this.region == 3) {
 					this.$refs.uToast.show({
 						title: '当前地区不支持，请重新选择区域',
 						type: 'error',
 						duration: '2000',
 					})
-				}
 			},
 			//人员
 			selectHospitalPersonInfo() {
@@ -120,9 +117,15 @@
 			},
 			//图文问诊
 			goimagetextConsultation() {
+				if(this.region != 3){
 					uni.navigateTo({
 						url: '/pagesB/imagetextConsultation/imagetextConsultation'
 					})
+
+				}else{
+					this.info()
+				}
+
 			},
 			//医生详情
 			// godoctordetails() {