abpcoder пре 1 месец
родитељ
комит
370f78997c

+ 16 - 0
src/common/routes.ts

@@ -66,6 +66,22 @@ export const routes = {
   * */
   voluntaryList: '/pagesOther/pages/voluntary/list/list',
   /*
+  * 志愿表 - 职高对口
+  * */
+  VHSList: '/pagesOther/pages/vhs/list/list',
+  /*
+  * 志愿填报 - 职高对口
+  * */
+  VHSIndex: '/pagesOther/pages/vhs/index/index',
+  /*
+  * 志愿编辑 - 职高对口
+  * */
+  VHSEdit: '/pagesOther/pages/vhs/edit/edit',
+  /*
+  * 志愿详情 - 职高对口
+  * */
+  VHSDetail: '/pagesOther/pages/vhs/detail/detail',
+  /*
   * 学习备考首页
   * */
   studyIndex: '/pagesStudy/pages/index/index',

+ 24 - 0
src/pages.json

@@ -194,6 +194,30 @@
           "style": {
             "navigationBarTitleText": ""
           }
+        },
+        {
+          "path": "pages/vhs/index/index",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        },
+        {
+          "path": "pages/vhs/detail/detail",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        },
+        {
+          "path": "pages/vhs/edit/edit",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        },
+        {
+          "path": "pages/vhs/list/list",
+          "style": {
+            "navigationBarTitleText": ""
+          }
         }
       ]
     },

+ 22 - 22
src/pagesMain/pages/me/components/me-menu.vue

@@ -63,28 +63,28 @@ type MenuItem = {
   pagePath: string;
 };
 
-const menus = [
-  {
-    name: '测评报告',
-    icon: '/static/personal/test_report.png',
-    pagePath: routes.testCenterList,
-  },
-  {
-    name: '我的收藏',
-    icon: '/static/personal/my_collected.png',
-    pagePath: routes.pageCollect,
-  },
-  {
-    name: '我的志愿表',
-    icon: '/static/personal/my_simulated.png',
-    pagePath: routes.voluntaryList,
-  },
-  {
-    name: '绑定会员卡',
-    icon: '/static/personal/bind_card.png',
-    pagePath: routes.pageCardVerify,
-  }
-];
+const menus = computed(() => [
+    {
+        name: '测评报告',
+        icon: '/static/personal/test_report.png',
+        pagePath: routes.testCenterList,
+    },
+    {
+        name: '我的收藏',
+        icon: '/static/personal/my_collected.png',
+        pagePath: routes.pageCollect,
+    },
+    {
+        name: '我的志愿表',
+        icon: '/static/personal/my_simulated.png',
+        pagePath: userStore.isVHS ? routes.VHSList : routes.voluntaryList,
+    },
+    {
+        name: '绑定会员卡',
+        icon: '/static/personal/bind_card.png',
+        pagePath: routes.pageCardVerify,
+    }
+]);
 const cellStyle = {
   padding: '30rpx 30rpx'
 }

+ 25 - 5
src/pagesMain/pages/volunteer/components/volunteer-banner.vue

@@ -1,9 +1,10 @@
 <template>
     <view class="px-28 flex gap-18">
-        <volunteer-banner-item title="测录取概率" desc="院校录取风险评估" desc-bg-color="#A8F496"
-                               bg-src="/volunteer/index/banner_rate.png" class="flex-1" custom-class="h-342" @click="goRateCalc"/>
+        <volunteer-banner-item :title="mainEntry.title" :desc="mainEntry.desc" desc-bg-color="#A8F496"
+                               bg-src="/volunteer/index/banner_rate.png" class="flex-1" custom-class="h-342"
+                               @click="goRateCalc"/>
         <view class="flex-1 flex flex-col justify-between">
-            <volunteer-banner-item title="测技能分" desc="精准定位" desc-bg-color="#F8ECA6"
+            <volunteer-banner-item :title="secondaryEntry.title" :desc="secondaryEntry.desc" desc-bg-color="#F8ECA6"
                                    bg-src="/volunteer/index/banner_skill.png" custom-class="h-162" @click="goSkillCalc"/>
             <volunteer-banner-item title="志愿表" desc="我的报考意向" desc-bg-color="#DDD6FF"
                                    bg-src="/volunteer/index/banner_list.png" custom-class="h-162" @click="goVoluntaryList"/>
@@ -15,16 +16,35 @@
 import VolunteerBannerItem from "@/pagesMain/pages/volunteer/components/volunteer-banner-item.vue";
 import {useTransferPage} from "@/hooks/useTransferPage";
 import {routes} from "@/common/routes";
+import {useUserStore} from "@/store/userStore";
 
 const {transferTo} = useTransferPage()
+const userStore = useUserStore()
+
+const mainEntry = computed(() => userStore.isVHS ? {
+    title: '填志愿',
+    desc: '大数据分析+智能算法'
+}: {
+    title: '测录取概率',
+    desc: '院校录取风险评估'
+})
+
+const secondaryEntry = computed(() => userStore.isVHS ? {
+    title: '查位次',
+    desc: '查历年等效分'
+}: {
+    title: '测技能分',
+    desc: '精准定位'
+})
+
 const goRateCalc = function () {
-    transferTo(routes.voluntaryIndex)
+    transferTo(userStore.isVHS ? routes.VHSIndex : routes.voluntaryIndex)
 }
 const goSkillCalc = function () {
     transferTo(routes.skillIndex)
 }
 const goVoluntaryList = function () {
-    transferTo(routes.voluntaryList)
+    transferTo(userStore.isVHS ? routes.VHSList : routes.voluntaryList)
 }
 </script>
 

+ 25 - 17
src/pagesMain/pages/volunteer/components/volunteer-menu.vue

@@ -8,31 +8,39 @@
 import VolunteerMenuItem from "@/pagesMain/pages/volunteer/components/volunteer-menu-item.vue";
 import {routes} from "@/common/routes";
 import {useTransferPage} from "@/hooks/useTransferPage";
+import {useUserStore} from "@/store/userStore";
 
 const {transferTo} = useTransferPage()
+const userStore = useUserStore()
 
 type Menu = {
     title: string
     icon: string
     pagePath: string
 }
-const menus: Menu[] = [{
-    title: '找院校',
-    icon: '/volunteer/index/menu_college.png',
-    pagePath: routes.universityIndex
-}, {
-    title: '查专业',
-    icon: '/volunteer/index/menu_major.png',
-    pagePath: routes.majorIndex
-}, {
-    title: '看职业',
-    icon: '/volunteer/index/menu_vocation.png',
-    pagePath: routes.careerIndex
-}, {
-    title: '志愿分析',
-    icon: '/volunteer/index/menu_analysis.png',
-    pagePath: ''
-}]
+const menus = computed<Menu[]>(() => {
+    const common = [{
+        title: '找院校',
+        icon: '/volunteer/index/menu_college.png',
+        pagePath: routes.universityIndex
+    }, {
+        title: '查专业',
+        icon: '/volunteer/index/menu_major.png',
+        pagePath: routes.majorIndex
+    }, {
+        title: '看职业',
+        icon: '/volunteer/index/menu_vocation.png',
+        pagePath: routes.careerIndex
+    }]
+    if (!userStore.isVHS) {
+        common.push({
+            title: '志愿分析',
+            icon: '/volunteer/index/menu_analysis.png',
+            pagePath: ''
+        })
+    }
+    return common
+})
 
 const goPage = function (menu: Menu) {
     if (menu.pagePath) transferTo(menu.pagePath)