haogh 5 months ago
parent
commit
481bf95221

+ 1 - 1
WebRoot/newjudgewritten/index.html

@@ -126,7 +126,7 @@
 					</div>
 					<div class="input first">
 						<img src="img/user1.png" alt="">
-						<input type="text" placeholder="请输入评委手机号码"  id="login_name"  
+						<input type="text" placeholder="请输入评委登录账号"  id="login_name"
 					 ng-keyup="changeLogin($event)" autocomplete="off" autofocus="" tabindex="0" maxlength=11 autocorrect="off" 
 					 autocapitalize="off" spellcheck="false">
 					</div>

BIN
WebRoot/ymbk/image/idcard71.jpg


BIN
WebRoot/ymbk/image/idcard80.jpg


BIN
WebRoot/ymbk/image/idcard90.jpg


+ 1 - 1
WebRoot/ymbk/js/angular.tabbar.js

@@ -1,7 +1,7 @@
 app.controller('TabbarCtrl', [ '$rootScope', '$scope', '$timeout', '$location', function($rootScope, $scope, $timeout, $location) {
 	$scope.FuncMap = {
 		'me' : [ {
-			text : '个人信息',
+			text : '考生信息',
 			url : 'std/info'
 		}, {
 			text : '报考材料',

+ 12 - 12
WebRoot/ymbk/routes/enrol/guide/enrol_guide.html

@@ -3,7 +3,7 @@
 	<div style="margin:20px;">
 		<!-- 第一步:选择报考大类 -->
 		<div class="weui-panel weui-panel_access" ng-if="curStep == 'category'">
-			<div class="weui-panel__hd">选择{{getParamValue('EnrolStepName_Category', '大类')}}</div>
+			<div class="weui-panel__hd">选择{{getParamValue('EnrolStepName_Category', '大类')}}</div>
 			<div class="weui-cells">
 				<a class="weui-cell weui-cell_access" href="javascript:;" ng-repeat="cg in categoryArray" ng-click="chooseCategory(cg)">
 					<div class="weui-cell__bd">
@@ -32,7 +32,7 @@
 
 		<!-- 第二步:选择报考专业 -->
 		<div class="weui-panel weui-panel_access" ng-if="curStep == 'major'">
-			<div class="weui-panel__hd">选择{{getParamValue('EnrolStepName_Major', '专业')}}</div>
+			<div class="weui-panel__hd">选择{{getParamValue('EnrolStepName_Major', '专业')}}</div>
 			<div class="weui-cells">
 				<a class="weui-cell weui-cell_access" href="javascript:;" ng-repeat="mj in majorArray" ng-click="chooseMajor(mj)">
 					<div class="weui-cell__bd">
@@ -64,7 +64,7 @@
 
 		<!-- 第三步:选择报考招考方向 -->
 		<div class="weui-panel weui-panel_access" ng-if="curStep == 'aspect'">
-			<div class="weui-panel__hd">选择{{getParamValue('EnrolStepName_Aspect', '专业')}}</div>
+			<div class="weui-panel__hd">选择{{getParamValue('EnrolStepName_Aspect', '专业')}}</div>
 			<div class="weui-search-bar" id="searchBar" ng-if="aspectArray.length>8">
 				<form class="weui-search-bar__form">
 					<div class="weui-search-bar__box" style="height:30px;">
@@ -113,7 +113,7 @@
 
 		<!-- 第四步:选择报考品种 -->
 		<div class="weui-panel weui-panel_access" ng-if="curStep == 'aspect_variety'">
-			<div class="weui-panel__hd">选择{{getParamValue('EnrolStepName_Variety', '乐器/舞种')}}</div>
+			<div class="weui-panel__hd">选择{{getParamValue('EnrolStepName_Variety', '乐器/舞种')}}</div>
 			<div class="weui-cells">
 				<a class="weui-cell weui-cell_access" href="javascript:;" ng-repeat="vt in varietyArray" ng-click="chooseAspectVariety(vt)">
 					<div class="weui-cell__bd">
@@ -147,7 +147,7 @@
 		<div ng-if="curStep == 'subject'">
 			<div class="weui-panel weui-panel_access">
 				<div class="weui-panel__hd" ng-if="aspect.aspect_batchs > 1">{{getParamValue('EnrolBatchName_1', '初试')}} 考试科目</div>
-				<div class="weui-panel__hd" ng-if="aspect.aspect_batchs == 1">确定{{getParamValue('EnrolStepName_Subject', '考试科目')}}</div>
+				<div class="weui-panel__hd" ng-if="aspect.aspect_batchs == 1">确定{{getParamValue('EnrolStepName_Subject', '考试科目')}}</div>
 				<div class="weui-cells">
 					<a class="weui-cell weui-cell_access" href="javascript:;" ng-repeat="sb in subjectMap['BatchSubjectArray_1']" ng-click="chooseSubject(sb)">
 						<div class="weui-cell__bd">
@@ -222,7 +222,7 @@
 
 		<!-- 第六步:填写曲目 -->
 		<div class="weui-panel weui-panel_access" ng-if="curStep == 'tracks'">
-			<div class="weui-panel__hd text-danger">填写曲目(报名截止后不可修改曲目信息)</div>
+			<div class="weui-panel__hd text-danger">填写曲目(报名截止后不可修改曲目信息)</div>
 			<div class="weui-cells weui-cells_form" ng-repeat="variety in tracksMap.VarietyArray">
 				<div class="weui-cells__title">
 					{{variety.variety_name}} <span ng-if="variety.enrol_tracks_1 != variety.exam_tracks_1">填报【{{variety.enrol_tracks_1}}】首,随机抽考【{{variety.exam_tracks_1}}】首</span>
@@ -252,7 +252,7 @@
 
 		<!-- 第七步:请选择考点 -->
 		<div class="weui-panel weui-panel_access" ng-if="curStep == 'agent'">
-			<div class="weui-panel__hd">选择考点</div>
+			<div class="weui-panel__hd">选择考点</div>
 			<div class="weui-panel__bd" ng-if="agentArray.length>0">
 				<div class="weui-media-box weui-media-box_text" ng-repeat="agent in agentArray" ng-click="chooseAgent(agent)">
 					<h4 class="weui-media-box__title art-choose">{{agent.agent_name}}</h4>
@@ -270,7 +270,7 @@
 				</div>
 				<div class="weui-msg__text-area">
 					<h2 class="weui-msg__title">未找到可用考点</h2>
-					<p class="weui-msg__desc">未找到 专业【{{aspect.aspect_name}}】可用的考点信息,暂时无法报考该专业,如有疑问,通过服务电话联系我们。</p>
+					<p class="weui-msg__desc">未找到 专业【{{aspect.aspect_name}}】可用的考点信息,暂时无法报考该专业,如有疑问,通过服务电话联系我们。</p>
 				</div>
 			</div>
 			<div class="button-sp-area">
@@ -297,7 +297,7 @@
 
 		<!-- 最终确定 -->
 		<div class="weui-panel weui-panel_access" ng-if="curStep == 'enrol_confirm'">
-			<div class="weui-panel__hd">确认报考专业</div>
+			<div class="weui-panel__hd">确认报考专业</div>
 			<div class="weui-cells weui-cells_form">
 				<div class="weui-cell">
 					<div class="weui-cell__hd">
@@ -398,7 +398,7 @@
 		<div class="ui-card" style="padding:20px" ng-if="curStep == 'enrol_confirm'">
 			<div class="ui-title" style="margin-top: 0px !important;">
 			<!--padding-left:25px;-->
-				<span style="line-height:25px;">请考生准确填选报考专业,并认真核对,缴费成功后,即启动考务程序,安排考试资源,无论是否参加考试,报名费均不予退还。</span><br>
+				<span style="line-height:25px;">缴费成功后,即启动考务程序,安排考试资源,无论是否参加考试,报名费均不予退还。</span><br>
 			</div>
 	   </div>
 
@@ -409,9 +409,9 @@
 					<i class="weui-icon-success weui-icon_msg"></i>
 				</div>
 				<div class="weui-msg__text-area">
-					<h2 class="weui-msg__title">报考申请已提交</h2>
+					<h2 class="weui-msg__title">已提交</h2>
 					<!--<p class="weui-msg__desc">你的专业报考申请已提交,请尽快完成缴费操作。</p> -->
-					<p class="ui-title" style="margin-top: 0px !important;padding-top: 0px !important;">请于{{agent.pay_end_time == undefined?agent.enrol_end_time:agent.pay_end_time}}前完成缴费操作。逾期无法进行补报。</p>
+					<p class="ui-title" style="margin-top: 0px !important;padding-top: 0px !important;">考生应于{{agent.pay_end_time == undefined?agent.enrol_end_time:agent.pay_end_time}}前完成缴费<br>逾期无法进行补报</p>
 					<div class="button-sp-area ">
 						<a href="javascript:void(0);" class="weui-btn weui-btn_primary" ng-click="goAspectPay()">本机微信缴费</a>
 					</div>

+ 19 - 18
WebRoot/ymbk/routes/enrol/info/enrol_info.html

@@ -102,7 +102,7 @@
 			</div>
 
 			<div class="weui-cell"
-				ng-if="EnrolMap.BatchEndTime == undefined && EnrolMap.StdEnrol.pay_status != 'Active'"">
+				ng-if="EnrolMap.BatchEndTime == undefined && EnrolMap.StdEnrol.pay_status != 'Active'">
 				<div class="weui-cell__hd">
 					<label class="weui-label">缴费状态</label>
 				</div>
@@ -152,13 +152,13 @@
 			</div>
 			<a href="javascript:;" class="weui-btn weui-btn_warn"  style="color:#d4003d"
 				ng-if="EnrolMap.StdEnrol.pay_status !='Active'"
-				ng-click="goStep('cancel')">取消专业报考</a> <a href="javascript:;"
+				ng-click="goStep('cancel')">取消专业报考</a> <a href="javascript:;"
 				class="weui-btn weui-btn_warn"  style="color:#d4003d"
 				ng-if="EnrolMap.StdEnrol.pay_status =='Active' && (getParamValue('EnrolCancelWithPayed', 'InActive') == 'Active') && EnrolMap.BatchEndTime != undefined"
 				ng-click="goStep('cancel')">作废报考专业</a>
 			<a href="javascript:;" class="weui-btn weui-btn_default" ng-click="goStep('modify')"
 				ng-if="EnrolMap.ModifyTracks && EnrolMap['TracksArray_1'].length>0">修改报考曲目</a>
-			<a href="javascript:;" class="weui-btn weui-btn_default" ng-click="goLocation('enrol/list')">查看所有已报专业</a>
+			<a href="javascript:;" class="weui-btn weui-btn_default" ng-click="goLocation('enrol/list')">查看已报专业</a>
 			<!-- <a href="javascript:void(0);" class="weui-btn weui-btn_default " ng-if="ArtStdReg.std_admit_flag=='Active'  &&EnrolMap.StdEnrol.without_exam_material"   ng-click="goVoide1()">上传结果</a> -->
 			<!--山工艺 -->
 			<a href="javascript:void(0);" class="weui-btn weui-btn_default " ng-if="FrameParam['SchoolCode'] === '10908' && EnrolMap.StdEnrol.pay_status ==='Active' "   ng-click="goVoide()">{{EnrolMap.Voide.voide_subject_name}}</a>
@@ -290,21 +290,21 @@
 				<h2 class="weui-msg__title" ng-if="EnrolMap.StdEnrol.pay_status!=='Active'">即将取消专业报考</h2>
 				<h2 class="weui-msg__title" ng-if="EnrolMap.StdEnrol.pay_status=='Active'">即将作废报考专业</h2>
 				<!--<p class="weui-msg__desc">此操作将取消该专业的报考,取消后在该考点报名截止前仍可报考该专业,超过报考时限将无法进行该专业的报考,请谨慎进行此操作。</p>-->
-				<p class="weui-msg__desc" style="text-align:left;padding-left:10px;" ng-if="EnrolMap.StdEnrol.pay_status!=='Active'">取消报考后,请考生在报名有效期内重新报考</p>
-				<p class="weui-msg__desc" style="text-align:left;padding-left:10px;" ng-if="EnrolMap.StdEnrol.pay_status!=='Active'">报名截至时间:{{EnrolMap.BatchEndTime}}。</p>
+				<p class="weui-msg__desc" style="text-align:center;padding-left:10px;" ng-if="EnrolMap.StdEnrol.pay_status!=='Active'">考生在报名有效期内重新报考</p>
+				<p class="weui-msg__desc" style="text-align:center;padding-left:10px;" ng-if="EnrolMap.StdEnrol.pay_status!=='Active'">报名截止时间:{{EnrolMap.BatchEndTime}}</p>
 				<!-- <p class="weui-msg__desc text-danger"
 					ng-if="EnrolMap.StdEnrol.pay_status=='Active'">1.考生可在有效报名期间选择作废已报专业,已缴报名费不予退还。<br/>
 						2.考生重新选择其他专业报考及缴费须在报名有效期内进行。
 					</p> -->
-				<p class="weui-msg__desc text-danger" style="text-align:left;padding-left:10px;" ng-if="EnrolMap.StdEnrol.pay_status=='Active'">考生可在有效报名期间选择作废已报专业,已缴报名费不予退还。</p>
-				<p class="weui-msg__desc text-danger" style="text-align:left;padding-left:10px;" ng-if="EnrolMap.StdEnrol.pay_status=='Active'">考生重新选择其他专业报考及缴费须在报名有效期内进行。</p>	
+				<p class="weui-msg__desc text-danger" style="text-align:center;padding-left:10px;" ng-if="EnrolMap.StdEnrol.pay_status=='Active'">作废专业报考费不予退还</p>
+				<!--<p class="weui-msg__desc text-danger" style="text-align:left;padding-left:10px;" ng-if="EnrolMap.StdEnrol.pay_status=='Active'">考生重新选择其他专业报考及缴费须在报名有效期内进行。</p>	-->
 					
 				<div class="button-sp-area ">
 					<a href="javascript:void(0);" class="weui-btn weui-btn_warn"
-						ng-click="goCancelEnrol()" ng-if="EnrolMap.StdEnrol.pay_status=='Active'">作废报考专业</a>
+						ng-click="goCancelEnrol()" ng-if="EnrolMap.StdEnrol.pay_status=='Active'">确认作废</a>
 					<a href="javascript:void(0);" class="weui-btn weui-btn_warn"
 					ng-click="goCancelEnrol()" ng-if="EnrolMap.StdEnrol.pay_status!=='Active'">确定取消</a>
-					 <a href="javascript:void(0);" class="weui-btn weui-btn_primary" ng-click="getEnrol()">查看报考信息</a>
+					 <a href="javascript:void(0);" class="weui-btn weui-btn_primary" ng-click="getEnrol()">返回详情</a>
 				</div>
 			</div>
 		</div>
@@ -318,14 +318,15 @@
 				<i class="weui-icon-success weui-icon_msg"></i>
 			</div>
 			<div class="weui-msg__text-area">
-				<h2 class="weui-msg__title" ng-if="EnrolMap.StdEnrol.pay_status!=='Active'">专业报考已取消</h2>
-				<h2 class="weui-msg__title" ng-if="EnrolMap.StdEnrol.pay_status=='Active'">专业报考已作废</h2>
-				<p class="weui-msg__desc">如需重新报考,务必于{{EnrolMap.BatchEndTime}}前完成专业选择与缴费,逾期无法补报。</p>
+				<h2 class="weui-msg__title" ng-if="EnrolMap.StdEnrol.pay_status!=='Active'">已取消</h2>
+				<h2 class="weui-msg__title" ng-if="EnrolMap.StdEnrol.pay_status=='Active'">已作废</h2>
+				<!--务必于{{EnrolMap.BatchEndTime}}前完成专业选择与缴费,逾期无法补报。-->
+				<p class="weui-msg__desc" style="text-align: center">选择其他专业须在报名有效期内<br>重新报考并完成缴费</p>
 				<div class="button-sp-area ">
 					<a href="javascript:void(0);" class="weui-btn weui-btn_primary"
-						ng-click="goLocation('enrol/guide')">进行专业报考</a> <a
-						href="javascript:void(0);" class="weui-btn weui-btn_primary"
-						ng-click="goLocation('enrol/list')">查看我的报考</a>
+						ng-click="goLocation('enrol/guide')">重新报考</a>
+					<!--<a href="javascript:void(0);" class="weui-btn weui-btn_primary"
+						ng-click="goLocation('enrol/list')">查看我的报考</a>-->
 				</div>
 			</div>
 
@@ -367,11 +368,11 @@
 				<i class="weui-icon-success weui-icon_msg"></i>
 			</div>
 			<div class="weui-msg__text-area">
-				<h2 class="weui-msg__title">微信缴费成功</h2>
-				<p class="weui-msg__desc">微信缴费成功,已完成专业报考</p>
+				<h2 class="weui-msg__title">缴费成功</h2>
+				<p class="weui-msg__desc" >完成专业报考</p>
 				<div class="button-sp-area ">
 					<a href="javascript:void(0);" class="weui-btn weui-btn_primary"
-						ng-click="getEnrol()">查看专业报考信息</a>
+						ng-click="getEnrol()">报考信息</a>
 
 				</div>
 			</div>

+ 6 - 6
WebRoot/ymbk/routes/std/binding/std_binding.html

@@ -1,13 +1,13 @@
 <div ng-controller="StdBindingCtrl">
 	<div class="weui-panel weui-panel_access" ng-if="curStep == 'info'">
-		<div class="weui-panel__hd">输入考生信息</div>
+		<div class="weui-panel__hd">输入考生信息</div>
 		<div class="weui-cells">
 			<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="输入考生证件号码" maxlength="18" ng-model="StdReg.cert_id">
+					<input class="weui-input" type="text" placeholder="输入考生证件号码" maxlength="18" ng-model="StdReg.cert_id">
 				</div>
 			</div>
 			<div class="weui-cell">
@@ -15,7 +15,7 @@
 					<label class="weui-label">考生姓名</label>
 				</div>
 				<div class="weui-cell__bd">
-					<input class="weui-input" type="text" placeholder="输入考生姓名" maxlength="32" ng-model="StdReg.std_name">
+					<input class="weui-input" type="text" placeholder="输入考生姓名" maxlength="32" ng-model="StdReg.std_name">
 				</div>
 			</div>
 			<div class="weui-cell" ng-if="getParamValue('EnrolStdBindingStdMobile', 'Active') == 'Active'">
@@ -23,7 +23,7 @@
 					<label class="weui-label">手机号码</label>
 				</div>
 				<div class="weui-cell__bd">
-					<input class="weui-input" type="text" placeholder="输入注册手机号" maxlength="11" ng-model="StdReg.std_mobile">
+					<input class="weui-input" type="text" placeholder="输入注册手机号" maxlength="11" ng-model="StdReg.std_mobile">
 				</div>
 			</div>
 			<div class="weui-cell" ng-if="getParamValue('EnrolStdBindingExamId', 'InActive') == 'Active'">
@@ -31,7 +31,7 @@
 					<label class="weui-label">考生号</label>
 				</div>
 				<div class="weui-cell__bd">
-					<input class="weui-input" type="text" placeholder="输入高考考生号" maxlength="14" ng-model="StdReg.exam_id">
+					<input class="weui-input" type="text" placeholder="输入高考考生号" maxlength="14" ng-model="StdReg.exam_id">
 				</div>
 			</div>
 		</div>
@@ -46,7 +46,7 @@
 		</div>
 		<div class="weui-msg__text-area">
 			<h2 class="weui-msg__title">考生和微信绑定成功</h2>
-			<p class="weui-msg__desc">该微信号已和考生关联,为保证考生能及时收到我们通过微信推送的通知,勿解除绑定关系。</p>
+			<p class="weui-msg__desc">该微信号已和考生关联,为保证考生能及时收到我们通过微信推送的通知,勿解除绑定关系。</p>
 			<div class="button-sp-area ">
 				<a href="javascript:void(0);" class="weui-btn weui-btn_primary" ng-click="goWechat()">进入公众号</a>
 

+ 29 - 26
WebRoot/ymbk/routes/std/info/std_info.html

@@ -6,7 +6,7 @@
 </style>
 <div ng-controller="StdInfoCtrl">
 	<div class="weui-panel weui-panel_access">
-		<div class="weui-panel__hd">个人信息</div>
+		<div class="weui-panel__hd">考生信息</div>
 		<div class="weui-cells">
 			<!--  央美 香港考生
 			<div class="weui-cell"
@@ -123,7 +123,7 @@
 					<label class="weui-label">高考报名号</label>
 				</div>
 				<div class="weui-cell__bd">
-					<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="输入高考报名号" maxlength="14" ng-model="StdReg.exam_id"  >
+					<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="输入高考报名号" maxlength="14" ng-model="StdReg.exam_id"  >
 				</div>
 			</div>
 			<div class="weui-cell">
@@ -131,7 +131,7 @@
 					<label class="weui-label">手机号码</label>
 				</div>
 				<div class="weui-cell__bd">
-					<input class="weui-input"  ng-readonly="!modifyFlag" type="text" placeholder="输入手机号码" maxlength="11" ng-model="StdReg.std_mobile" >
+					<input class="weui-input"  ng-readonly="!modifyFlag" type="text" placeholder="输入手机号码" maxlength="11" ng-model="StdReg.std_mobile" >
 				</div>
 			</div>
 			<div class="weui-cell">
@@ -173,7 +173,7 @@
 						<label class="weui-label">毕业学校</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="输入考生毕业学校" maxlenth="128" ng-model="StdReg.std_school">
+						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="输入考生毕业学校" maxlenth="128" ng-model="StdReg.std_school">
 					</div>
 				</div>
 				
@@ -183,7 +183,7 @@
 						<label class="weui-label">考生类别</label>
 					</div>
 					<div class="weui-cell__bd">
-						<select class="weui-select" ng-model="StdReg.std_param5" placeholder="选择考生类别" style="height:25px;line-height:25px;padding-left:0px;" ng-disabled="!modifyFlag">
+						<select class="weui-select" ng-model="StdReg.std_param5" placeholder="选择考生类别" style="height:25px;line-height:25px;padding-left:0px;" ng-disabled="!modifyFlag">
 							<option value="{{d.dict_value}}" ng-repeat="d in StdTypeArray">{{d.dict_text}}</option>
 						</select>
 					</div>
@@ -206,26 +206,11 @@
 						<label class="weui-label">毕业时间</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" ng-readonly="!modifyFlag"  type="text"  placeholder="选择毕业时间" maxlenth="20" ng-model="StdReg.end_date" id="showDatePicker">
+						<input class="weui-input" ng-readonly="!modifyFlag"  type="text"  placeholder="选择毕业时间" maxlenth="20" ng-model="StdReg.end_date" id="showDatePicker">
 					</div>
 				</div>
 				
-				<div class="weui-cell"><!--  ng-if="getParamValue('EnrolReg_ShowLinkMan','true') == 'true'" -->
-					<div class="weui-cell__hd">
-						<label class="weui-label">紧急联系人</label>
-					</div>
-					<div class="weui-cell__bd">
-						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="请输入紧急联系人" maxlength="128" ng-model="StdReg.link_man" >
-					</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" ng-readonly="!modifyFlag" type="text" placeholder="请输入家长手机号" maxlength="100" ng-model="StdReg.link_mobile" >
-					</div>
-				</div>
+
 				
 				<!-- 通信地址 -->
 				<div class="weui-cell" ng-if="getParamValue('EnrolReg_LinkAddr','Active') == 'Active'">
@@ -233,7 +218,7 @@
 						<label class="weui-label">通信地址</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="输入通信地址" maxlength="300" ng-model="StdReg.link_addr">
+						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="输入通信地址" maxlength="300" ng-model="StdReg.link_addr">
 					</div>
 				</div>
 				
@@ -243,7 +228,7 @@
 						<label class="weui-label">邮政编码</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="输入邮政编码" maxlength="6" ng-model="StdReg.link_postal">
+						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="输入邮政编码" maxlength="6" ng-model="StdReg.link_postal">
 					</div>
 				</div>
 				
@@ -253,9 +238,27 @@
 						<label class="weui-label">电子邮箱</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="输入电子邮箱" maxlength="60" ng-model="StdReg.email">
+						<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="输入电子邮箱" maxlength="60" ng-model="StdReg.email">
 					</div>
 				</div>
+
+
+			<div class="weui-cell"><!--  ng-if="getParamValue('EnrolReg_ShowLinkMan','true') == 'true'" -->
+				<div class="weui-cell__hd">
+					<label class="weui-label">紧急联系人</label>
+				</div>
+				<div class="weui-cell__bd">
+					<input class="weui-input" ng-readonly="!modifyFlag" type="text" placeholder="输入紧急联系人" maxlength="128" ng-model="StdReg.link_man" >
+				</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" ng-readonly="!modifyFlag" type="text" placeholder="输入家长手机号" maxlength="100" ng-model="StdReg.link_mobile" >
+				</div>
+			</div>
 			
 			<!-- <div class="weui-cell"
 				ng-if="getParamValue('EnrolReg_ShowLinkPostal','true') == 'true'">
@@ -298,7 +301,7 @@
 
 
 		<div class="button-sp-area">
-			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="saveExtendInfo()" ng-if="modifyFlag">修改个人信息</a>
+			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="saveExtendInfo()" ng-if="modifyFlag">确认修改</a>
 		</div>
 	</div>
 </div>

+ 4 - 4
WebRoot/ymbk/routes/std/material/std_material.html

@@ -13,7 +13,7 @@
 					<h4 class="weui-media-box__title {{m.verify_status=='Active'?'text-success':''}}" style="font-size: 12pt">{{m.material_name}}
 					<span ng-if="m.verify_status=='InActive'" class="text-danger"> (审核失败,需重新上传)</span>
 					<span ng-if="m.material_file == undefined" class="text-primary"> (未上传,点这里上传)</span>
-					<span ng-if="m.verify_status=='Active'" class="text-success"> (已审核,不可更改)</span>
+					<span ng-if="m.verify_status=='Active'" class="text-success"> (不可更改)</span>
 					</h4>
 					
 					<h4 class="weui-media-box__title text-danger" ng-if="m.verify_status=='InActive'" style="font-size: .60rem">失败原因:{{m.verify_msg}}</h4>
@@ -25,7 +25,7 @@
 					<h4 class="weui-media-box__title {{m.verify_status=='Active'?'text-success':''}}" style="font-size: 12pt">{{m.material_name}}
 					<span ng-if="m.verify_status=='InActive'" class="text-danger"> (审核失败)</span>
 					<span ng-if="m.material_file == undefined" class="text-primary"> (未上传)</span>
-					<span ng-if="m.verify_status=='Active'" class="text-success"> (已审核,不可更改)</span>
+					<span ng-if="m.verify_status=='Active'" class="text-success"> (不可更改)</span>
 					</h4>
 					
 					<h4 class="weui-media-box__title text-danger" ng-if="m.verify_status=='InActive'" style="font-size: .60rem">失败原因:{{m.verify_msg}}</h4>
@@ -39,8 +39,8 @@
 	</div>
 
 	<div class="ui-card" style="padding:20px">
-		<div class="ui-title" style="margin-top: 0px !important;">
-			<span style="line-height:25px;">提供虚假信息,取消考试资格。</span><br>
+		<div class="ui-title" style="margin-top: 0px !important; text-align: center">
+			<span style="line-height:25px; text-align: center">提供虚假信息 取消考试资格</span><br>
 		</div>
 	</div>
 	

+ 6 - 6
WebRoot/ymbk/routes/std/notice/std_notice.html

@@ -9,15 +9,15 @@
 	<div class="weui-msg">
 
 		<div class="ui-card" style="padding: 10px">
-			<div class="ui-big-title" style="margin-top: 0px !important;font-size:17px;">中央美术学院<br>2025年本科招生线上考试告知书</div><br>
+			<div class="ui-big-title" style="margin-top: 0px !important;font-size:17px;">中央美术学院<br>2025年本科招生校考告知书</div><br>
 			<div class="ui-title" style="margin-top: 12px !important;font-size:14px;text-align:left;line-height: 200%">
-				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;本次考试属国家教育考试的组成部分,在参与考试之前,考生务必详尽阅知《中华人民共和国刑法》、《中华人民共和国教育法》、《普通高等学校招生违规行为处理暂行办法》、《国家教育考试违规处理办法》中关于考生考试违规认定及处理的相关内容;阅知《中央美术学院2025年本科招生线上考试考场规则》、《中央美术学院2025年本科招生线上考试考生须知》和《中央美术学院2025年本科招生线上考试操作手册》等相关考试规定,充分了解国家对教育考试的法规要求,以及中央美术学院的考场规则和对考试纪律的要求,防止因不熟悉政策规定而产生不当应考行为。考生应知须知违反考试纪律,影响考试公平、公正应承担相应责任。<br>
+				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;校考属国家教育考试的组成部分,在参与考试之前,考生务必详尽阅知《中华人民共和国刑法》、《中华人民共和国教育法》、《普通高等学校招生违规行为处理暂行办法》、《国家教育考试违规处理办法》中关于考生考试违规认定及处理的相关内容;阅知《中央美术学院2025年本科招生校考专业招生简章》等相关考试规定,充分了解国家对教育考试的法规要求,以及中央美术学院的考场规则和对考试纪律的要求,防止因不熟悉政策规定而产生不当应考行为。考生应知须知违反考试纪律,影响考试公平、公正应承担相应责任。<br>
 				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;考生违背考试公平、公正原则,有违纪行为的,取消该科目的考试成绩;有作弊行为的,取消考生所报名参加考试的各阶段、各科成绩,给予暂停参加中央美术学院本科招生考试3年的处理(不予录取),同时报省级教育考试机构做进一步处理。考生的行为违反《中华人民共和国治安管理处罚法》的,由公安机关进行处理;构成犯罪的,由司法机关依法追究刑事责任。<br>
 			</div>
-			<div class="ui-title" style="text-align:right">
-				中央美术学院<br>
-				2025年1月
-			</div>
+<!--			<div class="ui-title" style="text-align:right">-->
+<!--				中央美术学院<br>-->
+<!--				2025年1月-->
+<!--			</div>-->
 		</div>
 
 

+ 61 - 61
WebRoot/ymbk/routes/std/reg/std_reg.html

@@ -4,7 +4,7 @@
 	<!-- 选择考生所在地 -->
 	<div ng-if="curStep == 'start'">
 		<div class="ui-body">
-			<div class="ui-title">注册前请准备好以下材料</div>
+			<div class="ui-title">做好以下准备</div>
 
 			<div class="ui-card">
 				<table>
@@ -16,7 +16,7 @@
 
 
 				<div class="ui-card-content" style="padding-bottom: 20px;">
-					请准备好考生本人有效证件:<br> 大陆考生使用居民身份证; <br> 台湾考生使用台湾居民来往大陆通行证;<br> 港澳考生使用港澳居民来往内地通行证;<br>华侨考生使用护照。<br>
+					大陆考生使用居民身份证 <br>香港、澳门考生使用港澳居民来往内地通行证<br>台湾考生使用台湾居民来往大陆通行证<br>华侨考生使用护照<br>
 				</div>
 			</div>
 
@@ -32,9 +32,9 @@
 									line-height:20px;
 									margin-top: 10px;" -->
 							<div class="ui-title" style="margin-top: 00px !important">
-								 (1)白色背景;<br> (2)头像水平居中,左右对称,表情自然,双眼自然睁开并平视,耳朵对称,左右肩膀平衡,嘴唇自然闭合;<br>
-								 (3)常戴眼镜者应佩戴眼镜,但不得佩戴彩色眼镜、美瞳眼镜,镜框不得遮挡眼睛,眼镜不能有反光;<br>
-								 (4)免冠,头发不得遮挡眉毛、眼睛和耳朵,不得佩戴耳环、项链等饰品,不得化妆,不着制式服饰,衣着应与背景色区分明显。
+								1.白色背景;<br> 2.头像水平居中,左右对称,表情自然,双眼平视镜头,耳朵对称,左右肩膀平衡,嘴唇自然闭合;<br>
+								3.常戴眼镜者应佩戴眼镜,但不得佩戴彩色眼镜、美瞳眼镜,镜框不得遮挡眼睛,眼镜不能有反光;<br>
+								4.免冠,头发不得遮挡眉毛、眼睛和耳朵,不得佩戴耳环、项链等饰品,不得化妆,不着制式服饰,衣着应与背景色区分明显。
 							</div></td>
 					</tr>
 				</table>
@@ -55,7 +55,7 @@
 	<!-- 选择考生类型 -->
 	<div ng-if="curStep == 'stdTypeChoose'">
 		<div class="ui-body">
-			<div class="ui-big-title">选择考生类型</div>
+			<div class="ui-big-title">选择考生类型</div>
 			<div class="weui-cells">
 				<a class="weui-cell weui-cell_access" href="javascript:;" ng-repeat="d in YmStdTypeArray" ng-click="chooseStdType(d)" >
 					<div class="weui-cell__bd">
@@ -70,7 +70,7 @@
 	<!-- 选择考生所在地 -->
 	<div ng-if="curStep == 'province'">
 		<div class="ui-body">
-			<div class="ui-big-title">选择考生生源地</div>
+			<div class="ui-big-title">选择生源地</div>
 			<div class="weui-search-bar" id="searchBar">
 				<form class="weui-search-bar__form">
 					<div class="weui-search-bar__box" style="height: 30px;">
@@ -102,7 +102,7 @@
 	<div ng-if="curStep == 'ExamIdWarning'">
 
 		<div class="ui-body">
-			<div class="ui-big-title">输入高考报名号</div>
+			<div class="ui-big-title">输入高考报名号</div>
 
 			<div class="weui-cells">
 				<div class="weui-cell">
@@ -137,17 +137,17 @@
 	<div ng-if="curStep == 'IdCard71Warning'">
 		<div class="ui-body">
 			<div class="ui-card">
-				<div class="ui-big-title" style="margin-top: 20px !important">考生生源地:{{currentProvince.province_name}}</div>
+				<div class="ui-big-title" style="margin-top: 20px !important">生源地:{{currentProvince.province_name}}</div>
 
 				<img src="./image/idcard71.jpg" style="background: rgba(252, 220, 212, 1); margin: 20px" class="ui-mg">
 
-				<div class="ui-big-title" style="font-size: 18px !important">准备好台湾居民来往大陆通行证</div>
+				<!--<div class="ui-big-title" style="font-size: 18px !important">准备好台湾居民来往大陆通行证</div>-->
 
-				<div class="ui-title">
-					<!--务必使用考生本人台湾居民来往大陆通行证,请拍照或者直接上传请务必确保照片清晰!-->
+				<!--<div class="ui-title">
+					&lt;!&ndash;务必使用考生本人台湾居民来往大陆通行证,请拍照或者直接上传请务必确保照片清晰!&ndash;&gt;
 					上传考生本人台湾居民来往大陆通行证(人像面),确保采集照片清晰、完整。
 					<br />
-				</div>
+				</div>-->
 			</div>
 
 		</div>
@@ -162,16 +162,16 @@
 	<div ng-if="curStep == 'HongKongMacaoPass'">
 		<div class="ui-body">
 			<div class="ui-card">
-				<div class="ui-big-title" style="margin-top: 20px !important">考生生源地:{{currentProvince.province_name}}</div>
+				<div class="ui-big-title" style="margin-top: 20px !important">生源地:{{currentProvince.province_name}}</div>
 				<img src="./image/idcard80.jpg" style="background: rgba(252, 220, 212, 1); margin: 20px" class="ui-mg">
 
-				<div class="ui-big-title" style="font-size: 18px !important">准备好港澳居民来往内地通行证</div>
+			<!--	<div class="ui-big-title" style="font-size: 18px !important">准备好港澳居民来往内地通行证</div>-->
 
-				<div class="ui-title">
-					<!--务必使用考生本人港澳居民来往内地通行证,请上传请务必确保照片清晰!-->
+				<!--<div class="ui-title">
+					&lt;!&ndash;务必使用考生本人港澳居民来往内地通行证,请上传请务必确保照片清晰!&ndash;&gt;
 					上传考生本人港澳居民来往内地通行证(人像面),确保采集照片清晰、完整。
 					<br />
-				</div>
+				</div>-->
 			</div>
 
 		</div>
@@ -187,16 +187,16 @@
 	<div ng-if="curStep == 'PassportWarning'">
 		<div class="ui-body">
 			<div class="ui-card">
-				<div class="ui-big-title" style="margin-top: 20px !important">考生生源地:{{currentProvince.province_name}}</div>
-				<img src="./image/idcard90.jpg" style="width: 220px; background: rgba(252, 220, 212, 1); margin: 20px" class="ui-mg">
+				<div class="ui-big-title" style="margin-top: 20px !important">生源地:{{currentProvince.province_name}}</div>
+				<img src="./image/idcard90.jpg" style="background: rgba(252, 220, 212, 1); margin: 20px" class="ui-mg">
 
-				<div class="ui-big-title" style="font-size: 18px !important">准备好护照</div>
+			<!--	<div class="ui-big-title" style="font-size: 18px !important">准备好护照</div>-->
 
-				<div class="ui-title">
-					<!--务必使用考生本人护照,请上传请务必确保照片清晰!-->
+				<!--<div class="ui-title">
+					&lt;!&ndash;务必使用考生本人护照,请上传请务必确保照片清晰!&ndash;&gt;
 					上传考生本人护照(人像页),确保采集照片清晰、完整。
 					<br />
-				</div>
+				</div>-->
 			</div>
 
 		</div>
@@ -210,21 +210,21 @@
 	<div ng-if="curStep == 'IdCardWarning'">
 		<div class="ui-card" style="margin: 20px 20px 20px 20px !important;">
 			<center>
-				<div class="ui-big-title" style="padding-top: 20px !important">考生生源地:{{currentProvince.province_name}}</div>
+				<div class="ui-big-title" style="padding-top: 20px !important">生源地:{{currentProvince.province_name}}</div>
 
 				<img src="./image/cert.png" style="width: 295px; height: 184px; background: rgba(252, 220, 212, 1); margin: 10px 20px 20px 20px" class="ui-mg">
 
-				<div class="ui-big-title" style="font-size: 18px !important">请准备好考生居民身份证</div>
+				<!--<div class="ui-big-title" style="font-size: 18px !important">请准备好考生居民身份证</div>-->
 			</center>
 
-			<div class="ui-title" style="margin-left: 20px !important; margin-top: 0px !important; padding-top: 10px !important; padding-bottom: 20px !important;">
-				上传考生本人有效身份证(人像面),确保采集照片清晰、完整。<br />
-			</div>
+<!--			<div class="ui-title" style="margin-left: 20px !important; margin-top: 0px !important; padding-top: 10px !important; padding-bottom: 20px !important;">-->
+<!--				上传考生本人有效身份证(人像面),确保采集照片清晰、完整。<br />-->
+<!--			</div>-->
 		</div>
 
 		<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)}}次证件识别验证机会,为不影响正常报名,谨慎操作。
+			上传身份证后,系统自动识别证件信息,考生仔细核对,若识别有误,自行修改正确。<br>
+			报名系统每天仅提供{{getParamValue('EnrolIdCardOcrtext',5)}}次证件识别验证机会,为不影响正常报名,谨慎操作。
 		</div>
 
 		<div class="button-sp-area">
@@ -236,8 +236,8 @@
 	<div ng-if="curStep == 'IdCardResult'">
 		<div class="weui-panel weui-panel_access">
 			<div class="weui-panel__hd">
-				<div>居民身份证识别结果</div>
-				<p class="text-danger">认真核对以下信息,如考生姓名识别错误,请自行修改!</p>
+				<div>识别结果</div>
+				<!--<p class="text-danger">认真核对以下信息,如考生姓名识别错误,自行修改。</p>-->
 			</div>
 			<div class="weui-cells">
 				<div class="weui-cell">
@@ -259,7 +259,7 @@
 						<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">
+						<input class="weui-input" type="text" maxlength="32" placeholder=" 手动输入考生姓名" ng-model="StdReg.std_name_confirm">
 					</div>
 				</div>
 				<div class="weui-cell">
@@ -314,20 +314,20 @@
 						<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>
 
 	</div>
 	<div ng-if="curStep == 'IdCardOther'">
 		<div class="weui-panel weui-panel_access">
-			<div class="weui-panel__hd">填写信息</div>
+			<div class="weui-panel__hd">填写考生信息</div>
 			<div class="weui-cells">
 				<div class="weui-cell">
 					<div class="weui-cell__hd">
@@ -335,10 +335,10 @@
 						<label class="weui-label" ng-if="StdReg.std_province==90">护照号</label>
 					</div>
 					<div class="weui-cell__bd" ng-if="StdReg.std_province!=90">
-						<input class="weui-input custom-placeholder" type="text" placeholder="输入证件号码,有括号输入半角()" maxlenth="28" ng-model="StdReg.cert_id">
+						<input class="weui-input custom-placeholder" type="text" placeholder="输入证件号码,有括号输入半角()" maxlenth="28" ng-model="StdReg.cert_id">
 					</div>
 					<div class="weui-cell__bd" ng-if="StdReg.std_province==90">
-						<input class="weui-input custom-placeholder" type="text" placeholder="输入护照号,有括号输入半角()" maxlenth="28" ng-model="StdReg.cert_id">
+						<input class="weui-input custom-placeholder" type="text" placeholder="输入护照号,有括号输入半角()" maxlenth="28" ng-model="StdReg.cert_id">
 					</div>
 				</div>			
 				<div class="weui-cell">
@@ -354,7 +354,7 @@
 						<label class="weui-label">考生姓名</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" placeholder="输入考生姓名" maxlenth="32" ng-model="StdReg.std_name">
+						<input class="weui-input" type="text" placeholder="输入考生姓名" maxlenth="32" ng-model="StdReg.std_name">
 					</div>
 				</div>
 				<div class="weui-cell">
@@ -363,7 +363,7 @@
 					</div>
 
 					<div class="weui-cell__bd">
-						<select class="weui-select" ng-model="StdReg.std_sex" placeholder="选择考生性别" style="height:25px;line-height:25px;">
+						<select class="weui-select" ng-model="StdReg.std_sex" placeholder="选择考生性别" style="height:25px;line-height:25px;">
 							<option value="">请选择</option>
 							<option value="男">男</option>
 							<option value="女">女</option>
@@ -412,13 +412,13 @@
 						<label class="weui-label">手机号码</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" placeholder="必填,请牢记该号码" maxlenth="11" ng-model="StdReg.std_mobile">
+						<input class="weui-input" type="text" placeholder="输入考生手机号码" maxlenth="11" 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(2)">确认考生信息</a>
+				<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="saveIdCard(2)">确认信息</a>
 			</div>
 		</div>
 	</div>
@@ -457,10 +457,10 @@
 				<!--
 				<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;">(2)头像水平居中,左右对称,表情自然,双眼自然睁开并平视,耳朵对称,左右肩膀平衡,嘴唇自然闭合;</ul>
-				<ul style="font-size:16px;">(3)常戴眼镜者应佩戴眼镜,但不得佩戴彩色眼镜、美瞳眼镜,镜框不得遮挡眼睛,眼镜不能有反光;</ul>
-				<ul style="font-size:16px;">(4)免冠,头发不得遮挡眉毛、眼睛和耳朵,不得佩戴耳环、项链等饰品,不得化妆,不着制式服饰,衣着应与背景色区分明显。</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>
 			</div>
 		</div>
 		<br>
@@ -494,7 +494,7 @@
 	<!-- 扩展信息区域 -->
 	<div ng-if="curStep == 'StdExtendInfo'" style="height:800px;overflow-y: scroll">
 		<div class="weui-panel weui-panel_access" style="margin-left: 20px; margin-right: 20px">
-			<div class="weui-panel__hd" style="margin-left: 20px;">完善考生信息</div>
+			<div class="weui-panel__hd" style="margin-left: 20px;">完善考生信息</div>
 			<div class="weui-cells" style="margin-left: 20px;">
 
 				<div class="weui-cell" ng-if="getParamValue('SchoolCode') == '51065'">
@@ -549,7 +549,7 @@
 						<label class="weui-label">毕业学校</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" placeholder="输入考生毕业学校" maxlenth="128" ng-model="StdReg.std_school">
+						<input class="weui-input" type="text" placeholder="输入考生毕业学校" maxlenth="128" ng-model="StdReg.std_school">
 					</div>
 				</div>
 				
@@ -559,7 +559,7 @@
 						<label class="weui-label">考生类别</label>
 					</div>
 					<div class="weui-cell__bd">
-						<select class="weui-select" ng-model="StdReg.std_param5" placeholder="选择考生类别" style="height:25px;line-height:25px;padding-left:0px;">
+						<select class="weui-select" ng-model="StdReg.std_param5" placeholder="选择考生类别" style="height:25px;line-height:25px;padding-left:0px;">
 							<option value="{{d.dict_value}}" ng-repeat="d in StdTypeArray">{{d.dict_text}}</option>
 						</select>
 					</div>
@@ -571,7 +571,7 @@
 						<label class="weui-label">毕业时间</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text"  placeholder="选择毕业时间" maxlenth="20" ng-model="StdReg.end_date"  ng-click="getGraduateDate()"  readonly>
+						<input class="weui-input" type="text"  placeholder="选择毕业时间" maxlenth="20" ng-model="StdReg.end_date"  ng-click="getGraduateDate()"  readonly>
 					</div>
 				</div>
 				
@@ -583,7 +583,7 @@
 						<label class="weui-label">通信地址</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" placeholder="输入通信地址" maxlength="300" ng-model="StdReg.link_addr">
+						<input class="weui-input" type="text" placeholder="输入通信地址" maxlength="300" ng-model="StdReg.link_addr">
 					</div>
 				</div>
 				
@@ -592,7 +592,7 @@
 						<label class="weui-label">邮政编码</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" placeholder="输入邮政编码"
+						<input class="weui-input" type="text" placeholder="输入邮政编码"
 							maxlength="6" ng-model="StdReg.link_postal">
 					</div>
 				</div>
@@ -603,7 +603,7 @@
 						<label class="weui-label">电子邮箱</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" placeholder="输入电子邮箱" maxlength="60" ng-model="StdReg.email">
+						<input class="weui-input" type="text" placeholder="输入电子邮箱" maxlength="60" ng-model="StdReg.email">
 					</div>
 				</div>
 
@@ -612,7 +612,7 @@
 						<label class="weui-label">紧急联系人</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" placeholder="输入紧急联系人" maxlength="128" ng-model="StdReg.link_man">
+						<input class="weui-input" type="text" placeholder="输入紧急联系人" maxlength="128" ng-model="StdReg.link_man">
 					</div>
 				</div>
 
@@ -621,18 +621,18 @@
 						<label class="weui-label">联系人手机</label>
 					</div>
 					<div class="weui-cell__bd">
-						<input class="weui-input" type="text" placeholder="多个用英文分号分割" maxlength="100" ng-model="StdReg.link_mobile" >
+						<input class="weui-input" type="text" placeholder="多个用英文分号分割" maxlength="100" ng-model="StdReg.link_mobile" >
 					</div>
 				</div>
 
-				<div>
-					<span style="line-height:25px; font-size: 16px; color: grey;padding-left: 30px;" >提供虚假信息,取消考试资格。</span>
+				<div style="text-align: center">
+					<span style="line-height:25px; font-size: 16px; color: grey;text-align: center" >提供虚假信息 取消考试资格</span>
 				</div>
 
 			</div>
 
 			<div class="button-sp-area">
-				<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="saveExtendInfo()">确认考生信息</a>
+				<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="saveExtendInfo()">确认信息</a>
 			</div>
 		</div>
 	</div>
@@ -645,7 +645,7 @@
 			</div>
 			<div class="weui-msg__text-area">
 				<h2 class="weui-msg__title">注册成功</h2>
-				<div class="ui-title">考生需在报名有效期内完成专业选择及缴费,逾期无法补报。</div>
+				<div class="ui-title">考生须在报名有效期内完成专业选择及缴费<br>逾期无法补报</div>
 				<div class="button-sp-area">
 					<a href="javascript:void(0);" class="weui-btn weui-btn_primary" ng-click="goLocation('std/material')">提交材料</a>
 				</div>

+ 4 - 4
WebRoot/ymbk/routes/std/reg/std_reg.js

@@ -489,13 +489,13 @@ app.controller('StdRegCtrl', [ '$rootScope', '$scope', '$http', '$timeout', '$st
 							} else {
 								//香港、台湾、澳门的考生,需要显示不同的提示
 								if ($scope.StdReg.std_province == '71') {
-									$scope.certTips = '输入台湾身份证号码';
+									$scope.certTips = '输入台湾身份证号码';
 								} else if ($scope.StdReg.std_province == '80' || $scope.StdReg.std_province == '81') {
-									$scope.certTips = '输入香港身份证件号码';
+									$scope.certTips = '输入香港身份证件号码';
 								} else if ($scope.StdReg.std_province == '82') {
-									$scope.certTips = '输入澳门身份证件号码';
+									$scope.certTips = '输入澳门身份证件号码';
 								} else {
-									$scope.certTips = '输入身份证号码';
+									$scope.certTips = '输入身份证号码';
 								}
 								$scope.curStep = 'IdCardOther';
 							}

+ 8 - 7
WebRoot/ymbk/routes/std/unbinding/std_unbinding.html

@@ -6,11 +6,12 @@
 		<div class="weui-msg__text-area">
 			<h2 class="weui-msg__title">取消微信和考生绑定</h2>
 			<p class="weui-msg__desc">
-				当前微信号和考生【{{ArtStdReg.std_name}}】关联,此操作将取消考生和微信关联关系。<br /> <span style="color: #d4003d">取消绑定后,将无法接收到我们通过微信推送的通知,由此产生的后果由考生自行负责,请谨慎进行此操作!</span>
+				<!--当前微信号和考生【{{ArtStdReg.std_name}}】关联,此操作将取消考生和微信关联关系。<br />-->
+				<span style="color: #d4003d;text-align: center">取消绑定后将无法接收微信推送通知</span>
 			</p>
 			<div class="button-sp-area ">
-				<a href="javascript:void(0);" class="weui-btn weui-btn_primary" ng-click="goLocation('main')" ng-if="ArtStdReg && ArtStdReg.reg_status == 'Complete'">算了,回首页</a>
-				<a href="javascript:void(0);" class="weui-btn weui-btn_warn" style="color: #d4003d" ng-click="stdUnbinding()">确定要取消绑定</a>
+				<a href="javascript:void(0);" class="weui-btn weui-btn_primary" ng-click="goLocation('main')" ng-if="ArtStdReg && ArtStdReg.reg_status == 'Complete'">回首页</a>
+				<a href="javascript:void(0);" class="weui-btn weui-btn_warn" style="color: #d4003d" ng-click="stdUnbinding()">确定解除</a>
 
 			</div>
 		</div>
@@ -21,12 +22,12 @@
 			<i class="weui-icon-success weui-icon_msg"></i>
 		</div>
 		<div class="weui-msg__text-area">
-			<h2 class="weui-msg__title">考生和微信绑定关系被解除</h2>
-			<p class="weui-msg__desc">
+			<h2 class="weui-msg__title">解除成功</h2>
+			<!--<p class="weui-msg__desc">
 				该微信号已解除和考生关联关系,为保证考生能及时收到我们通过微信推送的通知,请尽快进行绑定业务操作。
-			</p>
+			</p>-->
 			<div class="button-sp-area ">
-				<a href="javascript:void(0);" class="weui-btn weui-btn_primary" ng-click="closeWechat()">退出当前公众号</a>
+				<a href="javascript:void(0);" class="weui-btn weui-btn_primary" ng-click="closeWechat()">退出公众号</a>
 
 			</div>
 		</div>

+ 1 - 1
WebRoot/ymbk/wechat.jsp

@@ -8,7 +8,7 @@
 <meta charset="utf-8" />
 <meta http-equiv="Content-Type" name="viewport"
 	content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-<title><%=ArtParamHelper.SchoolName%></title>
+<title>中央美术学院2025年本科招生</title>
 <link rel="stylesheet"
 	href="https://cdn.bootcss.com/weui/2.0.1/style/weui.min.css">
 <link rel="stylesheet"

+ 3 - 2
WebRoot/ymfz/routes/score/fz/score_fz_info.html

@@ -16,10 +16,11 @@
         <span class="weui-form-preview__value">{{score.ticket_no}}</span>
       </div>
       <div class="weui-form-preview__item">
-        <label class="weui-form-preview__label">造型基础:</label>
+        <label class="weui-form-preview__label" ng-if="score.aspect_name!='美术学'">造型基础:</label>
+        <label class="weui-form-preview__label" ng-if="score.aspect_name=='美术学'">美术鉴赏与写作:</label>
         <span class="weui-form-preview__value">{{score.subj_zxjc}}</span>
       </div>
-      <div class="weui-form-preview__item">
+      <div class="weui-form-preview__item" ng-if="score.aspect_name!='美术学'">
         <label class="weui-form-preview__label">命题创作:</label>
         <span class="weui-form-preview__value">{{score.subj_mtcz}}</span>
       </div>