From 024044cc11027f31e90176470d894d7d2b0ab240 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Wed, 15 Nov 2023 14:14:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/medicalservice/medicalservice.vue | 161 +++++++++++-------------
 1 file changed, 72 insertions(+), 89 deletions(-)

diff --git a/pages/medicalservice/medicalservice.vue b/pages/medicalservice/medicalservice.vue
index 6d0e74b..452fa02 100644
--- a/pages/medicalservice/medicalservice.vue
+++ b/pages/medicalservice/medicalservice.vue
@@ -43,7 +43,6 @@
 
 <script>
 	import {
-		mapState,
 		mapActions
 	} from "vuex";
 	import {
@@ -73,48 +72,45 @@
 			this.getHeathHousing();
 		},
 		methods: {
+			// 第一种 直接映射
+			...mapActions(["openPopup"]),
 			goAppointmentscreening() {
-				// 筛查预约
-
-				if (!this.userInfo) {
-					uni.showModal({
-						title: "提示",
-						content: "您还未注册，是否去注册？",
-						confirmText: '是',
-						cancelText: '否',
-						success(res) {
-							if (res.confirm) {
-								uni.redirectTo({
-									url: "/pages/register/register"
-								})
-							} else {
-								wx.exitMiniProgram()
+				this.openPopup();
+				setTimeout(e => {
+					// 筛查预约
+					if (!this.userInfo) {
+						uni.showModal({
+							title: "提示",
+							content: "您还未注册，是否去注册？",
+							confirmText: '是',
+							cancelText: '否',
+							success(res) {
+								if (res.confirm) {
+									uni.redirectTo({
+										url: "/pages/register/register"
+									})
+								} else {
+									wx.exitMiniProgram()
+								}
+							},
+						})
+					} else {
+						getScreening(this.patientId).then(res => {
+							if (res.code == 200) {
+								let userinfo = JSON.stringify(this.userInfo)
+								if (!res.data || res.data == null) {
+									uni.navigateTo({
+										url: `/pagesB/screenorder/screenorder?userinfo=${userinfo}`
+									})
+								} else {
+									uni.navigateTo({
+										url: `/pagesB/orderlist/orderlist?userinfo=${userinfo}`
+									})
+								}
 							}
-						},
-					})
-				}
-				 else {
-					getScreening(this.patientId).then(res => {
-						if (res.code == 200) {
-							let userinfo = JSON.stringify(this.userInfo)
-							if (!res.data || res.data == null) {
-								uni.navigateTo({
-									url: `/pagesB/screenorder/screenorder?userinfo=${userinfo}`
-								})
-							} else {
-								uni.navigateTo({
-									url: `/pagesB/orderlist/orderlist?userinfo=${userinfo}`
-								})
-							}
-						}
-					})
-				}
-				// uni.navigateTo({
-				// 		url: '/pagesB/screenorder/screenorder'
-				// })
-				// uni.navigateTo({
-				// 		url: '/pagesB/orderlist/orderlist'
-				// })
+						})
+					}
+				}, 0)
 			},
 			//跳转健康常识item
 			gohealthitem(item) {
@@ -132,7 +128,6 @@
 						url: '/pages/login/login'
 					})
 				}
-
 			},
 			// 健康常识
 			getHeathHousing() {
@@ -146,8 +141,6 @@
 				})
 			},
 			//新人福利
-			// 第一种 直接映射
-			...mapActions(["openPopup"]),
 			gomaterialbenefits() {
 				// 第二种引入
 				// this.$store.dispatch("openPopup");
@@ -188,7 +181,6 @@
 							url: '/pages/login/login'
 						})
 					}
-
 				}, 0)
 			},
 			//健康常识
@@ -207,31 +199,29 @@
 						url: '/pages/login/login'
 					})
 				}
-
 			},
 			// 筛查结果
 			result() {
-				const value = uni.getStorageSync('openid');
-				const value2 = uni.getStorageSync('patientId');
-				if (value && value2) {
-					uni.navigateTo({
-						url: '/pagesB/SelectItem/SelectItem'
-					})
-				} else {
-					this.$refs.uToast.show({
-						title: '您未登录,请先登录',
-						type: 'error',
-						duration: '1000',
-						url: '/pages/login/login'
-					})
-				}
-
-
-
+				this.openPopup();
+				setTimeout(e => {
+					const value = uni.getStorageSync('openid');
+					const value2 = uni.getStorageSync('patientId');
+					if (value && value2) {
+						uni.navigateTo({
+							url: '/pagesB/SelectItem/SelectItem'
+						})
+					} else {
+						this.$refs.uToast.show({
+							title: '您未登录,请先登录',
+							type: 'error',
+							duration: '1000',
+							url: '/pages/login/login'
+						})
+					}
+				}, 50)
 			},
 			//跳转商城
 			goshopping() {
-				// this.openPopup();
 				setTimeout(e => {
 					const value = uni.getStorageSync('openid');
 					const value2 = uni.getStorageSync('patientId');
@@ -247,34 +237,27 @@
 							url: '/pages/login/login'
 						})
 					}
-
 				}, 0)
 			},
 			//问诊平台
 			goconsultationplatform() {
-				const value = uni.getStorageSync('openid');
-				const value2 = uni.getStorageSync('patientId');
-				const value3 = uni.getStorageSync('region');
-				if (value && value2 &&value3!=3) {
-					uni.navigateTo({
-						url: '/pagesB/consultationplatform/consultationplatform',
-					})
-				} 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',
-
-					})
-				}
-
+				this.openPopup();
+				setTimeout(e => {
+					const value = uni.getStorageSync('openid');
+					const value2 = uni.getStorageSync('patientId');
+					if (value && value2) {
+						uni.navigateTo({
+							url: '/pagesB/consultationplatform/consultationplatform',
+						})
+					} else {
+						this.$refs.uToast.show({
+							title: '您未登录,请先登录',
+							type: 'error',
+							duration: '1000',
+							url: '/pages/login/login'
+						})
+					}
+				}, 0)
 			},
 		},
 		//1.分享给朋友
@@ -300,4 +283,4 @@
 
 <style lang="scss">
 	@import "./medicalservice.scss";
-</style>
+</style>
\ No newline at end of file