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 @@
-
+
暂无学习任务
@@ -23,7 +23,7 @@
required: true
}
});
-
+
const getData = (from = '', searchText = '') => {
if (from == 'first') {
if (total.value !== -1) {
@@ -58,7 +58,7 @@
});
}, 200);
};
-
+
const scrolltolower = (item) => {
getData();
};
@@ -67,9 +67,19 @@
console.log('value', value);
getData('first', value);
};
+ const updateData = (item) => {
+ const index = data_list.findIndex((res) => res.taskId === item.taskId);
+
+ console.log('updateData', index, item);
+ if (index !== -1) {
+ data_list[index] = item;
+ }
+ };
+
defineExpose({
getData,
- search
+ search,
+ updateData
});
@@ -78,7 +88,7 @@
background-color: #f1f5fa;
padding: 22rpx;
}
-
+
.scroll-Y {
height: calc(100vh - var(--status-bar-height) - 88rpx - 80rpx - 88rpx - 20rpx - 30rpx);
background-color: #fff;
diff --git a/src/pages/learningTasks/details.vue b/src/pages/learningTasks/details.vue
index ee504763..fc35b2ba 100644
--- a/src/pages/learningTasks/details.vue
+++ b/src/pages/learningTasks/details.vue
@@ -128,7 +128,7 @@
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 540743fc..2d2a005a 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -6,8 +6,7 @@
-
-
+
@@ -18,11 +17,23 @@
账号
-
+
密码
-
+
@@ -34,8 +45,9 @@
- 登录
+
+ 登录
+
@@ -64,7 +76,7 @@
import { useSocketStore } from '@/store/socket.js';
import { storeToRefs } from 'pinia';
- import { getPhoneEnvBool } from '@/common/common.js'
+ import { getPhoneEnvBool } from '@/common/common.js';
// interface PageVueInstance {
// refreshData?: () => Promise | void;
// }
@@ -103,7 +115,7 @@
}
};
// 登录方法
- const login_fun = () : void => {
+ const login_fun = (): void => {
// 验证
if (login_button_status.value) return common.msg('请阅读并同意《隐私政策》');
if (account.value === '') return common.msg('账号不能为空');
@@ -120,26 +132,33 @@
account: account.value,
password: password.value
});
- if (res['mascotState']) { // 判断是否跳转到选科技鹿页面
+ if (res['mascotState']) {
+ // 判断是否跳转到选科技鹿页面
common.redirectTo('/pages/mascot/mascot_select_list');
} else if (fromPagePath.value !== '') {
common.redirectTo('/' + fromPagePath.value);
} else {
- common.setValue('mascotState', false) // 清空科技鹿设置
+ common.setValue('mascotState', false); // 清空科技鹿设置
common.msg('登录成功');
back_state.value = false;
const pages = getCurrentPages();
- if (pages.length <= 1) { // 页面栈小于等于1，里面还有本身的login，说明就只有login页
+ if (pages.length <= 1) {
+ // 页面栈小于等于1，里面还有本身的login，说明就只有login页
common.navigateTo('/pages/index/dialog', { animationType: 'slide-in-bottom' });
return;
}
const prevPage = pages[pages.length - 2];
- if (prevPage.route === 'pages/index/dialog') { // 弹出页面特殊处理
- common.navigateBack(1, () => {
- if (prevPage.$vm && typeof prevPage.$vm.$?.exposed?.refreshData === 'function') {
- prevPage.$vm.$?.exposed?.refreshData();
- }
- }, { animationType: 'slide-in-bottom' });
+ if (prevPage.route === 'pages/index/dialog') {
+ // 弹出页面特殊处理
+ common.navigateBack(
+ 1,
+ () => {
+ if (prevPage.$vm && typeof prevPage.$vm.$?.exposed?.refreshData === 'function') {
+ prevPage.$vm.$?.exposed?.refreshData();
+ }
+ },
+ { animationType: 'slide-in-bottom' }
+ );
} else {
common.navigateBack(1, () => {
if (prevPage.$vm && typeof prevPage.$vm.$?.exposed?.refreshData === 'function') {
@@ -148,7 +167,8 @@
});
}
}
- }).catch((res) => {
+ })
+ .catch((res) => {
console.log(res);
common.hideLoading();
if (res.rtnCode === '0002') {
@@ -164,7 +184,7 @@
onLoad(() => {
// fromPagePath.value = e?.path || ''
- })
+ });
onMounted(() => {
let loginAccountData = common.getValue('loginAccountData');
if (loginAccountData) {
@@ -172,7 +192,6 @@
password.value = loginAccountData.password;
}
back_state.value = true;
-
});
// 跳进了登录页，禁止返回操作
onBackPress(() => back_state.value);
@@ -321,4 +340,4 @@
display: flex;
flex-direction: column;
}
-
\ No newline at end of file
+
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index de294937..59819659 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -92,7 +92,7 @@
-
+
竞赛记录
diff --git a/src/pages/practice/index.vue b/src/pages/practice/index.vue
index 675d7473..7252ac89 100644
--- a/src/pages/practice/index.vue
+++ b/src/pages/practice/index.vue
@@ -202,6 +202,7 @@
exrId: paperData.exrId,
ossKey: '',
qnsId: topic.value.qnsId,
+ showOrder: questionNumber.value + 1,
examLenTm: practiceTime.value, // 练习时长
...answer
})
diff --git a/src/pages/wrongQuestionRecord/correct.vue b/src/pages/wrongQuestionRecord/correct.vue
index c617e422..14267c43 100644
--- a/src/pages/wrongQuestionRecord/correct.vue
+++ b/src/pages/wrongQuestionRecord/correct.vue
@@ -90,7 +90,6 @@
import { commonUploadVoiceFile } from '@/api/common.js';
import { practiceExitIcon } from '@/common/imgSvg';
import { practiceCommit, queryCrsPracticeAnswerResult } from '@/api/practice.js';
-
import { queryMistakesAnswerByMisId, mistakesCorrect } from '@/api/wrongQuestionRecord.js';
const feedbackRef = ref(null);
const dialogRef = ref(null);
@@ -181,7 +180,7 @@
topic.value.es_status = ''; // 取消转圈
}
};
-
+
// 单题回答
const submitProblem = (answer) => {
console.log('答题内容', answer);
@@ -208,7 +207,6 @@
traQnsInfoVo = res.body;
}
topic.value.isPreview = true; // 不能在点击了，打开预览模式
- console.log('给出来的traQnsInfoVo', traQnsInfoVo);
common.hideLoading();
topic.value.clearResult = false; // 不清除正确答案
topic.value.analyContent = traQnsInfoVo.analyContent; // 答案解析
@@ -406,12 +404,11 @@
setupKeyboardHeightListener((height) => {
popup_input_bottom.value = `${height}px`;
});
-
+
setTimeout(() => {
addRequestProblem(0, () => {
addProblem(0);
});
- // addProblem(0, true);
}, 10);
});
@@ -425,9 +422,6 @@
} else if (key === 'exit') {
// 中途退出
dialogRef.value.close();
- common.loading();
- await practiceCommit({ exrId: paperData.exrId, stat: 'U' });
- common.hideLoading();
await nextTick();
common.navigateBack();
} else if (key === 'revert') {