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 @@
-
+
{{ item.notes }}
-
+
学习风格表现
-
- {{ item }}
+
+ {{ sonItem }}
-
+
学习风格特点
-
- {{ item }}
+
+ {{ sonItem }}
diff --git a/src/pages-evaluation-sub/evaluate/components/SuggestionCard.vue b/src/pages-evaluation-sub/evaluate/components/SuggestionCard.vue
index b16da9b..780b1a2 100644
--- a/src/pages-evaluation-sub/evaluate/components/SuggestionCard.vue
+++ b/src/pages-evaluation-sub/evaluate/components/SuggestionCard.vue
@@ -14,33 +14,5 @@
避免过度放松,保持适度的学习节奏。
-
-
-
- 饮食建议
-
-
- 保持规律作息,早睡早起,避免熬夜。 每天适当运动(如散步、跑步),保持精力充沛。
- 避免过度放松,保持适度的学习节奏。
-
-
-
-
-
- 学习建议
-
-
- 保持规律作息,早睡早起,避免熬夜。 每天适当运动(如散步、跑步),保持精力充沛。
- 避免过度放松,保持适度的学习节奏。
-
-
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 @@
-
+
import { getMyBusReports } from '@/service/index/api'
import { useUserStore } from '@/store'
-import { useRouterDetail } from './useRouterDetail'
+import { useRouterDetail } from '@/pages-sub/composables/useRouterDetail'
const userStore = useUserStore()
diff --git a/src/pages-sub/ucenter/evaluate/useRouterDetail.ts b/src/pages-sub/ucenter/evaluate/useRouterDetail.ts
deleted file mode 100644
index 085c57a..0000000
--- a/src/pages-sub/ucenter/evaluate/useRouterDetail.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-export const useRouterDetail = (item: { reportsId: string; type: number }) => {
- // type=0 兴趣测评报告
- // =1 性格测评报告
- // =2 能力测评
- // =3 学生考试考虑
- // =4 学习风格
- // =5 学习技能
- // =6 SAS
- // =7 SDS
- // =8 SCL-90
- // =9 MHT
- /// =-1 价值观
- /// =-2 留学咨询
- let url = ''
-
- if (item.type === 0) {
- url = `/pages-evaluation-sub/evaluate/academicReport/interestReport?id=${item.reportsId}&type=${item.type}`
- } else if (item.type === 1) {
- url = `/pages-evaluation-sub/evaluate/academicReport/characterReport?id=${item.reportsId}&type=${item.type}`
- } else if (item.type === 2) {
- url = `/pages-evaluation-sub/evaluate/academicReport/capabilityReport?id=${item.reportsId}&type=${item.type}`
- } else if (item.type === -1) {
- url = `/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport?id=${item.reportsId}&type=${item.type}`
- } else if (item.type === 6) {
- url = `/pages-evaluation-sub/evaluate/psychologicalReport/sasReport?id=${item.reportsId}&type=${item.type}`
- } else if (item.type === 7) {
- url = `/pages-evaluation-sub/evaluate/psychologicalReport/sdsReport?id=${item.reportsId}&type=${item.type}`
- } else if (item.type === 9) {
- // url = `/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport?id=${item.reportsId}&type=${item.type}`
- uni.showToast({
- title: '开发中....',
- icon: 'none',
- })
- return
- } else if (item.type === 4) {
- url = `/pages-evaluation-sub/evaluate/studyReport/learnStudyReport?id=${item.reportsId}&type=${item.type}`
- } else if (item.type === 5) {
- url = `/pages-evaluation-sub/evaluate/studyReport/learnSkillReport?id=${item.reportsId}&type=${item.type}`
- } else if (item.type === 3) {
- url = `/pages-evaluation-sub/evaluate/studyReport/anxietyReport?id=${item.reportsId}&type=${item.type}`
- } else {
- uni.showToast({
- title: '开发中....',
- icon: 'none',
- })
- return
- }
- uni.navigateTo({
- url,
- })
-}
diff --git a/src/pages.json b/src/pages.json
index 37dbc97..65f0a38 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -466,6 +466,13 @@
{
"path": "index/index",
"type": "page",
+ "style": {
+ "navigationBarTitleText": "六纬AI小助手"
+ }
+ },
+ {
+ "path": "index/newAi",
+ "type": "page",
"style": {
"navigationBarTitleText": "六纬AI小助手"
},
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 25d04b3..2c35689 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -57,7 +57,8 @@ interface NavigateToOptions {
"/pages-evaluation-sub/evaluate/studyReport/anxietyReport" |
"/pages-evaluation-sub/evaluate/studyReport/learnSkillReport" |
"/pages-evaluation-sub/evaluate/studyReport/learnStudyReport" |
- "/aiService-sub/index/index";
+ "/aiService-sub/index/index" |
+ "/aiService-sub/index/newAi";
}
interface RedirectToOptions extends NavigateToOptions {}