From 83f1310d0669e7a99eeda3ee199d611ae4152a8f Mon Sep 17 00:00:00 2001
From: wangyan <wangyan@zcloudchina.com>
Date: Fri, 7 Mar 2025 17:46:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor(qa-prevention-xgf-app):=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=20api=20=E8=B0=83=E7=94=A8=E5=92=8C=E7=8F=AD=E7=BA=A7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-重命名 getListAll 为 getClassInfoByParams，提高代码可读性
- 在 api.js 中添加 getClassList 和 getStudentInfoApi调用
- 优化 store 中的 setStudentInfo action
- 在首页和培训管理页面中集成新的 api 调用
- 添加人脸信息认证提示功能
---
 api/api.js                                    |  1 +
 api/index.js                                  |  2 +-
 pages/index/index.vue                         | 32 ++++++++++++++++---
 pages/train_management/index.vue              | 20 ++++++------
 pages/train_management/realname_info_auth.vue |  1 +
 store/index.js                                |  4 +--
 6 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/api/api.js b/api/api.js
index 9cc6c06..78f16d0 100644
--- a/api/api.js
+++ b/api/api.js
@@ -9,3 +9,4 @@ export const setRefreshToken = (params) => post("/sys/refreshToken", params ); /
 export const setEntryV1 = (params) => post("/app/sys/user/entry", params ); // 入职
 export const resignV1 = (params) => post("/app/sys/user/resign", params ); // 离职
 export const getStudentInfoApi = (params) => post("/app/student/getStudentInfo", params ); // 获取学员信息
+
diff --git a/api/index.js b/api/index.js
index 4b52804..dfa2b9c 100644
--- a/api/index.js
+++ b/api/index.js
@@ -84,5 +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);
+export const getClassInfoByParams = (params) => post("/app/stagestudentrelation/getClassInfoByParams", params ); // 获取班级信息
 // ********************* end ***********************
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4f7fe2f..079eada 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -46,8 +46,9 @@
 
 <script>
 import updateVersion from '../../utils/updateVersion'
-import { setEntry, getIsUploadFace } from '../../api'
-import {setEntryV1} from "../../api/api";
+import {setEntry, getIsUploadFace, getClassInfoByParams, getClassList} from '../../api'
+import { getStudentInfoApi, setEntryV1} from "../../api/api";
+import store from "../../store";
 
 export default {
 	mixins: [updateVersion],
@@ -103,10 +104,10 @@ export default {
 		this.getUserFaceCompleted()
 	},
 	methods: {
-		handleGetListAll(classId) {
+		handleGetClassInfoByParams(classId) {
 			return new Promise(async (resolve, reject) => {
 				const userInfo = store.getters.getUserInfo
-				await getListAll({
+				await getClassInfoByParams({
 					classId,
 					userId: userInfo.USER_ID
 				})
@@ -125,7 +126,9 @@ export default {
 					// let obj = JSON.parse(res.result)
 					// let type = obj[0].CODE_TYPE
 					const { classId, type, RELEVANT_UNIT_NAME } = JSON.parse(res.result)
-					const classInfo = await this.handleGetListAll(classId);
+					const classInfo = await this.handleGetClassInfoByParams(classId);
+          const resData = await getStudentInfoApi({classId:classInfo.classId})
+          await this.$store.dispatch('setStudentInfo', resData.studentInfo)
 					switch(type) {
 						case "0": {
 							let info = await setEntryV1({
@@ -154,6 +157,25 @@ export default {
 						// };
 						case "2": {
 							// 签到二维码方式进入, [type: 2 --> 签到二维码方式进入]
+              if (store.getters.getVerification === '0') {
+                uni.showModal({
+                  title: '温馨提示',
+                  content: '检测到您还未完成人脸信息读取，请先完成人脸信息认证!',
+                  success: function (res) {
+                    if (res.confirm) {
+                      uni.$u.route({
+                        url: '/pages/train_management/face_authentication',
+                        params: {
+                          type: 'facial_input'
+                        }
+                      })
+                    }
+                    if (res.cancel) {
+                      uni.navigateBack({ delta: 1 })
+                    }
+                  }
+                })
+              }
 							if (classInfo) {
 								uni.$u.route({
 									url: '/pages/train_management/realname_info_auth',
diff --git a/pages/train_management/index.vue b/pages/train_management/index.vue
index 892b863..f16c27f 100644
--- a/pages/train_management/index.vue
+++ b/pages/train_management/index.vue
@@ -45,8 +45,9 @@
 </template>
 
 <script>
-import { getClassList, getIsUploadFace, getStudentInfoApi, getListAll } from '@/api'
 import store from '@/store/index'
+import {getClassInfoByParams, getClassList} from "../../api";
+import {getStudentInfoApi} from "../../api/api";
 
 export default {
 	data() {
@@ -93,10 +94,10 @@ export default {
 			this.currentPage++
 			if (this.totalPage >= this.currentPage) this.getData()
 		},
-		handleGetListAll(classId) {
+    handleGetClassInfoByParams(classId) {
 			return new Promise(async (resolve, reject) => {
 				const userInfo = store.getters.getUserInfo
-				await getListAll({
+				await getClassInfoByParams({
 					classId,
 					userId: userInfo.USER_ID
 				})
@@ -113,9 +114,6 @@ export default {
 		 * 右上角自定义扫码图标触发事件
 		 */
 		onNavigationBarButtonTap(e) {
-			// 调用获取学员信息的方法
-			// this.getStudentInfoFunc();
-
 			// 只允许通过手机相机扫码
 			uni.scanCode({
 				// scanType: ['qrCode'], // 仅支持二维码扫码
@@ -123,7 +121,9 @@ export default {
 				hideAlbum: false, // 显示相册,允许从相册选择图片
 				success:async (response) => {
 					const { stageexampaperinputId, classId, type } = JSON.parse(response.result)
-					const classInfo = await this.handleGetListAll(classId);
+          // 调用获取学员信息的方法
+          await this.getStudentInfoFunc(classId);
+					const classInfo = await this.handleGetClassInfoByParams(classId);
 					if (type === '2') {
 						// 签到二维码方式进入, [type: 2 --> 签到二维码方式进入]
 						if (classInfo) {
@@ -164,15 +164,15 @@ export default {
 		/**
 		 * 使用网络接口获取学员信息
 		 */
-		async getStudentInfoFunc() {
-			const resData = await getStudentInfoApi()
+		async getStudentInfoFunc(classId) {
+			const resData = await getStudentInfoApi({classId})
+      console.log('resData :>> ', resData);
 			await this.$store.dispatch('studentInfo', resData.studentInfo)
 		},
 		/**
 		 * 获取是否已经完成上传人脸信息
 		 */
 		async getUserFaceCompleted() {
-			// const userFaceData = await getIsUploadFace()
 			// verification --> 0: 未完成人脸认证
 			// verification --> 1: 已完成人脸认证
 			if (store.getters.getVerification === '0') {
diff --git a/pages/train_management/realname_info_auth.vue b/pages/train_management/realname_info_auth.vue
index 8c921b3..2e8cbd5 100644
--- a/pages/train_management/realname_info_auth.vue
+++ b/pages/train_management/realname_info_auth.vue
@@ -181,6 +181,7 @@ export default {
 
 	onLoad(query) {
 		this.routeQuery = query // 接收上一个页面传递过来的路由参数1
+    
 		const { name,// 学员姓名，
 			phone, // 联系电话
       userIdCard,// 身份证号
diff --git a/store/index.js b/store/index.js
index febf0e7..c3cfb60 100644
--- a/store/index.js
+++ b/store/index.js
@@ -48,8 +48,8 @@ const store = new Vuex.Store({
         setUserInfo({commit}, userInfo) {
             commit('setUserInfo', userInfo)
         },
-		setStudentInfo(state, studentInfo) {
-			commit('setStudentInfo', studentInfo)
+		setStudentInfo({commit}, studentInfo) {
+            commit('setStudentInfo', studentInfo)
 		},
         setVerification({commit}, verification) {
             commit('setVerification', verification)