修改

pages.json

@@ -403,7 +403,6 @@
 					"enablePullDownRefresh": false
 				}
 			}
-
 		]
 	}, {
 		"root": "pagesC",
@@ -495,7 +494,6 @@
 					"navigationBarTitleText": "咨询医生",
 					"enablePullDownRefresh": false
 				}
-
 			}
 		]
 	}],

pages/homepage/homepage.vue

@@ -74,57 +74,42 @@
 	export default {
 		data() {
 			return {
-				title: 'Hello',
 				patientName: '',
 				userinfo: {},
 				identity: '',
-				cityCode:'',
+				region: '',
-				Code:'',
+				openid: '',
 			}
 		},
 		onLoad() {
 			// this.login()
 		},
 		onShow() {
-			var that = this
 			this.userinfo = uni.getStorageSync('userinfo');
-
+			this.region = this.userinfo.cityCode;
-			this.cityCode = this.userinfo.cityCode;
+			this.openid = this.userinfo.openid;
-			var openid = this.userinfo.openid;
+			this.identity = this.userinfo.cardNo;
-			that.identity = this.userinfo.cardNo;
+			if (!this.openid && !this.region) {
-			if (!openid && !that.cityCode) {
 				// that.appPersonallist = null
-				that.$refs.uToast.show({
+				this.$refs.uToast.show({
 					title: '您未登录,请先登录',
 					type: 'error',
 					duration: '1000',
 				})
-
 			} else {
-
+				getCurrentUser(this.openid, this.region).then(res => {
-			}
-
-			if(openid&&that.cityCode){
-				// isWxBing(openid, cityCode) {
-
-					getCurrentUser(openid,that.cityCode).then(res => {
 					this.patientName = res.data.patientName
 					uni.setStorageSync('patientId', res.data.id);
-						console.log(res);
 					// if (!res.data) {
 					// 	// 注册
 					// }
 				})
-				// }
-
 			}
-
 		},
 		methods: {
 			// 登录
 			login() {
 				this.gologin();
-
 			},
 			gologin() {
 				this.$refs.uToast.show({
@@ -145,7 +130,6 @@
 			},
 			// 签约信息
 			// detailinfo(){
-			// 	this.region=this.cityCode
 			// 	detail(this.identity,this.region).then(res => {
 			// 		this.Code=res.code
 			// 		if(this.Code==500){
@@ -163,42 +147,33 @@
 			// },
 			// 家医签约
 			goonline() {
-				if(!this.userinfo){
+				uni.navigateTo({
-					this.gologin();
+					url: '/pagesC/Signingagency/Signingagency'
+				})
+				if (!this.userinfo && !this.identity) {
+					// this.gologin();
 				} else {
-					if(this.identity){
-						this.region=this.cityCode
 					detail(this.identity, this.region).then(res => {
-							this.Code=res.code
+						if (res.code == 500) {
-							if(this.Code==500){
 							this.$refs.uToast.show({
 								title: '未签约，请先签约',
 								type: 'error',
 								duration: '1000',
-
+								url: '/pagesC/Signingagency/Signingagency'
 							})
-
 						} else {
 							uni.navigateTo({
 								url: '/pagesB/mysigning/mysigning'
 							})
 						}
 					})
-					}else{
-
-
 				}
-
-				}
-
 			},
 			// 积分兑换
 			count() {
-				if(!this.userinfo){
+				if (!this.userinfo && !this.identity) {
 					this.gologin();
 				} else {
-					if(this.identity){
-						this.region=this.cityCode
 					detail(this.identity, this.region).then(res => {
 						this.Code = res.code
 						if (this.Code == 500) {
@@ -215,72 +190,53 @@
 							})
 						}
 					})
-					}else{
-
-
 				}
-
-				}
-
-
 			},
 			// 健康档案
 			goHealthrecords() {
-				if(!this.userinfo){
+				if (!this.userinfo && !this.identity) {
 					this.gologin();
 				} else {
 					uni.navigateTo({
 						url: '/pagesC/Healthrecords/Healthrecords'
 					})
-
 				}
-
 			},
 			// 筛查记录
 			gorecords() {
-				if(!this.userinfo){
+				if (!this.userinfo && !this.identity) {
 					this.gologin();
 				} else {
 					uni.navigateTo({
 						url: '/pagesC/Screeningrecords/Screeningrecords'
 					})
-
 				}
-
 			},
 			// 健康自评
 			healthtest() {
-				if(!this.userinfo){
+				if (!this.userinfo && !this.identity) {
 					this.gologin();
 				} else {
 					uni.navigateTo({
 						url: '/pagesC/healthtest/healthtest'
 					})
-
 				}
-
-
 			},
 			// 体征检测
 			sign() {
-				if(!this.userinfo){
+				if (!this.userinfo && !this.identity) {
 					this.gologin();
 				} else {
 					uni.navigateTo({
 						url: '/pagesC/Physicalexamination/Physicalexamination'
 					})
-
 				}
-
-
 			},
 			// 服务预约
 			goappoint() {
-				if(!this.userinfo){
+				if (!this.userinfo && !this.identity) {
 					this.gologin();
 				} else {
-					if(this.identity){
-						this.region=this.cityCode
 					detail(this.identity, this.region).then(res => {
 						this.Code = res.code
 						if (this.Code == 500) {
@@ -288,26 +244,18 @@
 								title: '未签约，请先签约',
 								type: 'error',
 								duration: '1000',
-
 							})
-
 						} else {
 							uni.navigateTo({
 								url: '/pagesC/ServiceAppointment/ServiceAppointment'
 							})
 						}
 					})
-					}else{
-
-
 				}
-
-				}
-
 			},
 			// 服务记录
 			servicerecord() {
-				if(!this.userinfo){
+				if (!this.userinfo && !this.identity) {
 					this.gologin();
 				} else {
 					uni.navigateTo({
@@ -319,7 +267,7 @@
 			},
 			// 我的预约
 			myappointment() {
-				if(!this.userinfo){
+				if (!this.userinfo && !this.identity) {
 					this.gologin();
 				} else {
 					uni.navigateTo({