央美本科优化

WebRoot/ymbk/routes/main/main.html

@@ -34,10 +34,12 @@
 						
 						<p class="weui-media-box__desc" ng-if="false&&e.teach_college && e.teach_college.length>0">{{getParamValue('EnrolAspectTeachCollegeText','教学院区')}}：{{e.teach_college}}</p>
 					</div>
-					<a href="javascript:void(0);" class="weui-btn weui-btn weui-btn_default " ng-if="!hasFirstScore && !hasFinalScore"  ng-click="goEnrol(e)">查看详情</a>
+					<a href="javascript:void(0);" class="weui-btn weui-btn weui-btn_default " ng-if="!hasFirstScore && !hasFinalScore && e.pay_status=='Active'"  ng-click="goEnrol(e)">查看详情</a>
 					<!--成绩查询-->
 					<a href="javascript:;" class="weui-btn weui-btn_primary" style="font-size:10pt;" ng-if="firstScoreTimeFlag && hasFirstScore && e.aspect_id != 20701" ng-click="goFirstScore(e)">查询成绩</a>
-					<a href="javascript:;" class="weui-btn weui-btn_primary" style="font-size:10pt;" ng-if="finalScoreTimeFlag && hasFinalScore" ng-click="goFinalScore(e)">复试查询成绩</a>
+					<a href="javascript:;" class="weui-btn weui-btn_primary" style="font-size:10pt;" ng-if="finalScoreTimeFlag && hasFinalScore && e.aspect_id != 22001 && ArtStdReg.std_qualified_flag=='Active'" ng-click="goFinalScore(e)">查询成绩</a>
+					<a href="javascript:;" class="weui-btn weui-btn_primary" style="font-size:10pt;" ng-if="finalScoreTimeFlag && hasFinalScore && e.aspect_id == 22001
+						&& (e.std_id == 336012 || e.std_id == 336843 || e.std_id == 337757) && ArtStdReg.std_qualified_flag=='Active'" ng-click="goFinalScore(e)">查询成绩</a>
 				</div>
 				<br>
 			</div>
@@ -73,9 +75,10 @@
 					开始时间:{{Agent.enrol_start_time}} <br>
 					结束时间:{{Agent.enrol_end_time}}
 				</div>
+				<!--
 				<div class="button-sp-area">
 					<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="goLocation('enrol/guide')">选择专业</a>
-				</div>
+				</div>-->
 			</div>
 
 		</div>

WebRoot/ymbk/routes/ym/score/ym_score.html

@@ -36,8 +36,9 @@
 				<div class="weui-cell"  ng-if="enrol.subject_name_1">
 					<div class="weui-cell__hd">
 						<label class="weui-label" ng-if="enrol.subject_name_1=='素描'">素&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 描</label>
+						<label class="weui-label" ng-if="enrol.subject_name_1=='临摹'">临&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 摹</label>
 						<label class="weui-label" ng-if="enrol.subject_name_1=='美术鉴赏与写作'">美术鉴赏<br>&nbsp;&nbsp;与写作</label>
-						<label class="weui-label" ng-if="enrol.subject_name_1!=='素描' && enrol.subject_name_1!=='美术鉴赏与写作'">{{enrol.subject_name_1}}</label>
+						<label class="weui-label" ng-if="enrol.subject_name_1!=='素描' && enrol.subject_name_1!=='美术鉴赏与写作' && enrol.subject_name_1!=='临摹'">{{enrol.subject_name_1}}</label>
 					</div>
 					<div class="weui-cell__bd">{{enrol.subject_score_1}}</div>
 				</div>
@@ -53,7 +54,10 @@
 				</div>
 				<div class="weui-cell"  ng-if="enrol.subject_name_3">
 					<div class="weui-cell__hd">
-						<label class="weui-label">{{enrol.subject_name_3}}</label>
+						<!--<label class="weui-label">{{enrol.subject_name_3}}</label>-->
+						<label class="weui-label" ng-if="enrol.subject_name_3=='速写'">速&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 写</label>
+						<label class="weui-label" ng-if="enrol.subject_name_3=='书法'">书&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 法</label>
+						<label class="weui-label" ng-if="enrol.subject_name_3!=='速写' && enrol.subject_name_3!=='书法'">{{enrol.subject_name_3}}</label>
 					</div>
 					<div class="weui-cell__bd">{{enrol.subject_score_3}}</div>
 				</div>
@@ -152,10 +156,10 @@
 	</div>
 
 
-	<div class="ui-card" style="padding:20px">
+<!--	<div class="ui-card" style="padding:20px">
 		<div class="ui-title" style="margin-top: 0px !important; text-align: center">
 			<span style="line-height:25px; text-align: center">严禁对试卷进行传播<br>否则按作弊处理</span><br>
 		</div>
-	</div>
+	</div>-->
 
 </div>

WebRoot/ymbk/routes/ym/score/ym_score.js

@@ -1,6 +1,6 @@
 app.controller('YmScoreCtrl', [ '$rootScope', '$scope', '$stateParams', '$timeout', function($rootScope, $scope, $stateParams, $timeout) {
 	if ($stateParams == undefined || $stateParams.aspect_name == undefined) {
-		$.alert('参数错误，无法获取准考证详细信息', function() {
+		$.alert('网络错误，请稍后刷新重试', function() {
 			$rootScope.goWechat();
 		});
 		return;