From 2594b9701d5778a23d3751c27fa56272991f2cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Wed, 3 Sep 2025 19:43:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=83=E4=B9=A0order?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 10 +-- src/api/learningTasks.js | 4 +- src/api/request.js | 1 - .../components/examRecordItem.vue | 2 +- src/pages/examination/index.vue | 2 + src/pages/examination/result.vue | 9 ++- .../favorites/components/favoritesTask.vue | 15 +++-- .../learningTasks/components/content-item.vue | 11 ++-- .../learningTasks/components/content.vue | 20 ++++-- src/pages/learningTasks/details.vue | 18 ++++- src/pages/learningTasks/index.vue | 16 ++--- src/pages/login/login.vue | 65 ++++++++++++------- src/pages/me/index.vue | 2 +- src/pages/practice/index.vue | 1 + src/pages/wrongQuestionRecord/correct.vue | 10 +-- 15 files changed, 118 insertions(+), 68 deletions(-) diff --git a/.env.development b/.env.development index 6499d215..6541a438 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786' # DEV -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # app入口 #VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001' @@ -16,11 +16,11 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # h5专用地址 -# VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001' +VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001' # VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' # dev -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # sit # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' @@ -29,9 +29,9 @@ VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # 任东 # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601' -VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' +# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' -# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.130:9604' +# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' # 张建成 # VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605' # VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.144:9602' diff --git a/src/api/learningTasks.js b/src/api/learningTasks.js index 1033a217..a8fb5b3f 100644 --- a/src/api/learningTasks.js +++ b/src/api/learningTasks.js @@ -22,9 +22,9 @@ export const queryAllTraTaskCrsInfo = (data) => { // 根据任务id查询这一条 -export const queryAllTraTaskIUserId = (data) => { +export const queryTraTaskInfoByTaskId = (data) => { return request({ - url: base_url + '/traTaskInfo/queryAllTraTaskIUserId', + url: base_url + '/traTaskInfo/queryTraTaskInfoByTaskId', method: 'post', data }); diff --git a/src/api/request.js b/src/api/request.js index 9c602f2d..3e09b012 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -100,7 +100,6 @@ export default function request({ return resolve(res) } else if (res?.rtnCode === '0001') { // 为前后端约定不公共拦截的码值（王洋洋20250830定） return reject(res) - } else if (res?.rtnCode === '0002' && res?.message) { if (toastErrors) { common.msg(res.message) diff --git a/src/pages/courseRecord/components/examRecordItem.vue b/src/pages/courseRecord/components/examRecordItem.vue index cbab6897..4ddee29c 100644 --- a/src/pages/courseRecord/components/examRecordItem.vue +++ b/src/pages/courseRecord/components/examRecordItem.vue @@ -99,7 +99,7 @@ const click_list_item = (list_item) => { const papersName = item.value.examName; common.navigateTo( - `/pages/examination/result?execId=${list_item.execId}&papersName=${papersName}&mode=record` + `/pages/examination/result?execId=${list_item.execId}&papersName=${papersName}&mode=record&flagQuery=Y&flagQueryDetail=Y` ); }; diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue index c704e509..2aa91a7a 100644 --- a/src/pages/examination/index.vue +++ b/src/pages/examination/index.vue @@ -469,6 +469,8 @@ }); } func.then((res) => { + // 考试完成事件 + uni.$emit('exam_completed') // 判断是否需要查分 const flagQueryDetail = res.body.flagQueryDetail === '' ? res.body.flagQuery : res.body.flagQueryDetail; common.redirectTo( diff --git a/src/pages/examination/result.vue b/src/pages/examination/result.vue index a06439da..7c9dab2b 100644 --- a/src/pages/examination/result.vue +++ b/src/pages/examination/result.vue @@ -3,7 +3,8 @@ 考试结算 - + + @@ -218,7 +219,11 @@ common.navigateTo('/pages/examRanking/index?papersId=' + result.papersId); } }; + const goto_back = () => { + common.navigateBack() + }; + const getStatusClass = (index) => { const remainder = index % 3; if (remainder === 0) return 'in_progress'; @@ -277,6 +282,8 @@ result.examLenTm = body.examLenTm; } topicList.push(...body.qnsInfoVo); + + // 触发考试完成事件 } }) .catch((err) => { diff --git a/src/pages/favorites/components/favoritesTask.vue b/src/pages/favorites/components/favoritesTask.vue index 99ca52d7..45c21eaa 100644 --- a/src/pages/favorites/components/favoritesTask.vue +++ b/src/pages/favorites/components/favoritesTask.vue @@ -117,16 +117,23 @@ // 跳转到详情 const click_item = (item) => { - if (item.isTimeOut === '00') { - common.msg('任务已结束'); - return; + if(item.limitTyp === '02') { + if(item.isTimeOut === '01') { + return common.msg('任务未开始'); + } else if(item.isTimeOut === '02') { + return common.msg('任务已结束'); + } } setPageCache('learning_tasks_details', item); common.navigateTo(`/pages/learningTasks/details?collectId=${item.collectionId}`); }; const getStatusClass = (isFinish) => { + // 01进行中、02已完成、03已超时 + // if (isFinish === '00') return 'in_progress'; + // if (isFinish === '01') return 'completed'; + // return 'expired'; if (isFinish === '02') return 'completed'; - return 'in_progress'; + return 'expired'; }; const scrolltolower = (item) => { getData(); diff --git a/src/pages/learningTasks/components/content-item.vue b/src/pages/learningTasks/components/content-item.vue index c6479813..dca7d7a7 100644 --- a/src/pages/learningTasks/components/content-item.vue +++ b/src/pages/learningTasks/components/content-item.vue @@ -38,22 +38,19 @@ const emit = defineEmits(['click_item']); const item = computed(() => props.item); const getStatusClass = (isFinish) => { - // 00进行中、01已完成、02已超时 + // 01进行中、02已完成、03已超时 // if (isFinish === '00') return 'in_progress'; // if (isFinish === '01') return 'completed'; // return 'expired'; if (isFinish === '02') return 'completed'; - return 'in_progress'; + return 'expired'; }; // 跳转到详情 const click_item = (item) => { if(item.limitTyp === '02') { - const startTm = new Date(item.startTm).getTime(); - const endTm = new Date(item.endTm).getTime(); - const currentTimestamp = Date.now(); - if(currentTimestamp < startTm) { + if(item.isTimeOut === '01') { return common.msg('任务未开始'); - } else if(currentTimestamp > endTm) { + } else if(item.isTimeOut === '02') { return common.msg('任务已结束'); } } diff --git a/src/pages/learningTasks/components/content.vue b/src/pages/learningTasks/components/content.vue index 137859e4..1caa2863 100644 --- a/src/pages/learningTasks/components/content.vue +++ b/src/pages/learningTasks/components/content.vue @@ -1,7 +1,7 @@