非大陆考生处理

WebRoot/ymbk/routes/std/reg/std_reg.html

@@ -24,7 +24,7 @@
 				<table>
 					<tr>
 						<td><img src="./image/self.png" style="width: 88px; height: 90px; background: rgba(252, 220, 212, 1);" class="ui-mg"></td>
-						<td><span class="ui-card-r-title"> 实名认证 <br>
+						<td><span class="ui-card-r-title"> 人像采集 <br>
 						</span> <!-- style="font-size:13px;
 									font-family:PingFangSC-Regular,PingFang SC;
 									font-weight:400;
@@ -451,7 +451,7 @@
 		<div style="margin: 20px" class="ui-card">
 			<center>
 				<img src="./image/self.png" style="width: 295px; height: 365px; background: rgba(252, 220, 212, 1); margin: 10px 20px 20px 20px" class="ui-mg">
-				<div class="ui-big-title">实名认证要求</div>
+				<div class="ui-big-title">人像采集要求</div>
 			</center>
 			<div class="ui-title" style="margin-left: 40px; margin-right: 40px; margin-top: 10px !important; padding-top: 0px !important; margin-bottom: 20px !important; padding-bottom: 20px !important">
 				<!--
@@ -466,7 +466,8 @@
 		<br>
 
 		<div class="button-sp-area" style="margin-top: -20px;">
-			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="uploadNoCrownPhoto()">实名认证</a>
+			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="uploadNoCrownPhoto()" ng-if="StdReg.std_province<70">人像采集</a>
+			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="uploadNoCrownPhotoOther()" ng-if="StdReg.std_province>=70">人像采集</a>
 		</div>
 
 	</div>

WebRoot/ymbk/routes/std/reg/std_reg.js

@@ -219,7 +219,7 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 		}
 
 		// 识别姓名和自输入姓名不相等
-		if ($scope.StdReg.std_name_confirm != $scope.StdReg.std_name) {
+		if (flag == 1 && $scope.StdReg.std_name_confirm != $scope.StdReg.std_name) {
 			$.alert("自动识别的姓名和考生确认的姓名不一致，请修改为正确的姓名！");
 			return false;
 		}
@@ -382,7 +382,7 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 	/***************************************************************************
 	 * 上传免冠证件照
 	 */
-/*	$scope.uploadNoCrownPhoto = function() {
+	$scope.uploadNoCrownPhotoOther = function() {
 		$rootScope.uploadStdMaterialOnline('NoCrownPhoto', function() {
 			// $scope.curStep = 'StdExtendInfo';
 			if ($rootScope.checkParamValue('EnrolVerifyStdIdentity', 'InActive', 'Active')) {
@@ -391,7 +391,7 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 				$scope.curStep = 'StdExtendInfo';
 			}
 		});
-	}*/
+	}
 
 	let bizToken = sessionStorage.getItem("biz_token");
 	if (bizToken) {