haogh 7 luni în urmă
părinte
comite
e8f9a782d2
3 a modificat fișierele cu 70 adăugiri și 66 ștergeri
  1. 1 1
      WebRoot/ymbk/index.html
  2. 60 65
      WebRoot/ymfz/index.html
  3. 9 0
      sql/fz_update.sql

+ 1 - 1
WebRoot/ymbk/index.html

@@ -124,7 +124,7 @@
 					
 				</div>
 				
-				<div class="weui-tabbar" ng-controller="TabbarCtrl" ng-if="ArtStdReg && ArtStdReg.reg_status !== 'Complete'"">
+				<div class="weui-tabbar" ng-controller="TabbarCtrl" ng-if="ArtStdReg && ArtStdReg.reg_status !== 'Complete'">
 					<div class="weui-tabbar__item " ng-click="showMenu('help')">
 						<a href="javascript:;">
 							<div class="weui-tabbar__icon">

+ 60 - 65
WebRoot/ymfz/index.html

@@ -45,78 +45,73 @@
 
 </head>
 <body ng-app="app" ng-controller="AppCtrl" ontouchstart>
-	<div class="page">
-		<div class="page__bd" style="height: 100%;">
-			<div class="weui-tab">
-				<div class="weui-tab__panel" ui-view style="background: rgba(246,248,250,1)"></div>
-				<div class="weui-tabbar" ng-controller="TabbarCtrl" ng-if="ArtStdReg">
-					<a href="javascript:;" ng-click="goLocation('main')" class="weui-tabbar__item">
+<div class="page">
+	<div class="page__bd" style="height: 100%;">
+		<div class="weui-tab">
+			<div class="weui-tab__panel" ui-view style="background: rgba(246,248,250,1)"></div>
+			<div class="weui-tabbar" ng-controller="TabbarCtrl" ng-if="ArtStdReg && ArtStdReg.reg_status == 'Complete'">
+				<a href="javascript:;" ng-click="goLocation('main')" class="weui-tabbar__item">
+					<div class="weui-tabbar__icon">
+						<img src="./image/tabbar/icon_home_press@2x.png" alt="">
+					</div>
+					<p class="weui-tabbar__label">首页</p>
+				</a>
+				<!-- 报名考试期间 -->
+				<div href="javascript:;" class="weui-tabbar__item" ng-if="getParamValue('WeixinMenuEnrol','InActive') == 'Active'" ng-click="showMenu('enrol')">
+					<a href="javascript:;">
 						<div class="weui-tabbar__icon">
-							<img src="./image/tabbar/icon_home_press@2x.png" alt="">
+							<img src="./image/tabbar/icon_test_nor@2x.png" alt="">
 						</div>
-						<p class="weui-tabbar__label">首页</p>
+						<p class="weui-tabbar__label">已报专业</p>
 					</a>
-					<!--
-					<div class="weui-tabbar__item " ng-click="goLocation('ym/aspect_list')" ng-if="ArtStdReg.std_province < 70">
-						<a href="javascript:;">
-							<div class="weui-tabbar__icon">
-								<img src="./image/tabbar/icon_me_nor@2x.png" alt="">
-							</div>
-							<p class="weui-tabbar__label">收卷查询</p>
-						</a>
-					</div>-->
-					<!-- 录取通知书查询 
-					<div class="weui-tabbar__item " ng-click="goLocation('ym/std_admis')">
-						<a href="javascript:;">
-							<div class="weui-tabbar__icon">
-								<img src="./image/tabbar/icon_me_nor@2x.png" alt="">
-							</div>
-							<p class="weui-tabbar__label">录取查询</p>
-						</a>
-					</div>	-->				
-					<!-- 报名考试期间 -->
-					<div href="javascript:;" class="weui-tabbar__item"  ng-if="getParamValue('WeixinMenuEnrol','InActive') == 'Active'" ng-click="showMenu('enrol')">
-						<a href="javascript:;">
-							<div class="weui-tabbar__icon">
-								<img src="./image/tabbar/icon_test_nor@2x.png" alt="">
-							</div>
-							<p class="weui-tabbar__label">已报专业</p>
-						</a>
-					</div>
-					
-					<div class="weui-tabbar__item " ng-click="showMenu('help')">
-						<a href="javascript:;">
-							<div class="weui-tabbar__icon">
-								<img src="./image/tabbar/un-binding.png" alt="">
-							</div>
-							<p class="weui-tabbar__label">解除绑定</p>
-						</a>
-					</div>
-					
-					<div class="weui-tabbar__item " ng-click="showMenu('me')">
-						<a href="javascript:;">
-							<div class="weui-tabbar__icon">
-								<img src="./image/tabbar/icon_me_nor@2x.png" alt="">
-							</div>
-							<p class="weui-tabbar__label">我的</p>
-						</a>
-					</div>
-					
-					
-					<!-- 分数查询期间 -->
-					<div href="javascript:;" class="weui-tabbar__item" ng-if="getParamValue('WeixinMenuScore','InActive') == 'Active'" ng-click="showMenu('score')">
-						<a href="javascript:;">
-							<div class="weui-tabbar__icon">
-								<img src="./image/tabbar/icon_home_nor@2x.png" alt="">
-							</div>
-							<p class="weui-tabbar__label">分数查询</p>
-						</a>
-					</div>
+				</div>
+
+				<div class="weui-tabbar__item " ng-click="showMenu('help')">
+					<a href="javascript:;">
+						<div class="weui-tabbar__icon">
+							<img src="./image/tabbar/un-binding.png" alt="">
+						</div>
+						<p class="weui-tabbar__label">解除绑定</p>
+					</a>
+				</div>
+
+				<div class="weui-tabbar__item " ng-click="showMenu('me')">
+					<a href="javascript:;">
+						<div class="weui-tabbar__icon">
+							<img src="./image/tabbar/icon_me_nor@2x.png" alt="">
+						</div>
+						<p class="weui-tabbar__label">我的</p>
+					</a>
+				</div>
+
 
-					
+				<!-- 分数查询期间 -->
+				<div href="javascript:;" class="weui-tabbar__item" ng-if="getParamValue('WeixinMenuScore','InActive') == 'Active'" ng-click="showMenu('score')">
+					<a href="javascript:;">
+						<div class="weui-tabbar__icon">
+							<img src="./image/tabbar/icon_home_nor@2x.png" alt="">
+						</div>
+						<p class="weui-tabbar__label">分数查询</p>
+					</a>
 				</div>
+
+
 			</div>
+
+			<div class="weui-tabbar" ng-controller="TabbarCtrl" ng-if="ArtStdReg && ArtStdReg.reg_status !== 'Complete'">
+				<div class="weui-tabbar__item " ng-click="showMenu('help')">
+					<a href="javascript:;">
+						<div class="weui-tabbar__icon">
+							<img src="./image/tabbar/un-binding.png" alt="">
+						</div>
+						<p class="weui-tabbar__label">解除绑定</p>
+					</a>
+				</div>
+			</div>
+
+
 		</div>
 	</div>
+</div>
 </body>
 </html>

+ 9 - 0
sql/fz_update.sql

@@ -204,3 +204,12 @@ INSERT INTO `frame_res`(`RES_ID`, `RES_NAME`, `RES_ALIAS`, `RES_URL`, `RES_PID`,
 
 -- 2024-11-14
 INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'ModifyStuDeadLine', '2025-03-01 09:00:00', '个人信息修改截止时间');
+
+
+-- 2024-11-19
+UPDATE `frame_report` SET  `REPORT_SQL` = 'select distinct r.std_name,r.cert_id,r.exam_id,r.std_sex,r.std_mobile from std_reg r,std_enrol e,ly_std_ticket t\r\n where r.std_id=e.std_id and e.pay_status=\'Active\' and r.std_id=t.std_id\r\n and (r.province_flag = ? or 1=?)\r\n	and r.std_id not in (select distinct std_id from std_log where log_type=\'DownloadTicket\');'
+WHERE `REPORT_NAME` = 'TicketStdNotDownloadReport';
+
+ALTER TABLE `tx_std_live_log`
+    ADD INDEX `IDX_01`(`biz_token`),
+    ADD INDEX `IDX_02`(`std_id`);