dedsudiyu vor 1 Woche
Ursprung
Commit
cf12feda02

+ 2 - 2
api/request/config.js

@@ -3,7 +3,7 @@ const config = {
 	
 	// base_url: 'http://192.168.1.43/api', //43服务器
 	// base_url: 'http://192.168.1.8/api',//1.8服务器
-	base_url: 'http://192.168.1.88/labSystem',//1.8服务器
+	// base_url: 'http://192.168.1.88/labSystem',//1.8服务器
 	// base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.24:8080',//林总
 	// base_url: 'http://192.168.1.7:8080',//刘波
@@ -40,7 +40,7 @@ const config = {
 	/************************************ 院级管理员身份ID ************************************/
   collegeId:'1815336278075838465',
 	/************************************ 版本号 ************************************/
-  weChatProgramVersion:'1.0.165',
+  weChatProgramVersion:'1.0.166',
 }
 export {
 	config

+ 7 - 1
pages/views/pupilPage/pupilHome.vue

@@ -6,7 +6,8 @@
 			<img class="position-img" :src="rectangleLogo">
 		</view>
 		<view class="button-one-box">
-			<view class="button-min" @click="goPage('securityExaminationPupil')" style="margin:23rpx 0 0 20rpx;">
+			<!-- <view class="button-min" @click="goPage('securityExaminationPupil')" style="margin:23rpx 0 0 20rpx;"> -->
+			<view class="button-min" @click="goPage('safetyEducationExaminationPupil')" style="margin:23rpx 0 0 20rpx;">
 				<img class="button-img" :src="imagesUrl('home/icon_sy_aqks@1x.png')">
 				<view class="button-name">教育考试</view>
 			</view>
@@ -199,6 +200,11 @@
 				}else if(type == 'hazardousWasteRecyclingPupil'){
 					//危废回收
 					this.systemUserGetPost();
+				}else if(type == 'safetyEducationExaminationPupil'){
+					//教育考试
+					uni.navigateTo({
+						url: "/pages_safetyEducationExamination/views/home/index",
+					});
 				}
 			},
 			async systemUserGetPost(){

+ 7 - 1
pages/views/teacherPage/teacherHome.vue

@@ -9,7 +9,8 @@
 				<img class="position-img" :src="rectangleLogo">
 			</view>
 			<view class="button-one-box">
-				<view class="button-min" @click="goPage('securityExamination')" style="margin:23rpx 0 0 20rpx;">
+				<!-- <view class="button-min" @click="goPage('securityExamination')" style="margin:23rpx 0 0 20rpx;"> -->
+				<view class="button-min" @click="goPage('safetyEducationExamination')" style="margin:23rpx 0 0 20rpx;">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_aqks@1x.png')">
 					<view class="button-name">教育考试</view>
 				</view>
@@ -302,6 +303,11 @@
 				}else if(type == 'hazardousWasteRecycling'){
 					//危废回收
 					this.systemUserGetPost();
+				}else if(type == 'safetyEducationExamination'){
+					//教育考试
+					uni.navigateTo({
+						url: "/pages_safetyEducationExamination/views/home/index",
+					});
 				}
 			}, 
 			async systemUserGetPost(){