From de6c8b4c43b182a01e72d9cca0a6116af85e56e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 12 Oct 2023 11:24:37 +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

---
 api/pagesB/Healthknowledge/index.js     |  5 +-
 pages/login/login.vue                   |  2 +-
 pages/medicalservice/medicalservice.vue | 85 +++++++++++--------------
 pages/register/register.vue             |  4 +-
 pagesB/mysigning/mysigning.vue          |  8 ++-
 5 files changed, 50 insertions(+), 54 deletions(-)

diff --git a/api/pagesB/Healthknowledge/index.js b/api/pagesB/Healthknowledge/index.js
index 1958cd3..7fd3111 100644
--- a/api/pagesB/Healthknowledge/index.js
+++ b/api/pagesB/Healthknowledge/index.js
@@ -4,5 +4,8 @@ export function getHeathHousingList(pageNum, pageSize) {
 	return request({
 		url: `/nurseApplet/nearbyNursingStation/getHeathHousingList?pageNum=${pageNum}&pageSize=${pageSize}&informationCategoryType=HEALTH_NOUS`,
 		method: 'get',
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
 	})
-}
+}
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 7b18aa4..dbca6c6 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -68,7 +68,7 @@
 											type: 'success',
 											duration: '1500'
 										})
-										// uni.setStorageSync('patientId', res.data.id);
+										uni.setStorageSync('patientId', res.data.id);
 										uni.setStorageSync('userinfo', resp.data);
 										if (this.timer) {
 											clearTimeout(this.timer)
diff --git a/pages/medicalservice/medicalservice.vue b/pages/medicalservice/medicalservice.vue
index b34a6d2..f86979d 100644
--- a/pages/medicalservice/medicalservice.vue
+++ b/pages/medicalservice/medicalservice.vue
@@ -59,60 +59,51 @@
 				pageNum: 1,
 				pageSize: 5,
 				informationCategoryVOList: [], //咨询信息
-				patientId:'',
+				patientId: '',
+				userInfo: null,
 			};
 		},
 		onShow() {
 			this.pageNum = 1
+			this.patientId = uni.getStorageSync('patientId');
+			this.userInfo = uni.getStorageSync('userinfo')
 			this.getHeathHousing();
 		},
 		methods: {
-			goAppointmentscreening(){
+			goAppointmentscreening() {
 				// 筛查预约
-
-					// this.userInfo
-					let userInfo = uni.getStorageSync('userinfo')
-					if (!userInfo) {
-						uni.showModal({
-							title: "提示",
-							content: "您还未注册，是否去注册？",
-							confirmText: '是',
-							cancelText: '否',
-							success(res) {
-								if (res.confirm) {
-									uni.redirectTo({
-										url: "/pages/register/register"
-									})
-								} else {
-									wx.exitMiniProgram()
-								}
-							},
-						})
-					} else {
-						// if (!uni.getStorageSync('userInfo').identity) {
-						// 	uni.navigateTo({
-						// 		url: '../../pagesB/modifyInfo/modifyInfo'
-						// 	})
-						// 	return
-						// }
-						this.patientId  = uni.getStorageSync('patientId');
-						getScreening(this.patientId).then(res => {
-							if (res.code == 200) {
-								let userinfo = JSON.stringify(userInfo)
-								if (!res.data) {
-									uni.navigateTo({
-										url: `/pagesB/screenorder/screenorder?userinfo=${userinfo}`
-									})
-								} else {
-									uni.navigateTo({
-										url: `/pagesB/orderlist/orderlist?userinfo=${userinfo}`
-									})
-								}
+				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(userInfo)
+							if (!res.data) {
+								uni.navigateTo({
+									url: `/pagesB/screenorder/screenorder?userinfo=${userinfo}`
+								})
+							} else {
+								uni.navigateTo({
+									url: `/pagesB/orderlist/orderlist?userinfo=${userinfo}`
+								})
+							}
+						}
+					})
+				}
 				// uni.navigateTo({
 				// 		url: '/pagesB/screenorder/screenorder'
 				// })
@@ -166,7 +157,7 @@
 				})
 			},
 			// 筛查结果
-			result(){
+			result() {
 				uni.navigateTo({
 					url: '/pagesB/SelectItem/SelectItem'
 				})
@@ -212,4 +203,4 @@
 
 <style lang="scss">
 	@import "./medicalservice.scss";
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 60ba0ad..e067922 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -332,8 +332,8 @@
 							registerdata(that.query).then(res => {
 								if (res.code == 200) {
 									getCurrentUser(that.query.openid, '1').then(res => {
-										// uni.setStorageSync('patientId', res.data.id);
-										// uni.setStorageSync('patientName', res.data.patientName);
+										uni.setStorageSync('patientId', res.data.id);
+										uni.setStorageSync('patientName', res.data.patientName);
 										uni.setStorageSync("userinfo", res.data)
 									})
 									that.$refs.uToast.show({
diff --git a/pagesB/mysigning/mysigning.vue b/pagesB/mysigning/mysigning.vue
index eb610f0..f9425a4 100644
--- a/pagesB/mysigning/mysigning.vue
+++ b/pagesB/mysigning/mysigning.vue
@@ -86,13 +86,14 @@
 		data() {
 			return {
 				list: {},
+				userInfo: null,
 			};
 		},
 		methods: {
 			// 签约信息
-			detailinfo(url1, url2) {
-				detail(this.identity, this.region).then(res => {
-					// detail('372424194703207523', '1').then(res => {
+			detailinfo() {
+				// detail(this.userInfo.cardNo, this.region).then(res => {
+				detail('372424194703207523', '1').then(res => {
 					if (res.code == 200) {
 						uni.navigateTo({
 							url: url2 + `?item=${JSON.stringify(res.data)}`
@@ -136,6 +137,7 @@
 			this.list = JSON.parse(options.item)
 			this.list.crowdsName = this.list.crowdsName.split(',')
 			this.list.packagesName = this.list.packagesName.split(',')
+			this.userInfo = uni.getStorageSync('userinfo')
 		}
 	}
 </script>