Forráskód Böngészése

央美本科优化

haogh 7 hónapja
szülő
commit
2013db0eed

+ 54 - 38
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;
@@ -32,7 +32,7 @@
 									line-height:20px;
 									margin-top: 10px;" -->
 							<div class="ui-title" style="margin-top: 00px !important">
-								 (1)正面彩色头像、白色背景;<br> (2)头像水平居中,左右对称,表情自然,双眼自然睁开并平视,耳朵对称,左右肩膀平衡,嘴唇自然闭合;<br> 
+								 (1)白色背景;<br> (2)头像水平居中,左右对称,表情自然,双眼自然睁开并平视,耳朵对称,左右肩膀平衡,嘴唇自然闭合;<br>
 								 (3)常戴眼镜者应佩戴眼镜,但不得佩戴彩色眼镜、美瞳眼镜,镜框不得遮挡眼睛,眼镜不能有反光;<br>
 								 (4)免冠,头发不得遮挡眉毛、眼睛和耳朵,不得佩戴耳环、项链等饰品,不得化妆,不着制式服饰,衣着应与背景色区分明显。
 							</div></td>
@@ -44,7 +44,8 @@
 
 
 			<div class="button-sp-area">
-				<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="goStep('stdTypeChoose')">开始注册</a> <a href="javascript:;" class="weui-btn weui-btn_default" ng-click="goLocation('std/binding')">绑定已有考生信息</a>
+				<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="goStep('stdTypeChoose')">开始注册</a>
+				<a href="javascript:;" class="weui-btn weui-btn_default" ng-click="goLocation('std/binding')">绑定已有考生信息</a>
 			</div>
 		</div>
 
@@ -70,12 +71,11 @@
 	<div ng-if="curStep == 'province'">
 		<div class="ui-body">
 			<div class="ui-big-title">请选择考生生源地</div>
-			<!-- <div class="ui-title" style="margin-top: 0px !important;">非四川省考生选择所在省份即可,四川省内考生必须选择所在区县</div> -->
 			<div class="weui-search-bar" id="searchBar">
 				<form class="weui-search-bar__form">
 					<div class="weui-search-bar__box" style="height: 30px;">
-						<i class="weui-icon-search"></i> <input type="search" class="weui-search-bar__input" id="searchInput" placeholder="搜索" required ng-model="province_query" /> <a href="javascript:"
-							class="weui-icon-clear" id="searchClear"></a>
+						<i class="weui-icon-search"></i> <input type="search" class="weui-search-bar__input" id="searchInput" placeholder="搜索" required ng-model="province_query" />
+						<a href="javascript:" class="weui-icon-clear" id="searchClear"></a>
 					</div>
 					<label class="weui-search-bar__label" id="searchText"> <i class="weui-icon-search"></i> <span>搜索</span>
 					</label>
@@ -125,8 +125,8 @@
 			</div>
 
 			<div class="button-sp-area">
-				<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="checkExamId()">确定高考报名号</a> <a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_default"
-					ng-click="goStep('province')">重新选择生源地</a>
+				<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="checkExamId()">确定高考报名号</a>
+				<a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_default" ng-click="goStep('province')">重新选择生源地</a>
 			</div>
 
 		</div>
@@ -153,8 +153,8 @@
 		</div>
 
 		<div class="button-sp-area" style="margin-top: -10px;">
-			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="openIdCard()">上传台湾居民来往大陆通行证(人像面)</a> <a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_default"
-				ng-click="goStep('province')">重新选择生源地</a>
+			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="openIdCard()">上传台湾居民来往大陆通行证(人像面)</a>
+			<a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_default" ng-click="goStep('province')">重新选择生源地</a>
 		</div>
 
 	</div>
@@ -176,8 +176,8 @@
 
 		</div>
 		<div class="button-sp-area" style="margin-top: -15px;">
-			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="openIdCard()">上传港澳居民来往内地通行证(人像面)</a> <a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_default"
-				ng-click="goStep('province')">重新选择生源地</a>
+			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="openIdCard()">上传港澳居民来往内地通行证(人像面)</a>
+			<a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_default" ng-click="goStep('province')">重新选择生源地</a>
 		</div>
 	</div>
 
@@ -201,7 +201,8 @@
 
 		</div>
 		<div class="button-sp-area" style="margin-top: -15px;">
-			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="openIdCard()">上传护照(人像页)</a> <a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_default" ng-click="goStep('province')">重新选择生源地</a>
+			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="openIdCard()">上传护照(人像页)</a>
+			<a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_default" ng-click="goStep('province')">重新选择生源地</a>
 		</div>
 	</div>
 
@@ -224,13 +225,11 @@
 		<div style="color: red; font-size: 13px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; line-height: 20px; margin-left: 20px; margin-right: 20px; margin-bottom: 20px;">
 			上传身份证后,系统会自动识别证件信息,请考生仔细核对,若识别有误,请考生自行修改正确。<br>
 			重要提示:报名系统每天仅提供{{getParamValue('EnrolIdCardOcrtext',5)}}次证件识别验证机会,为不影响正常报名,请谨慎操作。
-			<!--
-			*为保证其他考生正常使用,每个公众号每天只提供{{getParamValue('EnrolIdCardOcrtext',5)}}次验证机会!为了不影响后续业务,请谨慎进行此操作 <br /> 系统将自动识别考生身份证信息,请考生仔细核对,如姓名识别错误,请修改成正确的姓名!-->
 		</div>
 
 		<div class="button-sp-area">
-			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="openIdCard()">上传居民身份证(人像面)</a> <a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_default"
-				ng-click="goStep('province')">重新选择生源地</a>
+			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="openIdCard()">上传居民身份证(人像面)</a>
+			<a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_default" ng-click="goStep('province')">重新选择生源地</a>
 		</div>
 	</div>
 	<!-- 身份证识别结果 -->
@@ -240,7 +239,6 @@
 				<div>居民身份证识别结果</div>
 				<p class="text-danger">请认真核对以下信息,如考生姓名识别错误,请自行修改!</p>
 			</div>
-			<!-- <div class="ui-title" style="margin-left: 20px">居民身份证识别结果</div> -->
 			<div class="weui-cells">
 				<div class="weui-cell">
 					<div class="weui-cell__bd">
@@ -256,6 +254,14 @@
 						<input class="weui-input" type="text" maxlength="32" placeholder="" ng-model="StdReg.std_name">
 					</div>
 				</div>
+				<div class="weui-cell">
+					<div class="weui-cell__hd">
+						<label class="weui-label">确认姓名  </label>
+					</div>
+					<div class="weui-cell__bd">
+						<input class="weui-input" type="text" maxlength="32" placeholder=" 请手动输入考生姓名" ng-model="StdReg.std_name_confirm">
+					</div>
+				</div>
 				<div class="weui-cell">
 					<div class="weui-cell__bd">
 						<p>考生性别</p>
@@ -302,18 +308,19 @@
 						<input class="weui-input" type="text" placeholder="请输入邮寄地址" maxlength="128" ng-model="StdReg.link_addr">
 					</div>
 				</div>-->
+
 				<div class="weui-cell">
 					<div class="weui-cell__hd">
 						<label class="weui-label">手机号码</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" maxlength="11" placeholder="必填,请牢记该号码" ng-model="StdReg.std_mobile">
+						<input class="weui-input" type="text" maxlength="11" placeholder="请输入考生本人手机号码" ng-model="StdReg.std_mobile">
 					</div>
 				</div>
 			</div>
 			<div class="button-sp-area">
-				<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="saveIdCard(1)">识别正确,下一步</a> <a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_default"
-					ng-click="goStep('IdCardWarning')">识别错误,重新上传身份证</a>
+				<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="saveIdCard(1)">识别正确,下一步</a>
+				<a href="javascript:;" class="weui-btn weui-btn_disabled weui-btn_default" ng-click="goStep('IdCardWarning')">识别错误,重新上传身份证</a>
 			</div>
 		</div>
 
@@ -419,16 +426,38 @@
 	<!-- 免冠证件照片区域 -->
 	<div ng-if="curStep == 'NoCrownPhotoWarning'">
 
+		<div ng-if="showLiveCheckLoading" style="
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, 0.7);
+        z-index: 10000;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      " >
+			<div style="
+          border-radius: 6px;
+          background-color: #fff;
+          padding: 15px 30px;
+          text-align: center;
+        " >
+				正在获取识别结果,请稍后...
+			</div>
+		</div>
+
 		<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">
 				<!--
 				<ul style="font-size:16px;">1、要求:本人正面免冠头像,头部占照片尺寸的2/3,不着制式服装或白色上衣,常戴眼镜的考生应佩戴眼镜,背景单一,人像清晰,层次丰富,神态自然,无明显畸变。</ul>
 				<ul style="font-size:16px;">2、该免冠照将和公安部系统进行认证核验。</ul>-->
-				<ul style="font-size:16px;">(1)正面彩色头像、白色背景;</ul>
+				<ul style="font-size:16px;">(1)白色背景;</ul>
 				<ul style="font-size:16px;">(2)头像水平居中,左右对称,表情自然,双眼自然睁开并平视,耳朵对称,左右肩膀平衡,嘴唇自然闭合;</ul>
 				<ul style="font-size:16px;">(3)常戴眼镜者应佩戴眼镜,但不得佩戴彩色眼镜、美瞳眼镜,镜框不得遮挡眼睛,眼镜不能有反光;</ul>
 				<ul style="font-size:16px;">(4)免冠,头发不得遮挡眉毛、眼睛和耳朵,不得佩戴耳环、项链等饰品,不得化妆,不着制式服饰,衣着应与背景色区分明显。</ul>
@@ -437,10 +466,9 @@
 		<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()">实名认证</a>
 		</div>
 
-
 	</div>
 
 
@@ -536,17 +564,6 @@
 					</div>
 				</div>
 				
-				
-				<!-- 毕业时间 
-				<div class="weui-cell">
-					<div class="weui-cell__hd">
-						<label class="weui-label">毕业时间</label>
-					</div>
-					<div class="weui-cell__bd">
-						<input class="weui-input" type="text"  placeholder="如:2010年09月" maxlenth="20" ng-model="StdReg.end_date">
-					</div>
-				</div>-->
-				
 				<!-- 毕业时间 -->
 				<div class="weui-cell">
 					<div class="weui-cell__hd">
@@ -557,7 +574,7 @@
 					</div>
 				</div>
 				
-				<div class="weui-cell"><!--  ng-if="getParamValue('EnrolReg_ShowLinkMan','true') == 'true'" -->
+				<div class="weui-cell">
 					<div class="weui-cell__hd">
 						<label class="weui-label">紧急联系人</label>
 					</div>
@@ -636,7 +653,6 @@
 			</div>
 			<div class="weui-msg__text-area">
 				<h2 class="weui-msg__title">注册成功</h2>
-				<!-- <p class="weui-msg__desc">已成功注册,请根据招生简章进行专业报考并及时缴费。</p> -->
 				<div class="ui-title">考生需在报名有效期内完成专业选择及缴费,逾期无法补报。</div>
 				<div class="button-sp-area">
 					<a href="javascript:void(0);" class="weui-btn weui-btn_primary" ng-click="goLocation('std/material')">提交材料</a>

+ 110 - 71
WebRoot/ymbk/routes/std/reg/std_reg.js

@@ -1,4 +1,5 @@
 app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$state', '$stateParams', function($rootScope, $scope, $http, $timeout, $state, $stateParams) {
+	$scope.showLiveCheckLoading = false;
 	$scope.curStep = 'start';
 	$scope.StdReg = {};
 	$scope.YmStdCategoryArray = [];
@@ -17,43 +18,45 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
         }, function (response) {
             if (response.entity) {
                 $scope.artArr = [];
-                $scope.artArr = response.entity.art_science_status.split(",");
+				if(response.entity.art_science_status) {
+					$scope.artArr = response.entity.art_science_status.split(",");
+				}
                 for (const art of $scope.artArr) {
                     for (const st of $rootScope.StdCategoryArray) {
-                        if (art == st.dict_value) {
+                        if (art === st.dict_value) {
                             $scope.YmStdCategoryArray.push(st);
                             break;
                         }
                     }
                 }
-                if($scope.YmStdCategoryArray.length == 1) {
+                if($scope.YmStdCategoryArray.length === 1) {
                 	$scope.StdReg.std_param3 = $scope.YmStdCategoryArray[0].dict_value;
                 }
                 $scope.YmStdCategoryArray.unshift({dict_text: '请选择', dict_value: null});
             }
         });
     }
-	
-	
+
+
 	if ($rootScope.ArtStdReg !== undefined) {
 		$scope.StdReg = angular.extend({}, $rootScope.ArtStdReg);
-		if ($scope.StdReg.reg_status == 'IdCard') {
+		if ($scope.StdReg.reg_status === 'IdCard') {
 			$scope.curStep = 'NoCrownPhotoWarning';
-		} else if ($scope.StdReg.reg_status == 'NoCrownPhoto') {
+		} else if ($scope.StdReg.reg_status === 'NoCrownPhoto') {
 			$scope.curStep = 'StdExtendInfo';
 			$scope.findProvinceArtScience();
 		}
 	}
-	
-	$scope.getCategory = function() {
-		if($scope.YmStdCategoryArray.length<1) {
+
+	$scope.getCategory = function () {
+		if ($scope.YmStdCategoryArray.length < 1) {
 			$scope.findProvinceArtScience();
 		}
 	}
 	
 	
 
-
+// 以下为邮寄相关接口
 	/**生源地
 	$rootScope.ajaxRequest({
 		url : '../enrol/reg/province/list.htm'
@@ -61,11 +64,11 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 		$scope.provinceArray = response.array;
 	});**/
 	//邮寄省份
-	$rootScope.ajaxRequest({
+/*	$rootScope.ajaxRequest({
 		url : '../enrol/std/reg/province/list.htm'
 	}, function(response) {
 		$scope.provArray = response.array;
-	});	
+	});	*/
 	/**邮寄城市初始列表
 	$rootScope.ajaxRequest({
 		url : '../enrol/std/reg/city/alllist.htm'
@@ -73,24 +76,24 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 		$scope.cityArray = response.array;
 	});	*/
 	//过滤城市
-	$scope.freshCity = function() {
+/*	$scope.freshCity = function() {
 		$rootScope.ajaxRequest({
 			url : '../enrol/std/reg/city/list.htm?province_id=' + $scope.StdReg.link_province
 		}, function(response) {
 			$scope.cityArray = response.array;
 		});
-	}	
+	}	*/
 	//alert($rootScope.checkParamValue('EnrolVerifyStdIdentity', 'InActive', 'Active'));
 	// alert($rootScope.getParamValue('EnrolVerifyStdIdentity', 'InActive'));
 	// console.log($rootScope.FrameParam);
 	
 	
 	//选择考生类型
-	$scope.chooseStdType = function(d) {
+	$scope.chooseStdType = function (d) {
 		$rootScope.ajaxRequest({
-			url : '../enrol/province/list/stdType.htm',
-			data : {std_type: d.dict_value}
-		}, function(response) {
+			url: '../enrol/province/list/stdType.htm',
+			data: {std_type: d.dict_value}
+		}, function (response) {
 			$scope.provinceArray = response.array;
 			$scope.curStep = 'province';
 		});
@@ -103,9 +106,9 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 	 * 选择生源地
 	 */
 	$scope.chooseProvince = function(p) {
-		if(p.reg_status == 'InActive') {
+		if(p.reg_status === 'InActive') {
 			var msg = '未开放【'+p.province_name+'】考生注册!';
-			if(p.reg_fetch_param != undefined) 
+			if(p.reg_fetch_param !== undefined)
 				msg = p.reg_fetch_param;
 			$.alert(msg);
 			return;
@@ -113,19 +116,19 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 		$scope.currentProvince = p;
 		$scope.StdReg.std_province = p.province_id;
 		$scope.StdReg.province_name = p.province_name;
-		if ((p.province_id + '') == '90') {
+		if ((p.province_id + '') === '90') {
 			// 外国,护照
 			$scope.curStep = 'PassportWarning';
 			$scope.StdReg.cert_type = 'Passport';
-		} else if ((p.province_id + '') == '71') {
+		} else if ((p.province_id + '') === '71') {
 			// 台湾,台湾居民往来大陆通行证,澳门,香港 港澳居民来往内地通行证
 			$scope.curStep = 'IdCard71Warning';
 			$scope.StdReg.cert_type = 'TaiWanPass';
-		}else if ((p.province_id + '') == '80' || (p.province_id + '') == '81' || (p.province_id + '') == '82') {
+		}else if ((p.province_id + '') === '80' || (p.province_id + '') === '81' || (p.province_id + '') === '82') {
 			// 澳门,香港 港澳居民来往内地通行证
 			$scope.curStep = 'HongKongMacaoPass';
 			$scope.StdReg.cert_type = 'TaiWanPass';
-		}  else if (p.ksh_status == 'Active') {
+		}  else if (p.ksh_status === 'Active') {
 			// 必须有高考报名号
 			$scope.curStep = 'ExamIdWarning';
 		} else {
@@ -138,7 +141,7 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 
 	$scope.checkExamId = function() {
 		$scope.StdReg.exam_id = $.trim($scope.StdReg.exam_id);
-		if ($scope.StdReg.exam_id == undefined || $scope.StdReg.exam_id.length == 0) {
+		if ($scope.StdReg.exam_id === undefined || $scope.StdReg.exam_id.length === 0) {
 			$.alert('高考报名号必须填写!');
 			return false;
 		}
@@ -170,25 +173,26 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 		$scope.StdReg.std_name = $.trim($scope.StdReg.std_name);
 		$scope.StdReg.std_sex = $.trim($scope.StdReg.std_sex);
 		$scope.StdReg.std_mobile = $.trim($scope.StdReg.std_mobile);
-		if ($scope.StdReg.cert_id == undefined || $scope.StdReg.cert_id.length == 0) {
+		$scope.StdReg.std_name_confirm = $.trim($scope.StdReg.std_name_confirm);
+		if ($scope.StdReg.cert_id === undefined || $scope.StdReg.cert_id.length === 0) {
 			$.alert('请输入证件号码!');
 			return false;
 		}
-		if(flag == 2) {
-			if ($scope.StdReg.std_param2 == undefined || $scope.StdReg.std_param2.length == 0) {
+		if(flag === 2) {
+			if ($scope.StdReg.std_param2 === undefined || $scope.StdReg.std_param2.length === 0) {
 				$.alert('请输入身份证号码!');
 				return false;
 			}
-			if($scope.StdReg.cert_id.indexOf('(') !=-1 ||  $scope.StdReg.cert_id.indexOf(')')!= -1) {
+			if($scope.StdReg.cert_id.indexOf('(') !==-1 ||  $scope.StdReg.cert_id.indexOf(')')!== -1) {
 				$.alert('证件号码请输入半角括号!');
 				return false;
 			}
-			if($scope.StdReg.std_param2.indexOf('(') !=-1 ||  $scope.StdReg.std_param2.indexOf(')') != -1) {
+			if($scope.StdReg.std_param2.indexOf('(') !==-1 ||  $scope.StdReg.std_param2.indexOf(')') !== -1) {
 				$.alert('身份证号码请输入半角括号!');
 				return false;
 			}
 			if(!$scope.isCert($scope.StdReg.cert_id)) {
-				if($scope.StdReg.std_province == '90') {
+				if($scope.StdReg.std_province === '90') {
 					$.alert('护照号只能为数字、字母、半角括号!');
 					return false;
 				} else {
@@ -201,34 +205,28 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 				return false;
 			}
 		}
-		if ($scope.StdReg.std_name == undefined || $scope.StdReg.std_name.length == 0) {
+		if ($scope.StdReg.std_name === undefined || $scope.StdReg.std_name.length === 0) {
 			$.alert('请输入考生姓名!');
 			return false;
 		}
-		if ($scope.StdReg.std_sex == undefined || $scope.StdReg.std_sex.length == 0) {
+		if ($scope.StdReg.std_sex === undefined || $scope.StdReg.std_sex.length === 0) {
 			$.alert('请选择考生性别!');
 			return false;
 		}
-		/*if ($scope.StdReg.link_province == undefined || $scope.StdReg.link_province.length == 0) {
-			$.alert('请选择邮寄省份!');
+		if ($scope.StdReg.std_mobile === undefined || $scope.StdReg.std_mobile.length !== 11) {
+			$.alert('请输入正确的手机号码!');
 			return false;
 		}
-		if ($scope.StdReg.link_city == undefined || $scope.StdReg.link_city.length == 0) {
-			$.alert('请选择邮寄城市!');
-			return false;
-		}		
-		if ($scope.StdReg.link_addr == undefined || $scope.StdReg.link_addr.length == 0) {
-			$.alert('请输入试卷邮寄地址!');
-			return false;
-		}*/
-		if ($scope.StdReg.std_mobile == undefined || $scope.StdReg.std_mobile.length != 11) {
-			$.alert('请输入正确的手机号码!');
+
+		// 识别姓名和自输入姓名不相等
+		if ($scope.StdReg.std_name_confirm !== $scope.StdReg.std_name) {
+			$.alert("自动识别的姓名和考生确认的姓名不一致,请修改为正确的姓名!");
 			return false;
 		}
 		
 		$.showLoading("正在提交考生信息,请稍后...")
 		//针对非大陆考生
-		if(flag == 2) {
+		if(flag === 2) {
 			$.confirm("请确认考生信息!", function() {
 				// 点击确认后的回调函数
 				$rootScope.ajaxRequest({
@@ -280,50 +278,50 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 	$scope.saveExtendInfo = function() {
 
 		// 考生
-		if($rootScope.getParamValue('SchoolCode') == '51065' ) {
-			if ($scope.StdReg.std_type == undefined || $scope.StdReg.std_type == '') {
+		if($rootScope.getParamValue('SchoolCode') === '51065' ) {
+			if ($scope.StdReg.std_type === undefined || $scope.StdReg.std_type === '') {
 				$.alert('请选择考生类型!');
 				return false;
 			}
 		}
-		if ($scope.StdReg.link_mobile && $scope.StdReg.std_mobile == $scope.StdReg.link_mobile) {
-			$.alert('紧急联系电话与本人手机号码不能相同!');
+		if ($scope.StdReg.link_mobile && $scope.StdReg.std_mobile === $scope.StdReg.link_mobile) {
+			$.alert('紧急联系人手机与本人手机号码不能相同!');
 			return false;
 		}
 		
 		//政治面貌
-		if ($scope.StdReg.std_political == undefined || $scope.StdReg.std_political == '') {
+		if ($scope.StdReg.std_political === undefined || $scope.StdReg.std_political === '') {
 			$.alert('请选择政治面貌!');
 			return false;
 		}
 		//科类
-		if ($scope.StdReg.std_param3 == undefined || $scope.StdReg.std_param3 == '' || $scope.StdReg.std_param3.length == 0) {
+		if ($scope.StdReg.std_param3 === undefined || $scope.StdReg.std_param3 === '' || $scope.StdReg.std_param3.length === 0) {
 			$.alert('请选择科类!');
 			return false;
 		}
 		//科类
-		if ($scope.StdReg.std_param4 == undefined || $scope.StdReg.std_param4 == '' || $scope.StdReg.std_param4.length == 0) {
+		if ($scope.StdReg.std_param4 === undefined || $scope.StdReg.std_param4 === '' || $scope.StdReg.std_param4.length === 0) {
 			$.alert('请选择毕业类型!');
 			return false;
 		}
 		//毕业学校
-		if ($rootScope.getParamValue('EnrolReg_ShowStdSchool','Active') == 'Active' && 
-				($scope.StdReg.std_school == undefined || $scope.StdReg.std_school == '')) {
+		if ($rootScope.getParamValue('EnrolReg_ShowStdSchool','Active') === 'Active' &&
+				($scope.StdReg.std_school === undefined || $scope.StdReg.std_school === '')) {
 			$.alert('请填写毕业学校!');
 			return false;
 		}
 		//考生类别
-		if ($scope.StdReg.std_param5 == undefined || $scope.StdReg.std_param5 == '') {
+		if ($scope.StdReg.std_param5 === undefined || $scope.StdReg.std_param5 === '') {
 			$.alert('请选择考生类别!');
 			return false;
 		}
 		/**毕业时间**/
-		if ($scope.StdReg.end_date == undefined || $scope.StdReg.end_date == '') {
+		if ($scope.StdReg.end_date === undefined || $scope.StdReg.end_date === '') {
 			$.alert('请填写毕业时间!');
 			return false;
 		}
 		//紧急联系人
-		if ($scope.StdReg.link_man == undefined || $scope.StdReg.link_man == '') {
+		if ($scope.StdReg.link_man === undefined || $scope.StdReg.link_man === '') {
 			$.alert('请填写紧急联系人!');
 			return false;
 		} else if(!$scope.isChinese($scope.StdReg.link_man)) {
@@ -332,20 +330,20 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 		}
 		
 		//家长手机号
-		if ($scope.StdReg.link_mobile == undefined || $scope.StdReg.link_mobile == '') {
+		if ($scope.StdReg.link_mobile === undefined || $scope.StdReg.link_mobile === '') {
 			$.alert('请填写联系人手机号!');
 			return false;
 		}
 		
 		//通信地址
-		if ($rootScope.getParamValue('EnrolReg_LinkAddr','Active') == 'Active' && 
-				($scope.StdReg.link_addr == undefined || $scope.StdReg.link_addr == '')) {
+		if ($rootScope.getParamValue('EnrolReg_LinkAddr','Active') === 'Active' &&
+				($scope.StdReg.link_addr === undefined || $scope.StdReg.link_addr === '')) {
 			$.alert('请填写通讯地址!');
 			return false;
 		}
 		
 		//邮政编码
-		if ($scope.StdReg.link_postal == undefined || $scope.StdReg.link_postal == '' || $scope.StdReg.link_postal.length==0) {
+		if ($scope.StdReg.link_postal === undefined || $scope.StdReg.link_postal === '' || $scope.StdReg.link_postal.length===0) {
 			$.alert('请填写邮政编码!');
 			return false;
 		}
@@ -355,8 +353,8 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 		}
 		
 		//电子邮箱
-		if ($rootScope.getParamValue('EnrolReg_email','Active') == 'Active') {
-			if($scope.StdReg.email == undefined || $scope.StdReg.email == '') {
+		if ($rootScope.getParamValue('EnrolReg_email','Active') === 'Active') {
+			if($scope.StdReg.email === undefined || $scope.StdReg.email === '') {
 				$.alert('请填写电子邮箱!');
 				return false;
 			}
@@ -384,7 +382,7 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 	/***************************************************************************
 	 * 上传免冠证件照
 	 */
-	$scope.uploadNoCrownPhoto = function() {
+/*	$scope.uploadNoCrownPhoto = function() {
 		$rootScope.uploadStdMaterialOnline('NoCrownPhoto', function() {
 			// $scope.curStep = 'StdExtendInfo';
 			if ($rootScope.checkParamValue('EnrolVerifyStdIdentity', 'InActive', 'Active')) {
@@ -393,8 +391,49 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 				$scope.curStep = 'StdExtendInfo';
 			}
 		});
+	}*/
+
+	let bizToken = sessionStorage.getItem("biz_token");
+	if (bizToken) {
+		$scope.showLiveCheckLoading = true;
+		$rootScope.ajaxRequest(
+			{
+				url: "../std/register/live/result.htm",
+				data: {
+					bizToken: bizToken,
+				},
+			},
+			function (res) {
+				$scope.showLiveCheckLoading = false;
+				//   location.reload();
+				$.hideLoading();
+				if (res && res.result === 1) {
+					$scope.curStep = "StdExtendInfo";
+				}
+			}
+		);
+		sessionStorage.removeItem("biz_token");
 	}
 
+	$scope.uploadNoCrownPhoto = function () {
+		$rootScope.ajaxRequest(
+			{
+				url: "../std/register/live/token.htm",
+				data: {
+					stdName: $scope.StdReg.std_name,
+					certId: $scope.StdReg.cert_id,
+				},
+			},
+			function (res) {
+				$.hideLoading();
+				if (res && res.url && res.bizToken) {
+					sessionStorage.setItem("biz_token", res.bizToken);
+					location.href = res.url;
+				}
+			}
+		);
+	};
+
 	$scope.goStep = function(step) {
 		$scope.curStep = step;
 	}
@@ -422,7 +461,7 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 							$.hideLoading();
 							if ($scope.StdReg.std_province < '70') {
 								//针对新疆少民,限定特定的民族才能选择这个类别
-								if($scope.StdReg.std_province == '66') {
+								if($scope.StdReg.std_province === '66') {
 									var arr = ['维吾尔','哈萨克','蒙古','柯尔克孜','塔吉克','锡伯','乌孜别克','塔塔尔','达斡尔','藏','俄罗斯'];
 									if(!arr.inArray(response.map.IdCardInfo.person_nation)) {
 										$.hideLoading();
@@ -438,11 +477,11 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 								$scope.curStep = 'IdCardResult';
 							} else {
 								//香港、台湾、澳门的考生,需要显示不同的提示
-								if($scope.StdReg.std_province == '71') {
+								if ($scope.StdReg.std_province === '71') {
 									$scope.certTips = '请输入台湾身份证号码';
-								} else if($scope.StdReg.std_province == '80' || $scope.StdReg.std_province == '81') {
+								} else if ($scope.StdReg.std_province === '80' || $scope.StdReg.std_province === '81') {
 									$scope.certTips = '请输入香港身份证件号码';
-								} else if($scope.StdReg.std_province == '82') {
+								} else if ($scope.StdReg.std_province === '82') {
 									$scope.certTips = '请输入澳门身份证件号码';
 								} else {
 									$scope.certTips = '请输入身份证号码';
@@ -454,7 +493,7 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 					},
 					fail : function(error) {
 						$.hideLoading();
-						$.alert('图片服务器暂时无法访问,请稍侯再试', '错误提示');
+						$.alert('系统繁忙,请稍侯再试', '错误提示');
 					}
 				});
 			}

+ 16 - 17
WebRoot/ymfz/routes/std/reg/std_reg.html

@@ -425,6 +425,21 @@
             />
           </div>
         </div>
+        <!-- 确认考生姓名,和识别不一致,则提醒 -->
+        <div class="weui-cell">
+          <div class="weui-cell__hd">
+            <label class="weui-label">确认姓名 </label>
+          </div>
+          <div class="weui-cell__bd">
+            <input
+                    class="weui-input"
+                    type="text"
+                    maxlength="32"
+                    placeholder=" 请手动输入考生姓名"
+                    ng-model="StdReg.std_name_confirm"
+            />
+          </div>
+        </div>
         <div class="weui-cell">
           <div class="weui-cell__bd">
             <p>考生性别</p>
@@ -472,22 +487,6 @@
 					</div>
 				</div>-->
 
-        <!-- 确认考生姓名,和识别不一致,则提醒 -->
-        <div class="weui-cell">
-          <div class="weui-cell__hd">
-            <label class="weui-label">确认考生姓名</label>
-          </div>
-          <div class="weui-cell__bd">
-            <input
-              class="weui-input"
-              type="text"
-              maxlength="32"
-              placeholder="请手动输入考生姓名"
-              ng-model="StdReg.std_name_confirm"
-            />
-          </div>
-        </div>
-
         <div class="weui-cell">
           <div class="weui-cell__hd">
             <label class="weui-label">手机号码</label>
@@ -628,7 +627,7 @@
             <input
               class="weui-input"
               type="text"
-              placeholder="必填,请牢记该号码"
+              placeholder="请输入考生本人手机号码"
               maxlenth="11"
               ng-model="StdReg.std_mobile"
             />

+ 15 - 16
WebRoot/ymfz/routes/std/reg/std_reg.js

@@ -196,36 +196,36 @@ app.controller("StdRegCtrl", [
       $scope.StdReg.std_mobile = $.trim($scope.StdReg.std_mobile);
       $scope.StdReg.std_name_confirm = $.trim($scope.StdReg.std_name_confirm);
       if (
-        $scope.StdReg.cert_id == undefined ||
-        $scope.StdReg.cert_id.length == 0
+        $scope.StdReg.cert_id === undefined ||
+        $scope.StdReg.cert_id.length === 0
       ) {
         $.alert("请输入证件号码!");
         return false;
       }
-      if (flag == 2) {
+      if (flag === 2) {
         if (
-          $scope.StdReg.std_param2 == undefined ||
-          $scope.StdReg.std_param2.length == 0
+          $scope.StdReg.std_param2 === undefined ||
+          $scope.StdReg.std_param2.length === 0
         ) {
           $.alert("请输入身份证号码!");
           return false;
         }
         if (
-          $scope.StdReg.cert_id.indexOf("(") != -1 ||
-          $scope.StdReg.cert_id.indexOf(")") != -1
+          $scope.StdReg.cert_id.indexOf("(") !== -1 ||
+          $scope.StdReg.cert_id.indexOf(")") !== -1
         ) {
           $.alert("证件号码请输入半角括号!");
           return false;
         }
         if (
-          $scope.StdReg.std_param2.indexOf("(") != -1 ||
-          $scope.StdReg.std_param2.indexOf(")") != -1
+          $scope.StdReg.std_param2.indexOf("(") !== -1 ||
+          $scope.StdReg.std_param2.indexOf(")") !== -1
         ) {
           $.alert("身份证号码请输入半角括号!");
           return false;
         }
         if (!$scope.isCert($scope.StdReg.cert_id)) {
-          if ($scope.StdReg.std_province == "90") {
+          if ($scope.StdReg.std_province === "90") {
             $.alert("护照号只能为数字、字母、半角括号!");
             return false;
           } else {
@@ -239,15 +239,15 @@ app.controller("StdRegCtrl", [
         }
       }
       if (
-        $scope.StdReg.std_name == undefined ||
-        $scope.StdReg.std_name.length == 0
+        $scope.StdReg.std_name === undefined ||
+        $scope.StdReg.std_name.length === 0
       ) {
         $.alert("请输入考生姓名!");
         return false;
       }
       if (
-        $scope.StdReg.std_sex == undefined ||
-        $scope.StdReg.std_sex.length == 0
+        $scope.StdReg.std_sex === undefined ||
+        $scope.StdReg.std_sex.length === 0
       ) {
         $.alert("请选择考生性别!");
         return false;
@@ -264,7 +264,7 @@ app.controller("StdRegCtrl", [
 
       // 识别姓名和自输入姓名不相等
       if ($scope.StdReg.std_name_confirm !== $scope.StdReg.std_name) {
-        $.alert("自动识别的姓名和考生确认的姓名不一致,请修改!");
+        $.alert("自动识别的姓名和考生确认的姓名不一致,请修改为正确的姓名!");
         return false;
       }
 
@@ -481,7 +481,6 @@ app.controller("StdRegCtrl", [
       sessionStorage.removeItem("biz_token");
     }
     $scope.uploadNoCrownPhoto = function () {
-      console.log("$scope.StdReg:", $scope.StdReg);
       $rootScope.ajaxRequest(
         {
           url: "../std/register/live/token.htm",

+ 7 - 1
sql/update.sql

@@ -84,4 +84,10 @@ CREATE TABLE `ly_room_model_photo`
 ) ENGINE = InnoDB
   CHARACTER SET = utf8
   COLLATE = utf8_general_ci COMMENT = '模特拍照表'
-  ROW_FORMAT = Dynamic;
+  ROW_FORMAT = Dynamic;
+
+
+-- 2024-11-08
+ALTER TABLE `tx_std_live_log`
+    ADD INDEX `IDX_01`(`biz_token`),
+    ADD INDEX `IDX_02`(`std_id`);