修改

api/pages/homepage/homepage.js

@@ -22,7 +22,7 @@ export function getCurrentUser(openid, cityCode) {
 	})
 }
 // 获取签约信息
-export function detail(identity,region) {
+export function detail(identity, region) {
 	return request({
 		url: `/applet/signinfo/detail/${identity}`,
 		method: 'GET',
@@ -32,3 +32,14 @@ export function detail(identity,region) {
 		},
 	})
 }
+
+//是否注册
+export function checkSignApply(identity, region) {
+	return request({
+		url: `/applet/sign/apply/checkSignApply/${identity}`,
+		method: 'GET',
+		header: {
+			region: region,
+		},
+	})
+}

pages.json

@@ -495,7 +495,6 @@
 					"onReachBottomDistance": 40, //距离底部多远时触发 单位为px
 					"enablePullDownRefresh": true //设置参数为true
 				}
-
 			}, {
 				"path": "selectInstitution/selectInstitution",
 				"style": {

pages/homepage/homepage.vue

@@ -68,8 +68,8 @@
 	import {
 		getOpenId,
 		getCurrentUser,
-		detail
+		detail,
-
+		checkSignApply
 	} from '@/api/pages/homepage/homepage.js'
 	export default {
 		data() {
@@ -79,6 +79,7 @@
 				identity: '',
 				region: '',
 				openid: '',
+				checkSign: null,
 			}
 		},
 		onLoad() {
@@ -86,43 +87,36 @@
 		},
 		onShow() {
 			this.userinfo = uni.getStorageSync('userinfo');
-			this.region = this.userinfo.cityCode;
+			if (this.userinfo) {
-			this.openid = this.userinfo.openid;
+				checkSignApply(this.userinfo.cardNo, '1').then(res => {
-			this.identity = this.userinfo.cardNo;
+					if (res.code != 0) {
-			if (!this.openid && !this.region) {
+						this.checkSign = true
-				// that.appPersonallist = null
+					}
-				this.$refs.uToast.show({
-					title: '您未登录,请先登录',
-					type: 'error',
-					duration: '1000',
-				})
-			} else {
-				getCurrentUser(this.openid, this.region).then(res => {
-					this.patientName = res.data.patientName
-					uni.setStorageSync('patientId', res.data.id);
-					// if (!res.data) {
-					// 	// 注册
-					// }
 				})
 			}
 		},
 		methods: {
 			// 登录
 			login() {
-				this.gologin();
+				uni.navigateTo({
+					url: "/pages/login/login"
+				})
 			},
 			gologin() {
-				this.$refs.uToast.show({
+				if (!this.userinfo) {
-					title: '您未登录,请先登录',
+					this.$refs.uToast.show({
-					type: 'error',
+						title: '您未登录,请先登录',
-					duration: '1000',
+						type: 'error',
-					url: '/pages/login/login'
+						duration: '1000',
-				})
+						url: '/pages/login/login'
+					})
+					return
+				}
 			},
 			// 签约信息
 			detailinfo(url1, url2) {
 				detail(this.identity, this.region).then(res => {
-				// detail('372424194703207523', '1').then(res => {
+					// detail('372424194703207523', '1').then(res => {
 					if (res.code == 200) {
 						uni.navigateTo({
 							url: url2 + `?item=${JSON.stringify(res.data)}`
@@ -139,98 +133,100 @@
 			},
 			// 家医签约
 			goonline() {
-				uni.navigateTo({
+				this.gologin();
-					url:"/pagesC/Onlinesigning/Onlinesigning"
+				if (!this.checkSign) {
-				})
+					this.$refs.uToast.show({
-				// this.detailinfo('/pagesC/Onlinesigning/Onlinesigning', '/pagesB/mysigning/mysigning')
+						title: '未签约，请先签约',
-				if (!this.userinfo && !this.identity) {
+						type: 'error',
-					// this.gologin();
+						duration: '1000',
+						url: "/pagesC/Onlinesigning/Onlinesigning"
+					})
 				} else {
-					// this.detailinfo('/pagesC/Onlinesigning/Onlinesigning', '/pagesB/mysigning/mysigning')
+					uni.navigateTo({
+						url: "/pagesB/mysigning/mysigning"
+					})
 				}
 			},
 			// 积分兑换
 			count() {
-				if (!this.userinfo && !this.identity) {
+				this.gologin();
-					this.gologin();
+				if (!this.checkSign) {
+					this.$refs.uToast.show({
+						title: '未签约，请先签约',
+						type: 'error',
+						duration: '1000',
+						url: "/pagesC/Onlinesigning/Onlinesigning"
+					})
 				} else {
-					this.detailinfo('', '')
+					uni.navigateTo({
+						url: ""
+					})
 				}
 			},
 			// 健康档案
 			goHealthrecords() {
-				if (!this.userinfo && !this.identity) {
+				this.gologin();
-					this.gologin();
+				uni.navigateTo({
-				} else {
+					url: "/pagesC/Healthrecords/Healthrecords"
-					// this.detailinfo('', '')
+				})
-					uni.navigateTo({
-						url: '/pagesC/Healthrecords/Healthrecords'
-					})
-				}
 			},
 			// 筛查记录
 			gorecords() {
-				if (!this.userinfo && !this.identity) {
+				this.gologin();
-					this.gologin();
+				uni.navigateTo({
-				} else {
+					url: "/pagesC/Screeningrecords/Screeningrecords"
-					// this.detailinfo('', '')
+				})
-					uni.navigateTo({
-						url: '/pagesC/Screeningrecords/Screeningrecords'
-					})
-				}
 			},
 			// 健康自评
 			healthtest() {
-				if (!this.userinfo && !this.identity) {
+				this.gologin();
-					this.gologin();
+				uni.navigateTo({
-				} else {
+					url: "/pagesC/healthtest/healthtest"
-					// this.detailinfo('', '')
+				})
-					uni.navigateTo({
-						url: '/pagesC/healthtest/healthtest'
-					})
-				}
 			},
 			// 体征检测
 			sign() {
-				if (!this.userinfo && !this.identity) {
+				this.gologin();
-					this.gologin();
+				uni.navigateTo({
-				} else {
+					url: "/pagesC/Physicalexamination/Physicalexamination"
-					// this.detailinfo('', '')
+				})
-					uni.navigateTo({
-						url: '/pagesC/Physicalexamination/Physicalexamination'
-					})
-				}
 			},
 			// 服务预约
 			goappoint() {
-				uni.navigateTo({
+				this.gologin();
-					url: '/pagesC/ServiceAppointment/ServiceAppointment'
+				if (!this.checkSign) {
-				})
+					this.$refs.uToast.show({
-				// if (!this.userinfo && !this.identity) {
+						title: '未签约，请先签约',
-					// this.gologin();
+						type: 'error',
-				// } else {
+						duration: '1000',
-					// this.detailinfo('', '/pagesC/ServiceAppointment/ServiceAppointment')
+						url: "/pagesC/Onlinesigning/Onlinesigning"
-				// }
+					})
-			},
-			// 服务记录
-			servicerecord() {
-				if (!this.userinfo && !this.identity) {
-					this.gologin();
 				} else {
-					// this.detailinfo('', '')
 					uni.navigateTo({
-						url: '/pagesC/servicerecord/servicerecord'
+						url: "/pagesC/ServiceAppointment/ServiceAppointment"
 					})
 				}
 			},
+			// 服务记录
+			servicerecord() {
+				this.gologin();
+				uni.navigateTo({
+					url: "/pagesC/servicerecord/servicerecord"
+				})
+			},
 			// 我的预约
 			myappointment() {
-				if (!this.userinfo && !this.identity) {
+				this.gologin();
-					this.gologin();
+				if (!this.checkSign) {
+					this.$refs.uToast.show({
+						title: '未签约，请先签约',
+						type: 'error',
+						duration: '1000',
+						url: "/pagesC/Onlinesigning/Onlinesigning"
+					})
 				} else {
-					// this.detailinfo('', '')
 					uni.navigateTo({
-						url: '/pagesC/Myappointment/Myappointment'
+						url: "/pagesC/Myappointment/Myappointment"
 					})
 				}
 			},

pages/login/login.vue

@@ -22,17 +22,16 @@
 			return {
 				phonecode: undefined,
 				logincode: undefined,
-				code:undefined,
+				code: undefined,
 				timer: undefined,
-				scenenurseStationId: undefined,
+				// scenenurseStationId: undefined,
-				codes:'',
 			};
 		},
 		onShow() {
 			this.phonecode = undefined
 			this.logincode = undefined
 			this.code = undefined
-			this.scenenurseStationId = uni.getStorageSync('scenenurseStationId');
+			// this.scenenurseStationId = uni.getStorageSync('scenenurseStationId');
 		},
 		methods: {
 			getPhoneNumberp(val) {
@@ -42,73 +41,53 @@
 					wx.login({
 						provider: 'weixin',
 						success: function(loginRes) {
-							console.log(loginRes)
-							
-							 // uni.$emit('code',loginRes.code)
 							that.code = loginRes.code
-							isRegistered(that.code).then(resp=>{
-								console.log(resp,'0000')
-								if(!resp.data){
-									uni.navigateTo({
-										url:`/pages/register/register?code=${that.logincode}`
-									})
-															
-								}else{
-									uni.setStorageSync('userinfo', resp.data);
-										uni.switchTab({
-										url:'/pages/homepage/homepage'
-										
-									})
-								
-						
-								}
-								
-							}),
-							that.codes=that.code
 							that.login()
-							
-							
-							
 						}
 					});
 				}
-			},
-			// 是否注册
-			isRegisteredget(){
-		
-				
 			},
 			login() {
 				let that = this;
-				console.log(that.codes,'9999')
+				getWeChatUser(that.code).then(res => {
-				getWeChatUser(that.codes).then(res => {
 					if (res.code == 200) {
 						uni.setStorageSync("openid", res.data)
-						// uni.setStorageSync("patientId", res.data.id)
+						isRegistered(that.code).then(resp => {
-						// uni.setStorageSync("phone", res.data.phone)
+							if (!resp.data) {
-						// this.$refs.uToast.show({
+								that.$refs.uToast.show({
-						// 	title: '登录成功',
+									title: '未注册,请先注册',
-						// 	type: 'success',
+									type: 'error',
-						// 	duration: '1500'
+									duration: '1500',
-						// })
+									url: '/pages/register/register',
-						// console.log(this.logincode)
+								})
-						// this.phonecode = undefined
+							} else {
-						// this.logincode = undefined
+								getCurrentUser(that.openid, that.region).then(res => {
-						// uni.setStorageSync("Refresh", 'Refresh')
+									if (res.code == 200) {
-						// if (this.timer) {
+										that.$refs.uToast.show({
-						// 	clearTimeout(this.timer)
+											title: '登录成功',
-						// }
+											type: 'success',
-						// this.timer = setTimeout(e => {
+											duration: '1500'
-						// 	uni.navigateBack({
+										})
-						// 		delta: 1
+										uni.setStorageSync('patientId', res.data.id);
-						// 	})
+										uni.setStorageSync('userinfo', resp.data);
-						// }, 500)
+										if (this.timer) {
-					} else {
+											clearTimeout(this.timer)
-						// this.$refs.uToast.show({
+										}
-						// 	title: '登录失败',
+										this.timer = setTimeout(e => {
-						// 	type: 'error',
+											uni.navigateBack({
-						// 	duration: '1500'
+												delta: 1
-						// })
+											})
+										}, 500)
+									} else {
+										that.$refs.uToast.show({
+											title: '登录失败',
+											type: 'error',
+											duration: '1500'
+										})
+									}
+								})
+							}
+						})
 					}
 				})
 			},
@@ -116,7 +95,7 @@
 				var that = this
 				uni.clearStorageSync();
 
-					that.login()
+				that.login()
 				// createMobileToken().then(res => {
 				// 	uni.setStorageSync("token", res.data.token)
 				// 	if (this.scenenurseStationId) {

pages/register/register.vue

@@ -41,7 +41,7 @@
 				</u-form-item>
 				<view class="name">
 					所属区域
-					<view class="select"  @tap='showPicker'>
+					<view class="select" @tap='showPicker'>
 						<text v-if="!address">请选择所属区域</text>
 						<text v-else class="testitem">{{address}}</text>
 						<!-- <image src="../../static/huijiantou.png" mode=""></image> -->
@@ -72,7 +72,7 @@
 					<view class="select" @tap="godisease">
 						<!-- <text v-if="!query.diseaseInfoList">请选择基础疾病</text> -->
 						<ld-select :multiple="true" :list="options" label-key="label" value-key="value"
-							placeholder="请选择"  v-model="value2" @change="selectChange" @cancel="cancel"
+							placeholder="请选择" v-model="value2" @change="selectChange" @cancel="cancel"
 							@confirm="confirm"></ld-select>
 						<!-- <text v-else v-for="(item,index) in query.diseaseInfoList">{{item.diseaseName}}</text>
 						<image src="../../static/huijiantou.png" mode=""></image> -->
@@ -127,6 +127,9 @@
 </template>
 
 <script>
+	import {
+		getCurrentUser,
+	} from '@/api/pages/homepage/homepage.js'
 	import {
 		AppIdentification
 	} from '@/api/pagesB/AppIdentification/index.js'
@@ -197,7 +200,6 @@
 					value: '0',
 					label: '无'
 				}],
-
 				// checked:false,
 				// chooseLocation: '', //地图选址
 				arealist: [], //区街道list
@@ -214,7 +216,6 @@
 					headPictureUrl: '',
 					couponId: null,
 					patientName: "",
-
 					cardNo: "",
 					phone: "",
 					address: "",
@@ -227,7 +228,7 @@
 					patientId: '',
 					locationName: '',
 					sex: '',
-					sexname:'',
+					sexname: '',
 					birthDate: '',
 					cityCode: '1'
 				},
@@ -289,7 +290,7 @@
 		// },
 		methods: {
 			onChange(e) {
-				this.selected=e
+				this.selected = e
 				// console.log(e)
 				// this.allChecked = !this.allChecked;
 				// this.selected = e.detail.value;
@@ -298,21 +299,12 @@
 			selectChange(val) {
 				console.log(val);
 			},
-			cancel() {
+			cancel() {},
-
-			},
 			confirm(e) {
 				this.query.diseaseList = e.map(Number)
 				console.log(e)
-
 			},
 			submit() {
-				console.log(this.query)
-				// this.query.openid = uni.getStorageSync('openid');
-				// uni.navigateTo({
-				// 	url: '/pagesB/information/information'
-				// })
-
 				var that = this
 				that.query.openid = uni.getStorageSync('openid');
 				if (that.query.sexname == '男') {
@@ -320,15 +312,12 @@
 				} else if (that.query.sexname == '女') {
 					that.query.sex = 'FEMALE';
 				}
-				if(that.query.sex==""){
+				if (that.query.sex == "") {
 					that.$refs.uToast.show({
 						title: '请选择性别',
 						type: 'error'
 					})
-
 				}
-				console.log(that.selected)
-
 				if (!that.query.locationName) {
 					that.$refs.uToast.show({
 						title: '请选择所在位置',
@@ -342,38 +331,37 @@
 					})
 				}
 				that.$refs.uForm.validate(valid => {
-					console.log(valid)
 					if (valid) {
 						if (!that.selected) {
 							that.$refs.uToast.show({
 								title: '请审核并同意用户协议',
 								type: 'error'
 							})
-						}else{
+						} else {
 							registerdata(that.query).then(res => {
-								if (res.code == 500) {
+								if (res.code == 200) {
-									that.$refs.uToast.show({
+									getCurrentUser(that.query.openid, '1').then(res => {
-										title: res.msg,
+										// uni.setStorageSync('patientId', res.data.id);
-										type: 'error',
+										// uni.setStorageSync('patientName', res.data.patientName);
+										uni.setStorageSync("userinfo", res.data)
 									})
-								}else{
-									uni.setStorageSync("userinfo", that.query)
 									that.$refs.uToast.show({
 										title: '注册成功',
 										type: 'success',
 										duration: '1000',
 									})
 									uni.switchTab({
-										url: '/pages/homepage/homepage' ,
+										url: '/pages/homepage/homepage',
-										});
+									});
+								} else {
+									that.$refs.uToast.show({
+										title: res.msg,
+										type: 'error',
+									})
 								}
-
 							})
 						}
-
+					} else {}
-					} else {
-						console.log('验证失败');
-					}
 				});
 			},
 			// 性别
@@ -389,10 +377,7 @@
 				uni.navigateTo({
 					url: '/pages/facecollection/facecollection'
 				})
-
 			},
-
-
 			//提交信息
 			// informationinfo() {
 			// 	var that = this
@@ -640,92 +625,101 @@
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-			.Agreement{
-				width: 100%;
-				background-color: #fff;
-				text-align: center;
-				height: 1000rpx;
-				position: absolute;
-				top:5%;
-				font-size: 30rpx;
-				.title{
-					height: 100rpx;
-					line-height: 100rpx;
-					border-bottom: 1px solid #eeeeee;
-					font-size: 34rpx;
-					margin: 0px auto;
-					width: 100%;
-					text-align: center;
-				}
-				.scroll-Y{
-						height:830rpx ;
-					overflow-y:scroll;
-					text-align: left;
-					text-indent: 2em;
-				}
-				.cancel {
-					height:70rpx;
-					line-height: 70rpx;
-					font-size: 32rpx;
-					background-color: #F4F5F7;
-					position: absolute;
-					border-top: 1rpx solid #000000;
-					bottom:0;
-					right:0;
-					width: 50%;
-					color: #000000;
-				}
-				.determine {
-					height:70rpx;
-					line-height: 70rpx;
-					font-size: 32rpx;
-					width: 50%;
-					color: #F4F5F7;
-					background: #26A888;
-					position: absolute;
-					bottom:0;
-					left:0;
-				}
-			}
-			.radio-content {
-				margin: 50rpx auto;
-				width: 70%;
-				text-align: center;
-				font-size: 28rpx;
-				position: relative;
-				.agreement {
-					position: absolute;
-					top:50%;
-					left:20%;
-					transform: translateY(-50%);
-					color: #878987;
-					}
-				.radio-right {
-					height: 100rpx;
 
-					.radio {
+		.Agreement {
-						display: inline-block;
+			width: 100%;
-						width: 50rpx;
+			background-color: #fff;
-						height: 50rpx;
+			text-align: center;
-						border-radius: 70%;
+			height: 1000rpx;
-						border: 2rpx solid #178ffb;
+			position: absolute;
+			top: 5%;
+			font-size: 30rpx;
+
+			.title {
+				height: 100rpx;
+				line-height: 100rpx;
+				border-bottom: 1px solid #eeeeee;
+				font-size: 34rpx;
+				margin: 0px auto;
+				width: 100%;
+				text-align: center;
+			}
+
+			.scroll-Y {
+				height: 830rpx;
+				overflow-y: scroll;
+				text-align: left;
+				text-indent: 2em;
+			}
+
+			.cancel {
+				height: 70rpx;
+				line-height: 70rpx;
+				font-size: 32rpx;
+				background-color: #F4F5F7;
+				position: absolute;
+				border-top: 1rpx solid #000000;
+				bottom: 0;
+				right: 0;
+				width: 50%;
+				color: #000000;
+			}
+
+			.determine {
+				height: 70rpx;
+				line-height: 70rpx;
+				font-size: 32rpx;
+				width: 50%;
+				color: #F4F5F7;
+				background: #26A888;
+				position: absolute;
+				bottom: 0;
+				left: 0;
+			}
+		}
+
+		.radio-content {
+			margin: 50rpx auto;
+			width: 70%;
+			text-align: center;
+			font-size: 28rpx;
+			position: relative;
+
+			.agreement {
+				position: absolute;
+				top: 50%;
+				left: 20%;
+				transform: translateY(-50%);
+				color: #878987;
+			}
+
+			.radio-right {
+				height: 100rpx;
+
+				.radio {
+					display: inline-block;
+					width: 50rpx;
+					height: 50rpx;
+					border-radius: 70%;
+					border: 2rpx solid #178ffb;
+					position: absolute;
+					top: 50%;
+					left: 5%;
+					transform: translateY(-50%);
+
+					.radio-active {
+						width: 16rpx;
+						height: 16rpx;
+						border-radius: 50%;
+						background-color: #178ffb;
 						position: absolute;
-						top:50%;
+						top: 50%;
-						left:5%;
+						left: 50%;
-						transform: translateY(-50%);
+						transform: translate(-50%, -50%);
-						.radio-active {
-							width: 16rpx;
-							height: 16rpx;
-							border-radius: 50%;
-							background-color: #178ffb;
-						position: absolute;
-						top:50%;
-						left:50%;
-						transform: translate(-50%,-50%);
-						}
 					}
 				}
 			}
+		}
 
 		.head {
 			margin-top: 60rpx;
@@ -740,6 +734,7 @@
 
 		.form {
 			margin-top: 106rpx;
+
 			::v-deep .u-input {
 				width: 630rpx;
 				height: 63rpx;

pagesC/Onlinesigning/Onlinesigning.vue

@@ -137,8 +137,6 @@
 					<u-checkbox v-model="item.checked" v-for="(item, index) in crowdslist" :key="index"
 						:name="item.crowdNo" label-size='20rpx'>{{item.crowdName}}</u-checkbox>
 				</u-checkbox-group>
-
-
 				<u-checkbox-group @change="packagescheckboxGroupChange" v-model="query.packagesName"
 					v-if="showGroup == 2" label-size='20rpx'>
 					<u-checkbox v-model="item.checked" v-for="(item, index) in packageslist" :key="index"
@@ -208,6 +206,17 @@
 		methods: {
 			updata() {
 				if (this.radio == 2) {
+					let date = new Date();
+					let year = date.getFullYear();
+					let month = date.getMonth() + 1;
+					let day = date.getDate();
+					if (month < 10) {
+						month = '0' + month;
+					}
+					if (day < 10) {
+						day = '0' + day;
+					}
+					this.query.signTime = year + '-' + month + '-' + day;
 					if (this.query.identity) {
 						this.query.birthday = getBirthday(this.query.identity)
 						let gender = getSex(this.query.identity)