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

pages/register/register.vue

@@ -1,15 +1,80 @@
 <template>
-	<div class="register">
+	<view class="register">
-
+		<view class="head">
-	</div>
+			<image class="Facecollection" src="../../static/pages/Facecollection.png"></image>
+			<span>人脸采集</span>
+		</view>
+		<view class="form">
+			<span>姓名</span>
+			<input type="text" placeholder="请输入姓名">
+			<span>手机号</span>
+			<input type="text" placeholder="请输入手机号">
+			<span>身份证号</span>
+			<input type="text" placeholder="请输入身份证号">
+		</view>
+		<view class="btn">提交</view>
+	</view>
 </template>
 
 <script>
 	export default {
+		data() {
+			return {
 				
 			}
+		},
+		methods: {
+			
+		}
+	}
 </script>
 
-<style scoped>
+<style lang="less" scoped>
-
+.register {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	.head {
+		margin-top: 60rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		span {
+			margin-top: 48rpx;
+		}
+	}
+	.form {
+		margin-top: 106rpx;
+		input {
+			margin: 21rpx 0 42rpx 0;
+			width: 600rpx;
+			height: 63rpx;
+			background: #F6F6F6;
+			border-radius: 5rpx;
+			color: #8E8E8E;
+			font-size: 20rpx;
+			padding-left: 26rpx;
+		}
+		span {
+			color: #333333;
+			font-size: 30rpx;
+		}
+	}
+	.btn {
+		width: 496rpx;
+		height: 61rpx;
+		background: #26A888;
+		border-radius: 5rpx;
+		font-size: 31rpx;
+		color: #FFFFFF;
+		line-height: 61rpx;
+		text-align: center;
+		margin-top: 300rpx;
+	}
+}
+.Facecollection {
+	width: 266rpx;
+	height: 266rpx;
+}
 </style>