Merge remote-tracking branch 'origin/master'

src/assets/css/xpwyfyy.css

@@ -44,7 +44,9 @@ body {
 .coloreb59fc {
 	color: #375cf5
 }
-
+.color999{
+	color:#999
+}
 .margin60 {
 	margin-bottom: 60px
 }
@@ -213,6 +215,9 @@ body {
 	.mui-content .vongi-choose .mui-table-view-cell a {
 		padding: 11px 15px
 	}
+	.mui-content .vongi-photo{
+		height:240px
+	}
 }
 
 .bindfyy-btn button {
@@ -284,7 +289,14 @@ body {
 	width: 100%;
 	border-radius: 3px;
 }
-
+.vongi-photo{
+	background: url(../img/faceai.png) center no-repeat;
+    background-size: 100% 100%;
+    height: 300px;
+    width: 60%;
+    padding: 15px;
+    margin: 20px auto;
+} 
 .faceaifyy-content-region {
 	background: #999;
 	text-align: center;
@@ -1021,8 +1033,9 @@ h3 {
 }
 
 .mui-content-padded h5 {
-	margin: 15px 0;
-	color: #666
+	margin: 20px 0 15px 0;
+	color: #666;
+	font-size:14px
 }
 
 .vongi-wordcard-padded {

src/projects/home/views/UploadPhone.vue

@@ -1,8 +1,34 @@
 <template>
+<div>
+    <header class="mui-bar mui-bar-nav">
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+			<h1 class="mui-title">上传登记照</h1>
+		</header>
+		<div class="mui-content">
+			<div class="mui-content-padded">
+				<div class="mui-content-padded">
+					<h5>请上传照片</h5>
+					<div class="mui-h5 color999">
+						照片将用于人脸识别设备，请上传清晰的免冠登记照或肩部以上近照。
+					</div>
+				</div>
+				<div class="mui-content-padded vongi-photo">
+					<div class="faceaifyy-content-region">
+						<a href="#picture"><span class="mui-icon iconfont icon-weibiaoti1"></span></a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="fyy-footer">
+			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary ">提交</button></div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>