From c1c9243f309a5df21f926150810c8c4b5a813f06 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Fri, 10 Nov 2023 13:57:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/homepage/homepage.vue | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index 0f21139..367a67e 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -59,6 +59,12 @@
 					服务记录
 				</view>
 			</view>
+			<view class="home">
+				<!-- <image src="/static/pageC/health.png" mode=""></image>
+				<view class="name">
+					健康档案
+				</view> -->
+			</view>
 		</view>
 		<view class="contentbottom">
 			<view class="health">
@@ -104,7 +110,7 @@
 			this.openid = uni.getStorageSync('openid');
 			if (uni.getStorageSync('userinfo')) {
 				this.userinfo = uni.getStorageSync('userinfo')
-				this.cityCode = Number(this.userinfo.cityCode);
+				// this.cityCode = this.userinfo.cityCode;
 			}
 			if (this.address == '德州市') {
 				uni.setStorageSync("region", 1)
@@ -167,7 +173,7 @@
 					if (this.region == 3) {
 						this.family()
 					} else {
-						if (this.cityCode == 1 || this.cityCode == 2) {
+						if (this.region == 1 || this.region == 2) {
 							if (this.checkSign == "0") {
 								this.$refs.uToast.show({
 									title: '未签约，请先签约',
@@ -198,7 +204,7 @@
 					if (this.region == 3) {
 						this.family()
 					} else {
-						if (this.cityCode == 1 || this.cityCode == 2) {
+						if (this.region == 1 || this.region == 2) {
 							if (this.checkSign == "0") {
 								this.$refs.uToast.show({
 									title: this.infotitle,
@@ -210,7 +216,8 @@
 									title: this.infotitle,
 									type: 'error',
 								})
-							} else {
+							}
+							else {
 								uni.navigateTo({
 									url: '/pagesB/Behaviorpoints/Behaviorpoints'
 								})
@@ -272,10 +279,10 @@
 				if (!this.userinfo) {
 					this.gologin();
 				} else {
-					// if (this.region == 3) {
-					// 	this.family()
-					// } else {
-					// if (this.cityCode == 1 || this.cityCode == 2) {
+					if (this.region == 3) {
+						this.family()
+					} else {
+					if (this.region == 1 || this.region == 2) {
 					if (this.checkSign == "0") {
 						this.$refs.uToast.show({
 							title: '未签约，请先签约',
@@ -292,11 +299,10 @@
 							url: "/pagesC/ServiceAppointment/ServiceAppointment"
 						})
 					}
-					// } else {
-					// 	this.family()
-					// }
-					// }
-					// }
+					} else {
+						this.family()
+					}
+					}
 				}
 			},
 			// 服务记录
@@ -307,7 +313,7 @@
 					if (this.region == 3) {
 						this.family()
 					} else {
-						if (this.cityCode == 1 || this.cityCode == 2) {
+						if (this.region == 1 || this.region == 2) {
 							if (this.checkSign == "0") {
 								this.$refs.uToast.show({
 									title: '未签约，请先签约',
@@ -338,7 +344,7 @@
 					if (this.region == 3) {
 						this.family()
 					} else {
-						if (this.cityCode == 1 || this.cityCode == 2) {
+						if (this.region == 1 || this.region == 2) {
 							if (this.checkSign == "0") {
 								this.$refs.uToast.show({
 									title: '未签约，请先签约',
@@ -368,3 +374,4 @@
 <style lang="scss">
 	@import "./homepage.scss";
 </style>
+