tianyan/tra-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

Browse Source
This commit is contained in:
田岩
2026-03-04 16:42:18 +08:00
parent 431645c0bf 2fe0489d0b
commit 32d653af60
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development.yh
+3 -3
View File
@@ -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'
src/pages/course/study.vue
+2 -2
View File
@@ -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()
src/pages/courseDetail/index.vue
+1
View File
@@ -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();
src/pages/index/components/todo.vue
+5 -1
View File
@@ -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();