diff --git a/.env.development b/.env.development index 781bd773..6499d215 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:7001' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # app入口 #VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001' @@ -16,18 +16,20 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # h5专用地址 -VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001' -#VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' -# sit -#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' - +# 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' # sit # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' +# UAT +# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' + # 任东 # 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' # 张建成 diff --git a/src/api/learningTasks.js b/src/api/learningTasks.js index 293dfee6..1033a217 100644 --- a/src/api/learningTasks.js +++ b/src/api/learningTasks.js @@ -20,3 +20,12 @@ export const queryAllTraTaskCrsInfo = (data) => { }); }; + +// 根据任务id查询这一条 +export const queryAllTraTaskIUserId = (data) => { + return request({ + url: base_url + '/traTaskInfo/queryAllTraTaskIUserId', + method: 'post', + data + }); +}; \ No newline at end of file diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index 77821c3c..2703ce56 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -349,7 +349,7 @@ const showOrder = ref(0) const isLastPgrph = ref(false) const backRouter = () => { // common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`) - uni.$emit('refresh_course_list') + // uni.$emit('refresh_course_list') // yh0903让去除 common.navigateBack() } @@ -377,11 +377,13 @@ const getGraphInfoUnStudy = (flag = 0) => { return } if (Number(_body.bodyTyp) === 7) { + uni.$emit('refresh_course_list', crsId.value) if (isPreview.value) { common - .show('提示', '您已学完全部知识点', false, '取消', '确定') + .show('提示', '您已学完全部知识点', false) .then(res => { - common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&isPreview=true`) + common.navigateBack() + // common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&isPreview=true`) }) .finally(() => {}) } else { @@ -393,12 +395,13 @@ const getGraphInfoUnStudy = (flag = 0) => { common.redirectTo(`/pages/courseDetail/submit?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&imgId=${imageId.value}`) } else { // 取消 - common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`) + common.navigateBack() + // common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`) } }) .finally(() => {}) } - uni.$emit('refresh_course_list') + return } lastTalkingInfo.value = { diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue index 3f1c8108..c704e509 100644 --- a/src/pages/examination/index.vue +++ b/src/pages/examination/index.vue @@ -268,7 +268,7 @@ // 录音按钮提交 const touchBtnSubmit = (type, submitObj) => { - // const old_text = touchBtnRef.value?.clearinputText(); // 清除发送框数据 + touchBtnRef.value?.clearinputText(); // 清除发送框数据 if (type === 'voice') { topic.value.es_status = '00'; // 00转圈 const voicePath = submitObj; @@ -277,7 +277,6 @@ let _res = JSON.parse(res.data); if (_res.rtnCode === '0000') { const _content = _res.body.transContent.trim(); - console.log('_content', _content); if (_content === '') { topic.value.es_status = ''; // 取消转圈 return common.msg('未识别到文字'); @@ -294,8 +293,6 @@ }) .catch((err) => { topic.value.es_status = ''; // 取消转圈 - // 失败了再把发送框数据还原回去 - // touchBtnRef.value?.clearinputText(old_text); // 清除发送框数据 common.msg('系统异常，请联系管理员'); }); } else if (type === 'text') { diff --git a/src/pages/favorites/components/favoritesTask.vue b/src/pages/favorites/components/favoritesTask.vue index b2e0076f..99ca52d7 100644 --- a/src/pages/favorites/components/favoritesTask.vue +++ b/src/pages/favorites/components/favoritesTask.vue @@ -11,11 +11,11 @@ v-for="(item, index) in data_list" @click="swipeActionClick" > - + - 未完成 - 已完成 + 已完成 + 未完成 @@ -124,11 +124,9 @@ setPageCache('learning_tasks_details', item); common.navigateTo(`/pages/learningTasks/details?collectId=${item.collectionId}`); }; - const getStatusClass = (index) => { - const remainder = index % 3; - if (remainder === 0) return 'in_progress'; - if (remainder === 1) return 'completed'; - return 'expired'; + const getStatusClass = (isFinish) => { + if (isFinish === '02') return 'completed'; + return 'in_progress'; }; const scrolltolower = (item) => { getData(); diff --git a/src/pages/index/components/feedback.vue b/src/pages/index/components/feedback.vue index 596ea93a..3b3cda0a 100644 --- a/src/pages/index/components/feedback.vue +++ b/src/pages/index/components/feedback.vue @@ -72,13 +72,13 @@ }) const feedback_item_click = (value) => { // 单选 - feedbackInfo.value.type = [value] + // feedbackInfo.value.type = [value] // 多选 - // if (feedbackInfo.value.type.includes(value)) { - // feedbackInfo.value.type = feedbackInfo.value.type.filter(item => item !== value); // 如果已存在，则从数组中移除 - // } else { - // feedbackInfo.value.type.push(value); // 如果不存在，则添加到数组中 - // } + if (feedbackInfo.value.type.includes(value)) { + feedbackInfo.value.type = feedbackInfo.value.type.filter(item => item !== value); // 如果已存在，则从数组中移除 + } else { + feedbackInfo.value.type.push(value); // 如果不存在，则添加到数组中 + } } const answerData = ref({}) // 反馈提交 @@ -90,7 +90,7 @@ // todo 待接口 const params = JSON.parse(JSON.stringify({ askId: answerData.value.seqNo, - fbkTyp: feedbackInfo.value.type[0], + fbkTyp: feedbackInfo.value.type.join(','), reqBatch: answerData.value.reqBatch, fbkContent: feedbackInfo.value.text })) diff --git a/src/pages/learningTasks/components/content-item.vue b/src/pages/learningTasks/components/content-item.vue index ebd6cffe..c6479813 100644 --- a/src/pages/learningTasks/components/content-item.vue +++ b/src/pages/learningTasks/components/content-item.vue @@ -2,8 +2,8 @@ - 未完成 - 已完成 + 已完成 + 未完成 @@ -39,9 +39,11 @@ const item = computed(() => props.item); const getStatusClass = (isFinish) => { // 00进行中、01已完成、02已超时 - if (isFinish === '00') return 'in_progress'; - if (isFinish === '01') return 'completed'; - return 'expired'; + // if (isFinish === '00') return 'in_progress'; + // if (isFinish === '01') return 'completed'; + // return 'expired'; + if (isFinish === '02') return 'completed'; + return 'in_progress'; }; // 跳转到详情 const click_item = (item) => { diff --git a/src/pages/learningTasks/details.vue b/src/pages/learningTasks/details.vue index 49deb5d6..ee504763 100644 --- a/src/pages/learningTasks/details.vue +++ b/src/pages/learningTasks/details.vue @@ -209,8 +209,15 @@ ...learning_tasks_details }); getData(); + // 监听里面学习完成后更新任务历程 + uni.$on('refresh_course_list', () => { + console.log('详情监听里面学习完成后更新任务历程'); + getData(); + }); + }); onUnload(() => { + uni.$off('refresh_course_list'); if (detailData.collectionId !== collectId.value) { const pages = getCurrentPages(); if (pages.length >= 2) { diff --git a/src/pages/learningTasks/index.vue b/src/pages/learningTasks/index.vue index 0271c5e8..4318ae5b 100644 --- a/src/pages/learningTasks/index.vue +++ b/src/pages/learningTasks/index.vue @@ -44,6 +44,7 @@