修复老页面跳转路径

src/common/modules/mx-menus-personal-center-config.js

@@ -4,7 +4,7 @@ export default {
             category: "other",
             name: "基本资料",
             icon: "/static/personal/icon_jibenziliao@2x.png",
-            path: "/pages/personal-center/basic-info/basic-info",
+            path: "/pagesOther/pages/personal-center/basic-info/basic-info",
             satisfyStoreGetters: [],
             satisfyAny: false,
         },
@@ -12,7 +12,7 @@ export default {
             category: "other",
             name: "修改密码",
             icon: "/static/personal/icon_password@2x.png",
-            path: "/pages/personal-center/change-pwd/change-pwd",
+            path: "/pagesOther/pages/personal-center/change-pwd/change-pwd",
             satisfyStoreGetters: [],
             satisfyAny: false,
         },
@@ -20,7 +20,7 @@ export default {
             category: "usual",
             name: "错题本",
             icon: "/static/personal/wrong_book.png",
-            path: "/pages/topic-center/wrong-book/wrong-book",
+            path: "/pagesOther/pages/topic-center/wrong-book/wrong-book",
             iconClass: "icon40",
             titleClass: "f14",
             satisfyStoreGetters: ["!isK9Sensitive"],
@@ -31,7 +31,7 @@ export default {
             category: "usual",
             name: "做题记录",
             icon: "/static/personal/test_records.png",
-            path: "/pages/topic-center/paper-record/paper-record",
+            path: "/pagesOther/pages/topic-center/paper-record/paper-record",
             iconClass: "icon40",
             titleClass: "f14",
             satisfyStoreGetters: ["!isK9Sensitive"],
@@ -42,7 +42,7 @@ export default {
             category: "usual",
             name: "测评报告",
             icon: "/static/personal/test_report.png",
-            path: "/pages/test-center/list/list",
+            path: "/pagesOther/pages/test-center/list/list",
             iconClass: "icon40",
             titleClass: "f14",
             satisfyStoreGetters: [],
@@ -52,7 +52,7 @@ export default {
             category: "usual",
             name: "我的收藏",
             icon: "/static/personal/my_collected.png",
-            path: "/pages/personal-center/my-concerned/my-concerned",
+            path: "/pagesOther/pages/personal-center/my-concerned/my-concerned",
             iconClass: "icon40",
             titleClass: "f14",
             satisfyStoreGetters: [],
@@ -62,7 +62,7 @@ export default {
             category: "usual",
             name: "我的志愿表",
             icon: "/static/personal/my_simulated.png",
-            path: "/pages/ie/entry-ai-list/entry-ai-list",
+            path: "/pagesOther/pages/ie/entry-ai-list/entry-ai-list",
             iconClass: "icon40",
             titleClass: "f14",
             satisfyStoreGetters: ["!isCultural"],
@@ -72,7 +72,7 @@ export default {
             category: "usual",
             name: "我的志愿表",
             icon: "/static/personal/my_simulated.png",
-            path: "/pages/voluntary/list/list",
+            path: "/pagesOther/pages/voluntary/list/list",
             iconClass: "icon40",
             titleClass: "f14",
             satisfyStoreGetters: ["isCultural"],
@@ -82,7 +82,7 @@ export default {
             category: "usual",
             name: "绑定会员卡",
             icon: "/static/personal/bind_card.png",
-            path: "/pages/personal-center/bind-card/bind-card",
+            path: "/pagesOther/pages/personal-center/bind-card/bind-card",
             iconClass: "icon40",
             titleClass: "f14",
             satisfyStoreGetters: [],
@@ -111,7 +111,7 @@ export default {
             category: "other",
             name: "新手教程",
             icon: "play-circle",
-            path: "/pages/personal-center/help-video/help-video",
+            path: "/pagesOther/pages/personal-center/help-video/help-video",
             satisfyStoreGetters: ["false"],
             satisfyAny: false,
         },

src/common/mx-block-widgets.js

@@ -36,8 +36,8 @@ export default {
         desc: 'Holland测评是一种基于职业兴趣的测评工具，根据被测者对六种职业兴趣类型的倾向性，提供对应的职业建议。',
         bgColor: '#D8EDFD',
         clazz: ['mx12'],
-        path: '/pages/test-center/holland/holland',
-        more: '/pages/test-center/list/list',
+        path: '/pagesOther/pages/test-center/holland/holland',
+        more: '/pagesOther/pages/test-center/list/list',
         moreNext: {type: 'holland'}
     },
     mbtiGuide: {
@@ -47,8 +47,8 @@ export default {
         desc: 'MBTI测评是一种基于人格类型的测评工具，根据被测者对四种人格维度的偏好程度，判断其人格类型并提供相关建议。',
         bgColor: '#D9E2FD',
         clazz: ['mx12'],
-        path: '/pages/test-center/mbti/mbti',
-        more: '/pages/test-center/list/list',
+        path: '/pagesOther/pages/test-center/mbti/mbti',
+        more: '/pagesOther/pages/test-center/list/list',
         moreNext: {type: 'mbti'}
     },
     multiwayGuide: {
@@ -58,8 +58,8 @@ export default {
         desc: '"多元录取"是新高考改革的核心,国家鼓励更多的学生能够结合自身的情况选择合适的升学路径,促进低分高就及科学的学业生涯规划。',
         bgColor: '#75DDBD',
         clazz: ['mx12'],
-        path: '/pages/career/multiway/multiway',
-        more: '/pages/career/multiway/history'
+        path: '/pagesOther/pages/career/multiway/multiway',
+        more: '/pagesOther/pages/career/multiway/history'
     },
     mentalHealthGuide: {
         is: "test-guide-card",
@@ -68,8 +68,8 @@ export default {
         desc: '该测评是由华东师范大学心理学系教授周步成和其他心理学科研究人员，根据日本铃木清等人编制的"不安倾向诊断测验"进行修订，成为适应于我国中学学生标准化的《心理健康诊断测验》',
         bgColor: '#E1FCDF',
         clazz: ['mx12'],
-        path: '/pages/test-center/mental-health/mental-health',
-        more: '/pages/test-center/mental-health/history'
+        path: '/pagesOther/pages/test-center/mental-health/mental-health',
+        more: '/pagesOther/pages/test-center/mental-health/history'
     },
     electiveGuide: {
         is: "test-guide-card",
@@ -78,7 +78,7 @@ export default {
         desc: '新高考选科测评，从人生价值观、职业兴趣和知识兴趣三个维度，帮助你找到最适合的专业。',
         bgColor: '#9595dd',
         clazz: ['mx12'],
-        path: '/pages/elective/test/index/index'
+        path: '/pagesOther/pages/elective/test/index/index'
     },
     // 选科测评
     electiveTest: {
@@ -343,14 +343,14 @@ export default {
             title: '生涯测评',
             icon: '/static/images/home/icon_shengyaceping@2x.png',
             moreText: '测评记录>>',
-            path: '/pages/test-center/list/list'
+            path: '/pagesOther/pages/test-center/list/list'
         },
         dataList: [{
             src: '/static/images/home/img_zhuanyexingquceping@2x.png',
-            path: '/pages/test-center/holland/holland'
+            path: '/pagesOther/pages/test-center/holland/holland'
         }, {
             src: '/static/images/home/img_zhiyexingquceping@2x.png',
-            path: '/pages/test-center/mbti/mbti'
+            path: '/pagesOther/pages/test-center/mbti/mbti'
         }],
     },
     // 智能练习

src/hooks/useTransferPage.ts

@@ -132,13 +132,13 @@ const useTransferPage = () => {
     uni.removeStorageSync('transferBigData');
     const pages = getCurrentPages();
     if (pages.length === 1) {
-      switchTab('/pages/splash/splash');
+      switchTab('/pagesMain/pages/splash/splash');
     } else {
       uni.navigateBack({
         delta: delta,
         success: () => { },
         fail: (err) => {
-          switchTab('/pages/splash/splash');
+          switchTab('/pagesMain/pages/splash/splash');
         }
       });
     }

src/pagesMain/pages/index/components/index-banner.vue

@@ -3,7 +3,7 @@
     <ie-image :is-oss="true" src="/banner/index-banner-1.png" custom-class="w-full min-h-264 overflow-hidden"
       :round="15" />
     <view class="pt-24 pb-40 bg-white grid grid-cols-4 gap-y-32 justify-items-center">
-      <view class="w-fit justify-items-center" v-for="item in menus" :key="item.name" @click="navigateTo(item.pageUrl)">
+      <view class="w-fit justify-items-center" v-for="item in menus" :key="item.name" @click="navigateTo(item.pageUrl, item.navigateType)">
         <ie-image :is-oss="true" custom-class="w-auto h-82" :round="10" :src="item.icon" mode="heightFix" />
         <view class="text-26 text-fore-title">{{ item.name }}</view>
       </view>
@@ -25,32 +25,33 @@ const menus = [
   {
     name: '志愿填报',
     icon: '/menu/menu-volunteer.png',
-    pageUrl: '/pages/index/index',
+    pageUrl: '/pagesMain/pages/volunteer/volunteer',
+    navigateType: 'switchTab',
   },
   {
     name: '找院校',
     icon: '/menu/menu-college.png',
-    pageUrl: '/pages/index/index',
+    pageUrl: '/pagesOther/pages/college-library/index/index',
   },
   {
     name: '查专业',
     icon: '/menu/menu-major.png',
-    pageUrl: '/pages/index/index',
+    pageUrl: '/pagesOther/pages/major-library/index/index',
   },
   {
     name: '看职业',
     icon: '/menu/menu-work.png',
-    pageUrl: '/pages/index/index',
+    pageUrl: '/pagesOther/pages/vocation-library/index/index',
   },
   {
     name: '自我测评',
     icon: '/menu/menu-test.png',
-    pageUrl: '/pagesTest/index/index',
+    pageUrl: '/pagesOther/pages/test-center/index/index',
   },
   {
     name: '单招资讯',
     icon: '/menu/menu-news.png',
-    pageUrl: '/pages/index/index',
+    pageUrl: '/pagesOther/pages/news/index/index',
   },
   {
     name: '专升本',
@@ -58,8 +59,10 @@ const menus = [
     pageUrl: '/pages/index/index',
   }
 ]
-const navigateTo = (pageUrl: string) => {
-  transferTo(pageUrl);
+const navigateTo = (pageUrl: string, navigateType?: string) => {
+  transferTo(pageUrl, {
+    type: navigateType || 'navigate',
+  });
 }
 </script>
 <style lang="scss" scoped></style>

src/pagesOther/pages/college-library/components/college-list.vue

@@ -82,7 +82,7 @@ const handleQuery = (pageNum, pageSize) => {
 const handleDetail = (college) => {
     if (props.customItemClick) return emits('item-click', college)
     const {code} = college
-    transferTo('/pages/college-library/detail/detail', {code})
+    transferTo('/pagesOther/pages/college-library/detail/detail', {code})
 }
 
 onMounted(async () => {

src/pagesOther/pages/college-library/components/college-rank.vue

@@ -41,7 +41,7 @@ const handleQuery = (pageNum, pageSize) => {
 
 const handleDetail = (college) => {
     const {code} = college
-    transferTo('/pages/college-library/detail/detail', {code})
+    transferTo('/pagesOther/pages/college-library/detail/detail', {code})
 }
 
 </script>

src/pagesOther/pages/ie/components/ai-form/items/ai-form-college.vue

@@ -22,7 +22,7 @@ export default {
         const college = ref({})
 
         const handlePick = () => {
-            transferTo('/pages/college-library/picker/picker', {
+            transferTo('/pagesOther/pages/college-library/picker/picker', {
                 callback: mxConst.globalEvents.collegeSelected
             })
         }

src/pagesOther/pages/ie/entry-ai-form/components/ai-form-footer.vue

@@ -39,7 +39,7 @@ export default {
     },
     methods: {
         goMyVoluntary() {
-            this.transferTo('/pages/ie/entry-ai-list/entry-ai-list')
+            this.transferTo('/pagesOther/pages/ie/entry-ai-list/entry-ai-list')
         }
     }
 }

src/pagesOther/pages/ie/entry-ai/entry-ai.vue

@@ -105,10 +105,10 @@ export default {
         async handleNext() {
             await this.$refs.form.validate()
             await this.validateRenderRule()
-            this.transferTo('/pages/ie/entry-ai-form/entry-ai-form', this.model)
+            this.transferTo('/pagesOther/pages/ie/entry-ai-form/entry-ai-form', this.model)
         },
         handleMyVoluntary() {
-            this.transferTo('/pages/ie/entry-ai-list/entry-ai-list')
+            this.transferTo('/pagesOther/pages/ie/entry-ai-list/entry-ai-list')
         }
     }
 }

src/pagesOther/pages/ie/entry-analysis/components/college-major-picker.vue

@@ -102,7 +102,7 @@ export default {
                 excepts: pickerExcepts.value,
                 callback: MxConst.globalEvents.collegeSelected
             }
-            transferTo('/pages/college-library/picker/picker', next)
+            transferTo('/pagesOther/pages/college-library/picker/picker', next)
         }
         const openMajorPicker = () => {
             if (!model.value.university.code) return toast('请先添加院校')

src/pagesOther/pages/ie/entry-analysis/entry-analysis.vue

@@ -56,7 +56,7 @@ export default {
         const picker = ref(null)
 
         const handleMyVoluntary = () => {
-            transferTo('/pages/ie/entry-ai-list/entry-ai-list', {tab: 1})
+            transferTo('/pagesOther/pages/ie/entry-ai-list/entry-ai-list', {tab: 1})
         }
 
         const handleNext = async () => {

src/pagesOther/pages/major-library/detail/components/open-college.vue

@@ -24,7 +24,7 @@ const list = ref([])
 const paging = ref(null)
 
 const goCollege = (item) => {
-    transferTo('/pages/college-library/detail/detail', ['code'], item)
+    transferTo('/pagesOther/pages/college-library/detail/detail', ['code'], item)
 }
 
 const handleQuery = (pageNum, pageSize) => {

src/pagesOther/pages/major-library/index/index.vue

@@ -73,7 +73,7 @@ const goDetail = (item) => {
     const paths = [, , 'level-two/level-two', 'detail/detail']
     const path = paths[item.level]
     if (!path) return
-    transferTo('/pages/major-library/' + path, ['code'], item)
+    transferTo('/pagesOther/pages/major-library/' + path, ['code'], item)
 }
 </script>
 

src/pagesOther/pages/major-library/level-two/level-two.vue

@@ -29,7 +29,7 @@ const majorTree = ref([])
 const detail = computed(() => findTreeNode(majorTree.value, m => m.code == prevData.value.code) || {})
 
 const goDetail = (item) => {
-    transferTo('/pages/major-library/detail/detail', ['code'], item)
+    transferTo('/pagesOther/pages/major-library/detail/detail', ['code'], item)
 }
 
 onMounted(async () => {

src/pagesOther/pages/test-center/components/step-paper/step-paper.vue

@@ -42,7 +42,7 @@ import MxPaperProgress from "@/components/mx-paper/components/mx-paper-progress.
 
 // 目前holland与mbti是同一套行为
 const props = defineProps({
-    history: createPropDefine('/pages/test-center/list/list'),
+    history: createPropDefine('/pagesOther/pages/test-center/list/list'),
     type: createPropDefine(''),
     // transferTo中创建的URL中包含data参数，该参数会自动进入页面的props，
     // 这里申明一下防止多结点警告，并不需要使用它，useTransfer中包含使用方法。

src/pagesOther/pages/test-center/holland/holland.vue

@@ -1,7 +1,7 @@
 <template>
     <step-paper type="holland">
         <template #welcome>
-            <view class="p-40 leading-6">
+            <view class="p-40">
                 <view class="text-lg text-main indent-50">
                     霍兰德职业兴趣测评（self-Directed Search）是由美国职业指导专家霍兰德（John
                     Holland）根据他本人大量的职业咨询经验及其汁液类型理论编制的测评工具。他认为，个人职业兴趣特性与职业之间有一种内在的对应关系，根据系兴趣不同人格可分为以下六种，每个人的性格都是这六个维度的不同程度的组合。

src/pagesOther/pages/test-center/index/index.vue

@@ -2,7 +2,7 @@
     <view class="page-content">
         <mx-nav-bar title="我的测评"/>
         <view class="p-30 fx-col gap-30">
-            <!-- <component v-for="b in blocks" v-bind="b" :is="blockMap[b.is]"/> -->
+            <component v-for="b in blocks" v-bind="b" :is="blockMap[b.is]"/>
         </view>
     </view>
 </template>

src/pagesOther/pages/test-center/list/components/holland-list-item.vue

@@ -68,7 +68,7 @@ const getDateStr = (str) => {
 }
 
 const handleReport = () => {
-    transferTo('/pages/test-center/holland/holland', {code: props.item.code})
+    transferTo('/pagesOther/pages/test-center/holland/holland', {code: props.item.code})
 }
 </script>
 

src/pagesOther/pages/vocation-library/index/index.vue

@@ -72,7 +72,7 @@ const handleQuery = () => {
 }
 
 const goDetail = (item) => {
-    transferTo('/pages/vocation-library/detail/detail', ['code'], item)
+    transferTo('/pagesOther/pages/vocation-library/detail/detail', ['code'], item)
 }
 </script>
 

src/pagesSystem/pages/login/login.vue

@@ -1,8 +1,8 @@
 <template>
   <ie-page bgColor="white">
     <ie-navbar title="" :placeholder="false" bgColor="transparent" />
-    <ie-oss-image src="/login-bg.png" custom-class="w-full min-h-350 absolute top-0 left-0 z-1" />
-    <ie-oss-image src="/login-title.png" custom-class="w-auto h-96 mx-auto mt-240" mode="heightFix" />
+    <ie-image :is-oss="true" src="/login-bg.png" custom-class="w-full min-h-350 absolute top-0 left-0 z-1" />
+    <ie-image :is-oss="true" src="/login-title.png" custom-class="w-auto h-96 mx-auto mt-240" mode="heightFix" />
     <view class="relative z-2 mx-46 mt-178">
       <view class="ml-18 flex items-center">
         <view class="text-32" :class="{ 'is-active': loginType === 'phone' }" @click="changeLoginType('phone')">