diff --git a/src/aiService-sub/index/index.vue b/src/aiService-sub/index/index.vue index 1e43649..c9f8b7a 100644 --- a/src/aiService-sub/index/index.vue +++ b/src/aiService-sub/index/index.vue @@ -3,54 +3,23 @@ style: { navigationBarTitleText: '六纬AI小助手', }, - needLogin: true, } diff --git a/src/aiService-sub/index/newAi.vue b/src/aiService-sub/index/newAi.vue new file mode 100644 index 0000000..4f30b91 --- /dev/null +++ b/src/aiService-sub/index/newAi.vue @@ -0,0 +1,46 @@ + +{ + style: { + navigationBarTitleText: '六纬AI小助手', + }, + needLogin: true, +} + + + + + + diff --git a/src/components/bar/CustomTabBar.vue b/src/components/bar/CustomTabBar.vue index 99b33fc..69c3d48 100644 --- a/src/components/bar/CustomTabBar.vue +++ b/src/components/bar/CustomTabBar.vue @@ -34,6 +34,7 @@ import { TabesItem } from '@/service/app/types' import { tabbarList } from '@/hooks/useTabbarList' import { ref, computed, onMounted } from 'vue' +import { useUserStore } from '@/store' defineProps({ currentPage: { @@ -49,6 +50,7 @@ defineProps({ // 安全区域底部高度 const safeAreaBottom = ref(0) +const userStore = useUserStore() // 计算TabBar总高度 (TabBar高度 + 安全区域高度) const tabbarTotalHeight = computed(() => { @@ -59,9 +61,16 @@ const tabbarTotalHeight = computed(() => { const changeItem = (item: TabesItem) => { if (item.navigatorItem) { - uni.navigateTo({ - url: item.path, - }) + // 唯独ai有这个情况 + if (item.path === '/aiService-sub/index/index' && !userStore.isLoginFlag) { + uni.navigateTo({ + url: item.path, + }) + } else { + uni.navigateTo({ + url: '/aiService-sub/index/newAi', + }) + } } else { uni.switchTab({ url: item.path, diff --git a/src/login-sub/index.vue b/src/login-sub/index.vue index 1e915d5..4174950 100644 --- a/src/login-sub/index.vue +++ b/src/login-sub/index.vue @@ -18,7 +18,7 @@ @click-left="handleClickLeft" > diff --git a/src/pages-evaluation-sub/evaluate/components/LearnSkillSuggestion.vue b/src/pages-evaluation-sub/evaluate/components/LearnSkillSuggestion.vue index 8684d98..611b345 100644 --- a/src/pages-evaluation-sub/evaluate/components/LearnSkillSuggestion.vue +++ b/src/pages-evaluation-sub/evaluate/components/LearnSkillSuggestion.vue @@ -4,6 +4,12 @@ {{ item.title }} + + {{ sonItem.title }} + + {{ sonItem.description }} + + {{ item.description instanceof Array ? item.description.join(',') : item.description }} @@ -15,7 +21,11 @@ import TitleBar from './TitleBar.vue' defineProps({ items: { - type: Array<{ title: string; description: string | [] }>, + type: Array<{ + title: string + description?: string | [] + items?: { title: string; description?: string }[] + }>, default: () => [], }, title: { diff --git a/src/pages-evaluation-sub/evaluate/components/LearnStudySuggestion.vue b/src/pages-evaluation-sub/evaluate/components/LearnStudySuggestion.vue index 9aba562..35c3221 100644 --- a/src/pages-evaluation-sub/evaluate/components/LearnStudySuggestion.vue +++ b/src/pages-evaluation-sub/evaluate/components/LearnStudySuggestion.vue @@ -1,22 +1,22 @@ diff --git a/src/pages-evaluation-sub/evaluate/psychologicalReport/sasReport.vue b/src/pages-evaluation-sub/evaluate/psychologicalReport/sasReport.vue index 389990b..8d7fcee 100644 --- a/src/pages-evaluation-sub/evaluate/psychologicalReport/sasReport.vue +++ b/src/pages-evaluation-sub/evaluate/psychologicalReport/sasReport.vue @@ -20,7 +20,7 @@ - + diff --git a/src/pages-evaluation-sub/evaluate/psychologicalReport/sdsReport.vue b/src/pages-evaluation-sub/evaluate/psychologicalReport/sdsReport.vue index 22a3cdb..e257fd3 100644 --- a/src/pages-evaluation-sub/evaluate/psychologicalReport/sdsReport.vue +++ b/src/pages-evaluation-sub/evaluate/psychologicalReport/sdsReport.vue @@ -20,7 +20,7 @@ - + diff --git a/src/pages-sub/evaluation/useRouterDetail.ts b/src/pages-sub/composables/useRouterDetail.ts similarity index 100% rename from src/pages-sub/evaluation/useRouterDetail.ts rename to src/pages-sub/composables/useRouterDetail.ts diff --git a/src/pages-sub/evaluation/assessmentPage.vue b/src/pages-sub/evaluation/assessmentPage.vue index 74227a9..b9a9496 100644 --- a/src/pages-sub/evaluation/assessmentPage.vue +++ b/src/pages-sub/evaluation/assessmentPage.vue @@ -101,7 +101,7 @@ import Checkbox from '@/pages-sub/components/check-group/Checkbox.vue' import CheckboxGroup from '@/pages-sub/components/check-group/CheckboxGroup.vue' import { useUserStore } from '@/store/user' -import { useRouterDetail } from './useRouterDetail' +import { useRouterDetail } from '@/pages-sub/composables/useRouterDetail' const userStore = useUserStore() diff --git a/src/pages-sub/ucenter/evaluate/evaluateList.vue b/src/pages-sub/ucenter/evaluate/evaluateList.vue index 3e3a396..86293ee 100644 --- a/src/pages-sub/ucenter/evaluate/evaluateList.vue +++ b/src/pages-sub/ucenter/evaluate/evaluateList.vue @@ -8,7 +8,7 @@