diff --git a/src/aiService-sub/index/index.vue b/src/aiService-sub/index/index.vue
index b3806c7..c66691e 100644
--- a/src/aiService-sub/index/index.vue
+++ b/src/aiService-sub/index/index.vue
@@ -24,8 +24,9 @@ import { useUserStore } from '@/store'
const userStore = useUserStore()
//chat.ycymedu.com
+//chatv2.ycymedu.com
const url = ref(
- `https://chat.ycymedu.com?userId=${userStore.userInfo.estimatedAchievement.wxId}&subjectGroup=${userStore.userInfo.estimatedAchievement.subjectGroup}&expectedScore=${userStore.userInfo.estimatedAchievement.expectedScore}&provinceName=${userStore.userInfo.estimatedAchievement.provinceName}&token=${userStore.userInfo.token}`,
+ `https://chatv2.ycymedu.com?userId=${userStore.userInfo.estimatedAchievement.wxId}&subjectGroup=${userStore.userInfo.estimatedAchievement.subjectGroup}&expectedScore=${userStore.userInfo.estimatedAchievement.expectedScore}&provinceName=${userStore.userInfo.estimatedAchievement.provinceName}&token=${userStore.userInfo.token}`,
)
const handleChildMessage = (event) => {
diff --git a/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
index bc86a59..f9a1043 100644
--- a/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
+++ b/src/pages-evaluation-sub/evaluate/academicReport/CapabilityReport.vue
@@ -43,16 +43,13 @@ import Navbar from '@/pages-evaluation-sub/components/navbar/Navbar.vue'
import LineReport from '../components/interestChart/LineReport.vue'
import AbilityDimension from '../components/AbilityDimension.vue'
import AiFooter from '../components/AiFooter.vue'
+import { handleBack } from '../hooks/useEvaluateBack'
import { getAbilityDimension } from '@/service/index/api'
const pageType = ref(0)
const pageId = ref(0)
-const handleBack = () => {
- uni.navigateBack()
-}
-
const studyRecord = ref({
description: '',
title: '',
diff --git a/src/pages-evaluation-sub/evaluate/academicReport/CharacterReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/CharacterReport.vue
index d0a90ee..fdd08f9 100644
--- a/src/pages-evaluation-sub/evaluate/academicReport/CharacterReport.vue
+++ b/src/pages-evaluation-sub/evaluate/academicReport/CharacterReport.vue
@@ -47,14 +47,11 @@ import CharacterChart from '../components/interestChart/CharacterChart.vue'
import DependenciesChart from '../components/interestChart/DependenciesChart.vue'
import AiFooter from '../components/AiFooter.vue'
import { getMBTIDimension } from '@/service/index/api'
+import { handleBack } from '../hooks/useEvaluateBack'
const pageType = ref(0)
const pageId = ref(0)
-const handleBack = () => {
- uni.navigateBack()
-}
-
const studyRecord = ref({
description: '',
title: '',
diff --git a/src/pages-evaluation-sub/evaluate/academicReport/InterestReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/InterestReport.vue
index 454e897..4c3968e 100644
--- a/src/pages-evaluation-sub/evaluate/academicReport/InterestReport.vue
+++ b/src/pages-evaluation-sub/evaluate/academicReport/InterestReport.vue
@@ -51,14 +51,11 @@ import IntroMajor from '../components/IntroMajor.vue'
import { getHollandDimensionInfo } from '@/service/index/api'
import InterestingThings from '../components/InterestingThings.vue'
import AiFooter from '../components/AiFooter.vue'
+import { handleBack } from '../hooks/useEvaluateBack'
const pageType = ref(0)
const pageId = ref(0)
-const handleBack = () => {
- uni.navigateBack()
-}
-
const studyRecord = ref({ description: '', title: '', picCharts: {}, reportItems: [], hTag: '' })
onLoad((options) => {
diff --git a/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue b/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue
index fd78c26..8f59c06 100644
--- a/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue
+++ b/src/pages-evaluation-sub/evaluate/academicReport/opinionAboutReport.vue
@@ -39,16 +39,13 @@ import Navbar from '@/pages-evaluation-sub/components/navbar/Navbar.vue'
import OpinionChart from '../components/interestChart/OpinionChart.vue'
import AbilityDimension from '../components/AbilityDimension.vue'
import AiFooter from '../components/AiFooter.vue'
+import { handleBack } from '../hooks/useEvaluateBack'
import { getOpinionAbout } from '@/service/index/api'
const pageType = ref(0)
const pageId = ref(0)
-const handleBack = () => {
- uni.navigateBack()
-}
-
const studyRecord = ref({
description: '',
title: '',
diff --git a/src/pages-evaluation-sub/evaluate/components/studyChart/LearnStyleChart.vue b/src/pages-evaluation-sub/evaluate/components/studyChart/LearnStyleChart.vue
index 16d6bee..54b30b3 100644
--- a/src/pages-evaluation-sub/evaluate/components/studyChart/LearnStyleChart.vue
+++ b/src/pages-evaluation-sub/evaluate/components/studyChart/LearnStyleChart.vue
@@ -76,7 +76,7 @@ watch(
const option = {
radar: {
center: ['50%', '50%'],
- radius: '65%',
+ radius: '60%',
indicator: newData.map((item: any) => ({
name: `${item.type},${item.desc}`,
})),
diff --git a/src/pages-evaluation-sub/evaluate/hooks/useEvaluateBack.ts b/src/pages-evaluation-sub/evaluate/hooks/useEvaluateBack.ts
new file mode 100644
index 0000000..eb72b71
--- /dev/null
+++ b/src/pages-evaluation-sub/evaluate/hooks/useEvaluateBack.ts
@@ -0,0 +1,11 @@
+export const handleBack = () => {
+ const pages = getCurrentPages()
+ if (
+ pages.length > 1 &&
+ pages[pages.length - 1].route === 'pages-sub/ucenter/evaluate/evaluateList'
+ ) {
+ uni.navigateBack()
+ } else {
+ uni.switchTab({ url: '/pages/evaluation/index/index' })
+ }
+}
diff --git a/src/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport.vue b/src/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport.vue
index 59d6c41..7058580 100644
--- a/src/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport.vue
+++ b/src/pages-evaluation-sub/evaluate/psychologicalReport/mhtReport.vue
@@ -31,16 +31,13 @@