Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	pages.json

api/pages/homepage/homepage.js

@@ -1,4 +1,4 @@
-import request from "../request.js"
+import request from "../../request.js"
 
 // 获取OpenId
 export function getOpenId(code) {

api/pages/login/index.js

@@ -13,3 +13,13 @@ export function createMobileToken() {
 		method: 'GET'
 	})
 }
+
+
+
+// 获取微信手机号
+export function getwxPhoneNumber(code) {
+	return request({
+		url: `/applet/register/getPhone/${code}`,
+		method: 'GET'
+	})
+}

api/pages/register/register.js

@@ -0,0 +1,10 @@
+import request from "../../request.js"
+
+// 注册
+export function register(data) {
+	return request({
+		url: `/applet/register`,
+		method: 'POST',
+		data: data
+	})
+}

pages.json

@@ -44,18 +44,20 @@
 			"path": "pages/login1/login",
 			"style": {
 				"navigationBarTitleText": "登录",
-				"navigationBarBackgroundColor": "#fff",
+				"enablePullDownRefresh": false
-				"enablePullDownRefresh": false,
-				"navigationBarTextStyle": "black"
 			}
 		},
 		{
 			"path": "pages/register/register",
 			"style": {
 				"navigationBarTitleText": "注册",
-				"navigationBarBackgroundColor": "#fff",
+				"enablePullDownRefresh": false
-				"enablePullDownRefresh": false,
+			}
-				"navigationBarTextStyle": "black"
+		}, {
+			"path": "pages/facecollection/facecollection",
+			"style": {
+				"navigationBarTitleText": "人脸采集",
+				"enablePullDownRefresh": false
 			}
 		}
 	],
@@ -170,14 +172,12 @@
 			}, {
 				"path": "paysuccess/paysuccess",
 				"style": {
-					"navigationBarTitleText": "",
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom"
 				}
 			}, {
 				"path": "ratesuccess/ratesuccess",
 				"style": {
-					"navigationBarTitleText": "",
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom"
 				}
@@ -340,14 +340,21 @@
 		]
 	}, {
 		"root": "pagesC",
-		"pages": [
+		"pages": [{
-			{
 				"path": "appointmenttime/appointmenttime",
 				"style": {
 					"navigationBarTitleText": "服务预约",
 					"enablePullDownRefresh": false
 				}
 			},
+
+			{
+				"path": "Filinginformation/Filinginformation",
+				"style": {
+					"navigationBarTitleText": "查看建档信息",
+					"enablePullDownRefresh": false
+				}
+			},
 			{
 				"path": "Screeningdetails/Screeningdetails",
 				"style": {

pages/facecollection/facecollection.vue

@@ -0,0 +1,393 @@
+<template>
+	<view class="page-content">
+		<view class="containerV">
+			<view class="headerV">
+				<view class="top-tips1">
+					<view>请正对手机，头部匹配摄像区域</view>
+				</view>
+				<view class="top-tips2">
+					请拍摄本人头像
+				</view>
+			</view>
+
+			<view class="contentV">
+				<view class="mark"></view>
+				<image v-if="tempImg" mode="widthFix" :src="tempImg" />
+				<camera v-if='isAuthCamera' :device-position="devicePosition ?'front': 'back'" class="camera"
+					flash="off" resolution='high' />
+				<view v-show="!tempImg && tipsText" class="tipV">{{ tipsText }}</view>
+			</view>
+
+			<view class="footerV">
+				<view style="width: 100%;">
+					<view v-if="!tempImg" style="width: 100%;">
+						<view class="privacyV">
+							<view class="icon"></view>
+							<view class="text">
+								照片隐私<text>安全保障</text>中…
+							</view>
+						</view>
+						<view class="bottom-tips-2"></view>
+						<view class="take-photo-bgV">
+							<!-- 图片上传 -->
+							<view v-show="true" class="btn-change-upload" @click="handleChooseImage" />
+							<!--拍照-->
+							<view class="btn-take-photo" @click="handleTakePhotoClick" />
+							<!-- 切换镜头 -->
+							<view class="btn-change-camera" @click="handleChangeCameraClick" />
+						</view>
+					</view>
+					<view class="confirmV" v-else>
+						<view class="btn-cancel" @click="handleCancelClick">
+							取消
+						</view>
+						<view class="btn-ok" @click="handleOkClick">
+							确定
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tipsText: '', // 错误文案提示
+				tempImg: '', // 本地图片路径
+				cameraEngine: null, // 相机引擎
+				devicePosition: false, // 摄像头朝向
+				isAuthCamera: true, // 是否拥有相机权限
+			}
+		},
+		onLoad(options) {
+			this.initData()
+		},
+		methods: {
+			// 初始化相机引擎
+			initData() {
+				// #ifdef MP-WEIXIN
+				// 1、初始化人脸识别
+				wx.initFaceDetect()
+				// 2、创建 camera 上下文 CameraContext 对象
+				this.cameraEngine = wx.createCameraContext()
+				// 3、获取 Camera 实时帧数据
+				const listener = this.cameraEngine.onCameraFrame((frame) => {
+					if (this.tempImg) {
+						return;
+					}
+					// 4、人脸识别，使用前需要通过 wx.initFaceDetect 进行一次初始化，推荐使用相机接口返回的帧数据
+					wx.faceDetect({
+						frameBuffer: frame.data,
+						width: frame.width,
+						height: frame.height,
+						enablePoint: true,
+						enableConf: true,
+						enableAngle: true,
+						enableMultiFace: true,
+						success: (faceData) => {
+							let face = faceData.faceInfo[0]
+							if (faceData.x == -1 || faceData.y == -1) {
+								this.tipsText = '检测不到人'
+							}
+							if (faceData.faceInfo.length > 1) {
+								this.tipsText = '请保证只有一个人'
+							} else {
+								const {
+									pitch,
+									roll,
+									yaw
+								} = face.angleArray;
+								const standard = 0.5
+								if (Math.abs(pitch) >= standard || Math.abs(roll) >= standard ||
+									Math.abs(yaw) >= standard) {
+									this.tipsText = '请平视摄像头'
+								} else if (face.confArray.global <= 0.8 || face.confArray.leftEye <=
+									0.8 || face.confArray.mouth <= 0.8 || face.confArray.nose <= 0.8 ||
+									face.confArray.rightEye <= 0.8) {
+									this.tipsText = '请勿遮挡五官'
+								} else {
+									this.tipsText = '请拍照'
+									// 这里可以写自己的逻辑了
+								}
+							}
+						},
+						fail: (err) => {
+							if (err.x == -1 || err.y == -1) {
+								this.tipsText = '检测不到人'
+							} else {
+								this.tipsText = err.errMsg || '网络错误，请退出页面重试'
+							}
+						},
+					})
+				})
+				// 5、开始监听帧数据
+				listener.start()
+				// #endif
+			},
+
+			// 切换设备镜头
+			handleChangeCameraClick() {
+				this.devicePosition = !this.devicePosition;
+			},
+
+			// 图片上传
+			handleChooseImage() {
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['original', 'compressed'],
+					sourceType: ['album'],
+					success: (res) => {
+						if (res.errMsg === 'chooseImage:ok') {
+							uni.showLoading({
+								title: '照片上传中...'
+							})
+							console.log("===========:", res.tempFilePaths[0])
+							this.handleOkClick()
+						}
+					},
+					fail: (res) => {
+
+					},
+				});
+			},
+
+			// 拍照点击
+			handleTakePhotoClick() {
+				if (this.tipsText != "" && this.tipsText != "请拍照") {
+					return;
+				}
+
+				uni.getSetting({
+					success: (res) => {
+						if (!res.authSetting['scope.camera']) {
+							this.isAuthCamera = false
+							uni.openSetting({
+								success: (res) => {
+									if (res.authSetting['scope.camera']) {
+										this.isAuthCamera = true;
+									}
+								}
+							})
+						}
+					}
+				})
+				this.cameraEngine.takePhoto({
+					quality: "high",
+					success: ({
+						tempImagePath
+					}) => {
+						this.tempImg = tempImagePath
+						console.log("=======tempImg:", this.tempImg)
+					}
+				})
+			},
+
+			// 点击确定上传
+			handleOkClick() {
+				uni.showLoading({
+					mask: true,
+					title: '校验中...'
+				})
+				// 更新人脸识别图片请求协议：传七牛图片链接				
+				setTimeout(function() {
+					uni.hideLoading()
+					uni.showToast({
+						icon: "none",
+						title: "图片上传成功",
+						duration: 2000,
+					})
+				}, 2000);
+			},
+
+			// 点击 - 取消上传
+			handleCancelClick() {
+				this.tempImg = ''
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.page-content {
+		width: 100%;
+		height: 100%;
+
+		.containerV {
+			width: 100%;
+			height: 100%;
+
+			.headerV {
+				.top-tips1 {
+					margin-top: 60rpx;
+					color: #1C1C1C;
+					font-size: 36rpx;
+					text-align: center;
+				}
+
+				.top-tips2 {
+					margin-top: 20rpx;
+					color: #00AAFF;
+					font-size: 28rpx;
+					text-align: center;
+
+				}
+			}
+
+			.contentV {
+				position: relative;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+
+				height: 661rpx;
+				margin-top: 30rpx;
+
+				.tipV {
+					bottom: 30rpx;
+					position: absolute;
+					line-height: 90rpx;
+					padding-left: 24rpx;
+					padding-right: 24rpx;
+					max-width: calc(100vw - 50rpx * 2);
+					text-align: center;
+					font-size: 30rpx;
+					background: #000000;
+					opacity: 0.75;
+					color: #FFFFFF;
+					border-radius: 16rpx;
+
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+					z-index: 5;
+				}
+
+				.camera {
+					width: 100%;
+					height: 100%;
+				}
+
+				.mark {
+					position: absolute;
+					left: 0;
+					top: 0;
+					z-index: 2;
+					width: 750rpx;
+					height: 100%;
+					background: url("@/static/pages/view_face_background.png") no-repeat center bottom;
+					background-size: 750rpx 661rpx;
+				}
+
+				image {
+					position: absolute;
+					width: 100%;
+					height: 100%;
+					z-index: 3;
+				}
+			}
+
+			.footerV {
+				width: 100%;
+
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: center;
+
+				.privacyV {
+					padding-top: 30rpx;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: center;
+
+					.text {
+						font-size: 30rpx;
+						color: #1C1C1C;
+						text-align: center;
+						line-height: 42rpx;
+						margin-left: 15rpx;
+
+						text {
+							font-size: 30rpx;
+							color: #00AAFF;
+							text-align: center;
+							line-height: 42rpx;
+						}
+					}
+
+					.icon {
+						width: 40rpx;
+						height: 47rpx;
+						background: url("@/static/pages/icon_face_security.png") no-repeat;
+						background-size: 100% auto;
+					}
+
+				}
+
+				.bottom-tips-2 {
+					margin-top: 20rpx;
+					color: #999999;
+					text-align: center;
+					font-size: 26rpx;
+				}
+
+				.take-photo-bgV {
+					width: 100%;
+					margin-top: 30rpx;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: center;
+
+					.btn-take-photo {
+						// 由于左边没有按钮，所以左边要便宜更大，以便是拍照按钮居中
+						margin: 0rpx 80rpx 0rpx 80rpx;
+						width: 196rpx;
+						height: 196rpx;
+						background: url("https://pro-file-qn.ztjy61.com/1003020211103145058685NNR9vlTm.png") no-repeat;
+						background-size: 100% auto;
+					}
+
+					.btn-change-upload {
+						left: 130rpx;
+						width: 80rpx;
+						height: 80rpx;
+						background: url("@/static/pages/icon_face_upload_picture.png") no-repeat;
+						background-size: 100% auto;
+					}
+
+					.btn-change-camera {
+						right: 130rpx;
+						width: 80rpx;
+						height: 80rpx;
+						background: url("@/static/pages/icon_face_switch_cameras.png") no-repeat;
+						background-size: 100% auto;
+					}
+				}
+
+				.confirmV {
+					margin: 200rpx 100rpx 0rpx 100rpx;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: space-between;
+
+					.btn-cancel {
+						font-size: 32rpx;
+						color: #1C1C1C;
+					}
+
+					.btn-ok {
+						font-size: 32rpx;
+						color: #00AAFF;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/homepage/homepage.scss

@@ -45,7 +45,6 @@
 			.health {
 				padding: 30rpx 30rpx 0 30rpx;
 				font-size: 28rpx;
-				font-family: Source Han Sans CN;
 				font-weight: 400;
 				color: #333333;
 				line-height: 38rpx;
@@ -90,14 +89,18 @@
 				top: 12%;
 				left: 7%;
 				font-size: 28rpx;
-				font-family: Source Han Sans CN;
 				font-weight: 400;
 				color: #717070;
 
 				image {
+					vertical-align: middle;
 					width: 22rpx;
 					height: 12rpx;
 				}
+				text{
+					margin-left: 10rpx;
+					display: inline-block;
+				}
 			}
 		}
 	}

pages/homepage/homepage.vue

@@ -4,7 +4,7 @@
 			<image src="/static/pageC/homepage.png" mode=""></image>
 			<view class="loginmount">
 				<image src="/static/pageC/TAB.png" mode=""></image>
-				你好，请登录
+				<text>你好,请登录</text>
 			</view>
 		</view>
 		<view class="contentcenter">
@@ -64,7 +64,10 @@
 </template>
 
 <script>
-	// import { getOpenId, getCurrentUser } from '@/api/pages/api.js'
+	import {
+		getOpenId,
+		getCurrentUser
+	} from '@/api/pages/homepage/homepage.js'
 	export default {
 		data() {
 			return {

pages/login1/login.vue

@@ -1,22 +1,27 @@
 <template>
 	<view class="login">
 		<image src="../../static/logo.png"></image>
-		<button open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">手机号快捷登录</button>
+		<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">手机号快捷登录</button>
 	</view>
 </template>
 
 <script>
+	import {
+		getwxPhoneNumber
+	} from '@/api/pages/login/index.js'
 	export default {
-		data() {
-			return {
-				
-			}
-		},
 		methods: {
 			getPhoneNumber(e) {
-			    console.log(e.detail.code)  // 动态令牌
+				if (e.detail.code) {
-			    console.log(e.detail.errMsg) // 回调信息（成功失败都会返回）
+					getwxPhoneNumber(e.detail.code).then(res => {
-			    console.log(e.detail.errno)  // 错误码（失败时返回）
+						if (res.code == 200) {
+							const phoneNumber = res.data.phone_info.phoneNumber
+							uni.navigateTo({
+								url: `../register/register?phoneNumber=${phoneNumber}`
+							})
+						}
+					})
+				}
 			}
 		}
 	}
@@ -26,11 +31,13 @@
 	.login {
 		text-align: center;
 		margin-top: 50%;
+
 		image {
 			width: 196rpx;
 			height: 203rpx;
 			margin-bottom: 136rpx;
 		}
+
 		button {
 			margin-top: 136rpx;
 			width: 496rpx;

pagesB/Behaviorpoints/Behaviorpoints.vue

@@ -60,21 +60,20 @@
 			//积分页面
 			...mapActions(["integralopenPopup"]),
 			gointegral() {
-				const value = uni.getStorageSync('openid');
+				// const value = uni.getStorageSync('openid');
-				const value2 = uni.getStorageSync('patientId');
+				// const value2 = uni.getStorageSync('patientId');
-				if (value && value2) {
+				// if (value && value2) {
-					this.integralopenPopup();
+				// 	setTimeout(e => {
-					setTimeout(e => {
+				// 		uni.navigateTo({
-						uni.navigateTo({
+				// 			url: `/pagesB/healthybeans/healthybeans?integral=${this.appPersonallist.integral}`
-							url: `/pagesB/healthybeans/healthybeans?integral=${this.appPersonallist.integral}`
+				// 		})
-						})
+				// 	}, 0)
-					}, 0)
+				// } else {
-				} else {
 				uni.navigateTo({
 					url: '/pagesB/PointsMall/PointsMall'
 				})
 				// this.gologin();
-				}
+				// }
 			},
 		},
 	}

pagesC/Filinginformation/Filinginformation.vue

@@ -0,0 +1,176 @@
+<template>
+	<view class="app">
+		<view class="content">
+			<view class="name">
+				姓名
+				<u-input v-model="value" :type="type" :border="border" placeholder="请输入姓名" placeholder-style="font-size: 20rpx;
+				font-family: Source Han Sans CN;font-weight: 400;color: #8E8E8E;" />
+			</view>
+			<view class="name">
+				身份证号
+				<u-input v-model="value" :type="type" :border="border" placeholder="请输入身份证号" placeholder-style="font-size: 20rpx;
+				font-family: Source Han Sans CN;font-weight: 400;color: #8E8E8E;" />
+			</view>
+			<view class="name">
+				手机号码
+				<u-input v-model="value" :type="type" :border="border" placeholder="请输入手机号码" placeholder-style="font-size: 20rpx;
+				font-family: Source Han Sans CN;font-weight: 400;color: #8E8E8E;" />
+			</view>
+			<view class="name">
+				现任区县
+				<view class="select">
+					<text>请选择现任区县</text>
+					<image src="../../static/huijiantou.png" mode=""></image>
+				</view>
+			</view>
+			<view class="name">
+				乡镇
+				<view class="select">
+					<text>请选择乡镇</text>
+					<image src="../../static/huijiantou.png" mode=""></image>
+				</view>
+				<!-- 				<u-input v-model="value" :type="type" :border="border" placeholder="请选择乡镇" placeholder-style="font-size: 20rpx;
+				font-family: Source Han Sans CN;font-weight: 400;color: #8E8E8E;" /> -->
+			</view>
+			<view class="name">
+				村/社区
+				<view class="select">
+					<text>请选择村/社区</text>
+					<image src="../../static/huijiantou.png" mode=""></image>
+				</view>
+
+			</view>
+			<view class="name">
+				详细地址
+				<u-input v-model="value" :type="type" :border="border" placeholder="请输入详细地址" placeholder-style="font-size: 20rpx;
+				font-family: Source Han Sans CN;font-weight: 400;color: #8E8E8E;" />
+			</view>
+			<view class="cancelitem">
+				<view class="cancel">
+					取消
+				</view>
+				<view class="submit">
+					提交申请
+				</view>
+			</view>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				value: '',
+				type: 'text',
+				border: true
+			};
+		},
+
+		methods: {
+			// goapponint() {
+			// 	uni.navigateTo({
+			// 		url: '/pagesC/Screeningdetails/Screeningdetails'
+			// 	});
+			// },
+			// gohealth() {
+			// 	uni.navigateTo({
+			// 		url: '/pagesC/Filinginformation/Filinginformation'
+			// 	});
+			// },
+		},
+	}
+</script>
+
+<style lang="scss">
+	.app {
+		height: 100vh;
+		background-color: #F7F5F5;
+		padding: 30rpx 0 0 0;
+
+		.content {
+			background-color: #fff;
+			position: relative;
+			width: 95%;
+			height: 100%;
+			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 5rpx;
+			margin: 15rpx auto;
+			position: relative;
+			.cancelitem{
+				display: flex;
+				justify-content: space-evenly;
+				padding-top: 60rpx;
+				.cancel{
+					width: 290rpx;
+					height: 62rpx;
+					background: #FFFFFF;
+					border: 1rpx solid #26A888;
+					border-radius: 5rpx;
+					line-height:62rpx;
+					color: #26A888;
+					text-align: center;
+				}
+				.submit{
+					width: 290rpx;
+					height: 62rpx;
+					background: #26A888;
+					border-radius: 5rpx;
+					line-height:62rpx;
+					color: #fff;
+					text-align: center;
+				}
+			}
+
+			.name {
+				padding: 25rpx 30rpx 0 30rpx;
+				font-size: 30rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #333333;
+				line-height: 38rpx;
+
+				::v-deep .u-input {
+					width: 636rpx;
+					height: 63rpx;
+					background: #F6F6F6;
+					margin: 12rpx auto;
+					border: none;
+					border-radius: 5rpx;
+				}
+
+				.select {
+					width: 636rpx;
+					height: 63rpx;
+					background: #F6F6F6;
+					margin: 12rpx auto;
+					// border: 1rpx solid #F6F6F6; 
+					border-radius: 5rpx;
+					display: flex;
+					position: relative;
+
+					text {
+						padding-left: 20rpx;
+						line-height: 63rpx;
+						font-size: 20rpx;
+						font-family: Source Han Sans CN;
+						font-weight: 400;
+						color: #8E8E8E;
+					}
+
+					image {
+						width: 9rpx;
+						height: 17rpx;
+						position: absolute;
+						right: 40rpx;
+						top: 50%;
+						-webkit-transform: translateY(-50%);
+						transform: translateY(-50%);
+					}
+				}
+			}
+
+		}
+	}
+</style>

pagesC/Healthrecords/Healthrecords.vue

@@ -1,7 +1,10 @@
 <template>
 	<view class="app">
 		<view class="content">
-			<view class="health">
+			<view class="picture">
+				引导图示
+			</view>
+			<view class="health" @tap="gohealth">
 				前往建档
 			</view>
 		</view>
@@ -20,6 +23,11 @@
 					url: '/pagesC/Screeningdetails/Screeningdetails'
 				});
 			},
+			gohealth() {
+				uni.navigateTo({
+					url: '/pagesC/Filinginformation/Filinginformation'
+				});
+			},
 		},
 	}
 </script>
@@ -38,6 +46,29 @@
 			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 			border-radius: 5rpx;
 			margin: 15rpx auto;
+
+			.picture {
+				position: absolute;
+				// display: flex;
+				// width: 100rpx;
+				// background-color: red;
+				// flex-direction: row;
+				// flex-direction: column;
+				// justify-content: center;
+				align-items: center;
+				height: 100rpx;
+				top: 50%;
+				left: 50%;
+				transform: translateY(-50%);
+				transform: translateX(-50%);
+				// align-items: center;
+				font-size: 28rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 500;
+				color: #868585;
+				line-height: 38rpx;
+			}
+
 			.health {
 				margin: 0 auto;
 				left: 50%;
@@ -52,5 +83,6 @@
 				text-align: center;
 				color: #fff;
 			}
-		}}
+		}
+	}
 </style>

pagesC/Screeningdetails/Screeningdetails.vue

@@ -71,6 +71,7 @@
 		height: 100vh;
 		background-color: #F7F5F5;
 		padding: 30rpx 0 0 0;
+		overflow: scroll;
 
 		.content {
 			background-color: #fff;