From 932f5955ca6d74d1f51a49baa534bd3fde8eec00 Mon Sep 17 00:00:00 2001
From: mengfanliang <mengfanliang@zcloudchina.com>
Date: Fri, 7 Mar 2025 16:05:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                          |   6 +-
 api/index.js                     |   1 +
 pages/index/index.vue            | 111 ++++++++++++++++++++-----------
 pages/login/login.vue            |   1 +
 pages/train_management/index.vue |  42 ++++++++----
 utils/request.js                 |   3 +-
 6 files changed, 107 insertions(+), 57 deletions(-)

diff --git a/App.vue b/App.vue
index 1d4b2e1..5d54c1b 100644
--- a/App.vue
+++ b/App.vue
@@ -1,14 +1,14 @@
 <script>
 export default {
   onLaunch: function () {
-    console.log('App Launch')
+    // console.log('App Launch')
     this.isLogin()
   },
   onShow: function () {
-    console.log('App Show')
+    // console.log('App Show')
   },
   onHide: function () {
-    console.log('App Hide')
+    // console.log('App Hide')
   },
   methods:{
     // 是否登录
diff --git a/api/index.js b/api/index.js
index e2d8ec8..4b52804 100644
--- a/api/index.js
+++ b/api/index.js
@@ -84,4 +84,5 @@ export const compareUserFaceCertify = (params) => post('/app/user/compareFace',
 export const compareUserVideoFaceCertify = (params) => post('/app/user/compareVideoFace', params) // 视频人脸验证
 export const compareUserExamFaceCertify = (params) => post('/app/user/compareExamFace', params) // 考试照片人脸认证
 export const compareUserExamVideoFaceCertify = (params) => post('/app/user/compareExamVideoFace', params) // 考试视频人脸认证
+export const getListAll = (params) => post("/app/stagestudentrelation/getClassInfoByParams", params);
 // ********************* end ***********************
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 669ad9e..1b39017 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -98,63 +98,94 @@ export default {
 		}
 	},
 	onLoad() {
+		// 获取系统版本号, 其函数主体在 /utils/updateVersion.js 文件内查找
 		this.fnUpdateVersion(false)
 		this.getUserFaceCompleted()
 	},
 	methods: {
+		handleGetListAll(classId) {
+			return new Promise(async (resolve, reject) => {
+				const userInfo = store.getters.getUserInfo
+				await getListAll({
+					classId,
+					userId: userInfo.USER_ID
+				})
+					.then((resData) => {
+						resolve(resData.classInfo)
+					})
+					.catch(() => {
+						uni.$u.toast('网络开小差了,请稍后尝试')
+						reject()
+					})
+			})
+		},
 		async fnScan() {
 			uni.scanCode({
 				success: async (res) => {
-					let obj = JSON.parse(res.result)
-					let type = obj[0].CODE_TYPE
-					if (type === '0') {
-						let info = await setEntryV1({
+					// let obj = JSON.parse(res.result)
+					// let type = obj[0].CODE_TYPE
+					const { classId, type } = JSON.parse(response.result)
+					const classInfo = await this.handleGetListAll(classId);
+					switch(type) {
+						case "0": {
+							let info = await setEntryV1({
 							userId: this.userInfo.USER_ID,
 							corpinfoId: obj[0].CORPINFO_ID,
 							RELEVANT_UNIT_NAME: obj[0].RELEVANT_UNIT_NAME,
-              postMethod: 'application/json'
+							postMethod: 'application/json'
 						})
-						if (info.code === 200) {
-							uni.$u.toast('入职成功')
-						} else {
-							uni.$u.toast('入职失败，请联系管理员')
-						}
-					} else if (type === '1') {
-						// type=1时跳转电子工牌页面
-						uni.$u.route({
-							url: '/pages/electronic_work_card/index',
-							params: {
-								USER_ID: obj[0].USER_ID,
-								CODE_TYPE: obj[0].CODE_TYPE
+							if (info.code === 200) {
+								uni.$u.toast('入职成功')
+							} else {
+								uni.$u.toast('入职失败，请联系管理员')
 							}
-						})
-					} else if (type === '2') {
-						// 签到二维码方式进入, [type: 2 --> 签到二维码方式进入]
-						if (findClassId) {
+							break;
+						};
+						case "1": {
+							// type=1时跳转电子工牌页面
 							uni.$u.route({
-								url: '/pages/train_management/realname_info_auth',
+								url: '/pages/electronic_work_card/index',
 								params: {
-									type: 'scan_face',
-									classId
+									USER_ID: obj[0].USER_ID,
+									CODE_TYPE: obj[0].CODE_TYPE
 								}
 							})
-						} else {
-							uni.$u.toast('您未在培训计划内，无法入班签到，请联系教师')
-						}
-					} else if (type === '3') {
-						// 考试二维码方式进入 [type: 3 --> 考试二维码方式进入]
-						if (findClassId) {
-							uni.$u.route({
-								url: '/pages/train_management/face_authentication',
-								params: {
-									type: 'learning_certification',
-									stageexampaperinputId,
-									classId,
-								}
-							})
-						} else {
-							uni.$u.toast('您未在培训计划内，无法进行考试，请联系教师')
+							break;
+						};
+						case "2": {
+							// 签到二维码方式进入, [type: 2 --> 签到二维码方式进入]
+							if (classInfo) {
+								uni.$u.route({
+									url: '/pages/train_management/realname_info_auth',
+									params: {
+										type: 'scan_face',
+										classId
+									}
+								})
+							} else {
+								uni.$u.toast('您未在培训计划内，无法入班签到，请联系教师')
+							}
+							break;
+						};
+						case "3": {
+							// 考试二维码方式进入 [type: 3 --> 考试二维码方式进入]
+							if (classInfo) {
+								uni.$u.route({
+									url: '/pages/train_management/face_authentication',
+									params: {
+										type: 'learning_certification',
+										stageexampaperinputId,
+										classId,
+									}
+								})
+							} else {
+								uni.$u.toast('您未在培训计划内，无法进行考试，请联系教师')
+							}
+							break;
 						}
+						default: {
+							break;
+						};
 					}
 				}
 			})
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 70bea0c..77834bc 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -44,6 +44,7 @@ export default {
     }
   },
   onLoad() {
+	// 获取系统版本号, 其函数主体在 /utils/updateVersion.js 文件内查找
     this.fnUpdateVersion(false)
   },
   methods: {
diff --git a/pages/train_management/index.vue b/pages/train_management/index.vue
index b636134..892b863 100644
--- a/pages/train_management/index.vue
+++ b/pages/train_management/index.vue
@@ -45,8 +45,8 @@
 </template>
 
 <script>
-import { getClassList, getIsUploadFace, getStudentInfoApi } from '@/api';
-import store from '@/store/index';
+import { getClassList, getIsUploadFace, getStudentInfoApi, getListAll } from '@/api'
+import store from '@/store/index'
 
 export default {
 	data() {
@@ -65,9 +65,9 @@ export default {
 	},
 
 	/* 监听页面显示，页面每次出现在屏幕上都触发，包括从下级页面点返回露出当前页面 */
-  async onShow() {
-    await this.getUserFaceCompleted()
-    await this.resetList()
+	async onShow() {
+		await this.getUserFaceCompleted()
+		await this.resetList()
 	},
 
 	methods: {
@@ -93,24 +93,40 @@ export default {
 			this.currentPage++
 			if (this.totalPage >= this.currentPage) this.getData()
 		},
+		handleGetListAll(classId) {
+			return new Promise(async (resolve, reject) => {
+				const userInfo = store.getters.getUserInfo
+				await getListAll({
+					classId,
+					userId: userInfo.USER_ID
+				})
+					.then((resData) => {
+						resolve(resData.classInfo)
+					})
+					.catch(() => {
+						uni.$u.toast('网络开小差了,请稍后尝试')
+						reject()
+					})
+			})
+		},
 		/**
 		 * 右上角自定义扫码图标触发事件
 		 */
 		onNavigationBarButtonTap(e) {
 			// 调用获取学员信息的方法
-			getStudentInfoFunc();
+			// this.getStudentInfoFunc();
 
 			// 只允许通过手机相机扫码
 			uni.scanCode({
 				// scanType: ['qrCode'], // 仅支持二维码扫码
 				onlyFromCamera: false, // 是否只能从相机扫码，允许从相册选择图片
 				hideAlbum: false, // 显示相册,允许从相册选择图片
-				success: (response) => {
-					const { stageexampaperinputId, classId, type, } = JSON.parse(response.result)
-					const findClassId = this.trainList.some((item) => item.classId === classId)
+				success:async (response) => {
+					const { stageexampaperinputId, classId, type } = JSON.parse(response.result)
+					const classInfo = await this.handleGetListAll(classId);
 					if (type === '2') {
 						// 签到二维码方式进入, [type: 2 --> 签到二维码方式进入]
-						if (findClassId) {
+						if (classInfo) {
 							uni.$u.route({
 								url: '/pages/train_management/realname_info_auth',
 								params: {
@@ -123,7 +139,7 @@ export default {
 						}
 					} else if (type === '3') {
 						// 考试二维码方式进入 [type: 3 --> 考试二维码方式进入]
-						if (findClassId) {
+						if (classInfo) {
 							uni.$u.route({
 								url: '/pages/train_management/face_authentication',
 								params: {
@@ -149,7 +165,7 @@ export default {
 		 * 使用网络接口获取学员信息
 		 */
 		async getStudentInfoFunc() {
-			const resData = await getStudentInfoApi();
+			const resData = await getStudentInfoApi()
 			await this.$store.dispatch('studentInfo', resData.studentInfo)
 		},
 		/**
@@ -202,7 +218,7 @@ export default {
 				url: '/pages/train_management/exam_record',
 				params: {
 					classId,
-          stagestudentrelationId
+					stagestudentrelationId
 				}
 			})
 		}
diff --git a/utils/request.js b/utils/request.js
index 5a9df20..7314174 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,6 +1,7 @@
 import refreshToken from "../api/refreshToken";
 
-let requestPath = 'http://192.168.0.102:8059/xgf_gwj_2.0/'; // 后台请求地址
+// let requestPath = 'http://192.168.0.102:8059/xgf_gwj_2.0/'; // 后台请求地址
+let requestPath = 'http://192.168.0.37:8058/xgf_gwj_2.0/'; // 后台请求地址
 // let requestPath = 'https://skqhdg.porthebei.com:9006/qa-prevention-xgf/'; // 后台请求地址
 // let requestPath = 'https://qgxgf.qhdsafety.com/qa-prevention-xgf/'; // 外网地址
 import store from '../store/index'