From 54af0a0bd07dacceb2a1e4dbb1c4df53e73516e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Wed, 15 Nov 2023 10:31:52 +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/homepage/homepage.vue             | 108 ++++++++--------
 pages/medicalservice/medicalservice.vue | 161 +++++++++++-------------
 pages/myinformation/myinformation.vue   |  17 +--
 store/index.js                          |  14 +--
 4 files changed, 143 insertions(+), 157 deletions(-)

diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index 6c59c04..3fc3557 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -77,6 +77,9 @@
 		detail,
 		checkSignApply
 	} from '@/api/pages/homepage/homepage.js'
+	import {
+		mapActions
+	} from "vuex";
 	export default {
 		data() {
 			return {
@@ -104,6 +107,7 @@
 			} else {}
 		},
 		methods: {
+			...mapActions(["openPopup"]),
 			//跳转选择地址
 			city() {
 				uni.navigateTo({
@@ -134,34 +138,37 @@
 			},
 			// 家医签约
 			goonline() {
-				if (!this.userinfo) {
-					this.gologin();
-				} else if (this.userinfo) {
-					if (this.region == 3) {
-						this.family()
-					} else {
-						if (this.region == 1 || this.region == 2) {
-							if (this.checkSign == "0") {
-								this.$refs.uToast.show({
-									title: '未签约，请先签约',
-									type: 'error',
-									url: "/pagesC/Onlinesigning/Onlinesigning"
-								})
-							} else if (this.checkSign == "01") {
-								this.$refs.uToast.show({
-									title: this.infotitle,
-									type: 'error',
-								})
-							} else {
-								uni.navigateTo({
-									url: "/pagesB/mysigning/mysigning"
-								})
-							}
-						} else {
+				this.openPopup();
+				setTimeout(e => {
+					if (!this.userinfo) {
+						this.gologin();
+					} else if (this.userinfo) {
+						if (this.region == 3) {
 							this.family()
+						} else {
+							if (this.region == 1 || this.region == 2) {
+								if (this.checkSign == "0") {
+									this.$refs.uToast.show({
+										title: '未签约，请先签约',
+										type: 'error',
+										url: "/pagesC/Onlinesigning/Onlinesigning"
+									})
+								} else if (this.checkSign == "01") {
+									this.$refs.uToast.show({
+										title: this.infotitle,
+										type: 'error',
+									})
+								} else {
+									uni.navigateTo({
+										url: "/pagesB/mysigning/mysigning"
+									})
+								}
+							} else {
+								this.family()
+							}
 						}
 					}
-				}
+				}, 50)
 			},
 			// 积分兑换
 			count() {
@@ -242,34 +249,37 @@
 			},
 			// 服务预约
 			goappoint() {
-				if (!this.userinfo) {
-					this.gologin();
-				} else {
-					if (this.region == 3) {
-						this.family()
+				this.openPopup();
+				setTimeout(e => {
+					if (!this.userinfo) {
+						this.gologin();
 					} else {
-						if (this.region == 1 || this.region == 2) {
-							if (this.checkSign == "0") {
-								this.$refs.uToast.show({
-									title: '未签约，请先签约',
-									type: 'error',
-									url: "/pagesC/Onlinesigning/Onlinesigning"
-								})
-							} else if (this.checkSign == "01") {
-								this.$refs.uToast.show({
-									title: this.infotitle,
-									type: 'error',
-								})
-							} else {
-								uni.navigateTo({
-									url: "/pagesC/ServiceAppointment/ServiceAppointment"
-								})
-							}
-						} else {
+						if (this.region == 3) {
 							this.family()
+						} else {
+							if (this.region == 1 || this.region == 2) {
+								if (this.checkSign == "0") {
+									this.$refs.uToast.show({
+										title: '未签约，请先签约',
+										type: 'error',
+										url: "/pagesC/Onlinesigning/Onlinesigning"
+									})
+								} else if (this.checkSign == "01") {
+									this.$refs.uToast.show({
+										title: this.infotitle,
+										type: 'error',
+									})
+								} else {
+									uni.navigateTo({
+										url: "/pagesC/ServiceAppointment/ServiceAppointment"
+									})
+								}
+							} else {
+								this.family()
+							}
 						}
 					}
-				}
+				}, 50)
 			},
 			// 服务记录
 			servicerecord() {
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
diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue
index b7c0743..deb7995 100644
--- a/pages/myinformation/myinformation.vue
+++ b/pages/myinformation/myinformation.vue
@@ -204,9 +204,6 @@
 </template>
 
 <script>
-	import {
-		mapActions
-	} from "vuex";
 	import {
 		appPersonal,
 		getFamilyList,
@@ -233,7 +230,7 @@
 				list: {},
 				showhome: false, //切换
 				familyList: null, //切换列表
-				region:'',//城市
+				region: '', //城市
 				infotitle: null,
 			};
 		},
@@ -417,7 +414,7 @@
 					duration: '3000',
 				})
 			},
-			
+
 			// 签约信息
 			Signing() {
 				if (!this.appPersonallist) {
@@ -562,17 +559,13 @@
 				// }
 			},
 			//积分页面
-			...mapActions(["integralopenPopup"]),
 			gointegral() {
 				const value = uni.getStorageSync('userinfo');
 				const value2 = uni.getStorageSync('patientId');
 				if (value && value2) {
-					this.integralopenPopup();
-					setTimeout(e => {
-						uni.navigateTo({
-							url: `/pagesB/healthybeans/healthybeans?integral=${this.appPersonallist.integral}`
-						})
-					}, 0)
+					uni.navigateTo({
+						url: `/pagesB/healthybeans/healthybeans?integral=${this.appPersonallist.integral}`
+					})
 				} else {
 					this.gologin();
 				}
diff --git a/store/index.js b/store/index.js
index 650cfbf..9838337 100644
--- a/store/index.js
+++ b/store/index.js
@@ -8,22 +8,22 @@ const store = new Vuex.Store({
 	mutations: {
 		//相当于同步的操作
 		//点击确认
-		subscribesuccess(state) {
+		integralsubscribesuccess(state) {
 			wx.requestSubscribeMessage({
 				tmplIds: [
-					'-IxZeEkkXFhoSwGtBHbipKQ6kjEmkdTkswKeOypSsNQ',
-					'e1JRZaw1OfTz2b6X9DTqqaJtV4rXEt7uhwXoZLDb_eA',
-					'nUB9HRbqQXOVuTpkKBIHMgzWlNq6touzxf5QYBiMkbU',
+					// 'S_c9bR4znSWpXg-6ACIMn7AkaR11dzo113XM8w4CKz0'
 				],
 				success(res) {},
 				fail(err) {},
 				complete(scc) {}
 			})
 		},
-		integralsubscribesuccess(state) {
+		subscribesuccess(state) {
 			wx.requestSubscribeMessage({
 				tmplIds: [
-					'S_c9bR4znSWpXg-6ACIMn7AkaR11dzo113XM8w4CKz0'
+					'8InV9jXDT5sMj9OWfXEvlLQGlw2UaWfZ9OBMFxufmfk',
+					'2wn1BssReKjZasxKKZRWxBN0VqSmGmkuhc3AhTr18I0',
+					'MSSKCxOdtMUkY1ACu-u3itz8Vh_w5xDkO2llAOGwElU',
 				],
 				success(res) {},
 				fail(err) {},
@@ -60,4 +60,4 @@ const store = new Vuex.Store({
 		},
 	}
 })
-export default store
+export default store
\ No newline at end of file