diff --git a/.env.development.yh b/.env.development.yh index e5b3101e..2d32304a 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -2,15 +2,15 @@ ENV = 'development.yh' # 'development.yh' -# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' +# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604' # VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603' # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601' # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.158:9601' -# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.32.154:9602' +VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.32.154:9602' # VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.32.157:9605' diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index 5a56b97d..9667dcc0 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -468,9 +468,9 @@ const getGraphInfoUnStudy = (flag = 0, lastPgrphId = '') => { common .show('恭喜你已学完全部知识点', '有什么心得跟我们分享吗?', true, '取消', '去评论') .then(res => { - if (res) { + if (res) { // 去评论 - common.redirectTo(`/pages/courseDetail/submit?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&imgId=${imageId.value}`) + common.redirectTo(`/pages/courseDetail/index?tabAct=2&crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&isPreview=true`) } else { // 取消 common.navigateBack() diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue index 112c6df7..ab9f1978 100644 --- a/src/pages/courseDetail/index.vue +++ b/src/pages/courseDetail/index.vue @@ -301,6 +301,7 @@ crsId.value = params.crsId; collectId.value = params.collectId || null; isPreview.value = params.isPreview || ''; + tabAct.value = Number(params.tabAct || 0) }); onShow(() => { getData(); diff --git a/src/pages/index/components/todo.vue b/src/pages/index/components/todo.vue index 7bc30bc6..173a9914 100644 --- a/src/pages/index/components/todo.vue +++ b/src/pages/index/components/todo.vue @@ -38,6 +38,7 @@ import { checkTraPartnerInfoById } from '@/api/sparring.js' + import { queryTraUserAnonyByUserId } from '@/api/user.js'; const activeDate = ref('') const tableData = ref([]) const pageObj = ref({ @@ -118,7 +119,10 @@ comName: item.name, // 标题 comId: item.id }); - common.navigateTo(`/pages/competition/matching?papersId=${res.body.papersId}&comId=${item.id}`); + queryTraUserAnonyByUserId().then(res2=>{ + common.setValue('orgTree', res2.body ?? []); + common.navigateTo(`/pages/competition/matching?papersId=${res.body.papersId}&comId=${item.id}`); + }) }) .finally(() => { common.hideLoading();