diff --git a/manifest.config.ts b/manifest.config.ts index bcd913f..bd72c54 100644 --- a/manifest.config.ts +++ b/manifest.config.ts @@ -91,6 +91,7 @@ export default defineManifestConfig({ subPackages: true, }, requiredPrivateInfos: ['getLocation'], + requiredBackgroundModes: ['audio'], // __usePrivacyCheck__: true, }, uniStatistics: { diff --git a/pages.config.ts b/pages.config.ts index 1993a98..5cf2848 100644 --- a/pages.config.ts +++ b/pages.config.ts @@ -82,5 +82,8 @@ export default defineUniPages({ 'scope.userLocation': { desc: '你的位置信息将用于小程序位置接口的效果展示', }, + 'scope.record': { + desc: '你的录音功能将用于小程序录音接口的效果展示', + }, }, }) diff --git a/src/aiService-sub/index/index.vue b/src/aiService-sub/index/index.vue new file mode 100644 index 0000000..2b6a7c3 --- /dev/null +++ b/src/aiService-sub/index/index.vue @@ -0,0 +1,25 @@ + +{ + style: { + navigationBarTitleText: '小纬', + }, + needLogin: true, +} + + + + + + diff --git a/src/components/bar/CustomTabBar.vue b/src/components/bar/CustomTabBar.vue index 8ebcfcf..99b33fc 100644 --- a/src/components/bar/CustomTabBar.vue +++ b/src/components/bar/CustomTabBar.vue @@ -35,7 +35,7 @@ import { TabesItem } from '@/service/app/types' import { tabbarList } from '@/hooks/useTabbarList' import { ref, computed, onMounted } from 'vue' -const props = defineProps({ +defineProps({ currentPage: { type: Number, default: 0, @@ -58,9 +58,15 @@ const tabbarTotalHeight = computed(() => { }) const changeItem = (item: TabesItem) => { - uni.switchTab({ - url: item.path, - }) + if (item.navigatorItem) { + uni.navigateTo({ + url: item.path, + }) + } else { + uni.switchTab({ + url: item.path, + }) + } } onMounted(() => { diff --git a/src/components/home/SubMenu.vue b/src/components/home/SubMenu.vue index 74ab5ed..84df5bc 100644 --- a/src/components/home/SubMenu.vue +++ b/src/components/home/SubMenu.vue @@ -4,7 +4,7 @@ v-for="item in subMenus" :key="item.id" class="flex items-center justify-center flex-col" - @click="goPath(item.path)" + @click="goPath(item.path, item.isTab)" > {{ item.name }} @@ -19,12 +19,14 @@ const subMenus = [ name: '找大学', path: '/pages-sub/home/college/index', icon: '/static/images/home/college.svg', + isTab: false, }, { id: 2, name: '查专业', path: '/pages-sub/home/major/index', icon: '/static/images/home/major.svg', + isTab: false, }, // 看职业 { @@ -32,6 +34,7 @@ const subMenus = [ name: '看职业', path: '/pages-sub/home/career/index', icon: '/static/images/home/career.svg', + isTab: false, }, // 批次线 { @@ -46,6 +49,7 @@ const subMenus = [ name: '查位次', path: '/pages-evaluation-sub/rank/index', icon: '/static/images/home/rank.svg', + isTab: false, }, // 查扩缩招 { @@ -53,6 +57,7 @@ const subMenus = [ name: '查扩缩招', path: '/pages-sub/home/expand/index', icon: '/static/images/home/expand.svg', + isTab: false, }, // 专业测评 { @@ -60,6 +65,7 @@ const subMenus = [ name: '专业测评', path: '/pages/evaluation/index/index', icon: '/static/images/home/evaluation.svg', + isTab: true, }, // 大学甄别 { @@ -67,12 +73,19 @@ const subMenus = [ name: '大学甄别', path: '/pages-sub/home/distinguish/index', icon: '/static/images/home/distinguish.svg', + isTab: false, }, ] -const goPath = (path: string) => { - uni.navigateTo({ - url: path, - }) +const goPath = (path: string, isTab: boolean) => { + if (isTab) { + uni.switchTab({ + url: path, + }) + } else { + uni.navigateTo({ + url: path, + }) + } } diff --git a/src/hooks/useTabbarList.ts b/src/hooks/useTabbarList.ts index 9f1fbca..30b2a82 100644 --- a/src/hooks/useTabbarList.ts +++ b/src/hooks/useTabbarList.ts @@ -24,11 +24,12 @@ sysDictType({ id: 619330547859525 }).then((res) => { }, { id: 2, - path: '/pages/aiService/index/index', + path: '/aiService-sub/index/index', icon: '/static/tabBar/ai.png', selectIcon: '/static/tabBar/ai-active.png', text: '', centerItem: true, + navigatorItem: true, }, { id: 1, diff --git a/src/manifest.json b/src/manifest.json index 8fc34fa..592038c 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -65,6 +65,9 @@ }, "requiredPrivateInfos": [ "getLocation" + ], + "requiredBackgroundModes": [ + "audio" ] }, "mp-alipay": { diff --git a/src/pages-evaluation-sub/index.vue b/src/pages-evaluation-sub/index.vue deleted file mode 100644 index 265fd66..0000000 --- a/src/pages-evaluation-sub/index.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - - diff --git a/src/pages-sub/components/navbar/Navbar.vue b/src/pages-sub/components/navbar/Navbar.vue index 4328467..ea17da0 100644 --- a/src/pages-sub/components/navbar/Navbar.vue +++ b/src/pages-sub/components/navbar/Navbar.vue @@ -20,7 +20,7 @@ - + diff --git a/src/pages-sub/customerService/index/index.vue b/src/pages-sub/customerService/index/index.vue index 0c4b35a..3c52281 100644 --- a/src/pages-sub/customerService/index/index.vue +++ b/src/pages-sub/customerService/index/index.vue @@ -24,7 +24,7 @@ 专属客服为您服务 - 400-621-1003 + {{ phoneNumber }} - + 扫码添加客服企业微信 @@ -60,10 +57,12 @@ + + diff --git a/src/pages-sub/home/distinguish/index.vue b/src/pages-sub/home/distinguish/index.vue index 9c02ed2..bf97eea 100644 --- a/src/pages-sub/home/distinguish/index.vue +++ b/src/pages-sub/home/distinguish/index.vue @@ -45,16 +45,48 @@ - - - - - + + + + + 院校名称 + + + 办学地点 + + + 院校鉴别 + + + + + + + {{ item.universityName }} + + + {{ item.locationName }} + + + + {{ item.type === 1 ? '虚假大学' : '真实大学' }} + + + + + 暂无数据 + + + @@ -82,17 +114,13 @@ + + diff --git a/src/pages-sub/ucenter/setting/index.vue b/src/pages-sub/ucenter/setting/index.vue new file mode 100644 index 0000000..958171e --- /dev/null +++ b/src/pages-sub/ucenter/setting/index.vue @@ -0,0 +1,65 @@ + +{ + style: { + navigationBarTitleText: '设置', + }, +} + + + + + + + diff --git a/src/pages.json b/src/pages.json index 2eb51ba..b7b4d68 100644 --- a/src/pages.json +++ b/src/pages.json @@ -57,11 +57,6 @@ "navigationStyle": "custom" } }, - { - "path": "pages/aiService/index/index", - "type": "page", - "style": {} - }, { "path": "pages/evaluation/index/index", "type": "page", @@ -108,12 +103,22 @@ "permission": { "scope.userLocation": { "desc": "你的位置信息将用于小程序位置接口的效果展示" + }, + "scope.record": { + "desc": "你的录音功能将用于小程序录音接口的效果展示" } }, "subPackages": [ { "root": "pages-sub", "pages": [ + { + "path": "evaluation/assessmentPage", + "type": "page", + "style": { + "navigationStyle": "custom" + } + }, { "path": "customerService/index/index", "type": "page", @@ -277,6 +282,17 @@ "navigationBarTitleText": "测评结果" } }, + { + "path": "ucenter/setting/about", + "type": "page" + }, + { + "path": "ucenter/setting/index", + "type": "page", + "style": { + "navigationBarTitleText": "设置" + } + }, { "path": "ucenter/star/myStar", "type": "page", @@ -316,10 +332,6 @@ { "root": "pages-evaluation-sub", "pages": [ - { - "path": "index", - "type": "page" - }, { "path": "aiAutoFill/index", "type": "page", @@ -336,6 +348,19 @@ } } ] + }, + { + "root": "aiService-sub", + "pages": [ + { + "path": "index/index", + "type": "page", + "style": { + "navigationBarTitleText": "小纬" + }, + "needLogin": true + } + ] } ] } \ No newline at end of file diff --git a/src/pages/aiService/index/index.vue b/src/pages/aiService/index/index.vue deleted file mode 100644 index 8e06632..0000000 --- a/src/pages/aiService/index/index.vue +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/src/pages/evaluation/components/EvaluationItem.vue b/src/pages/evaluation/components/EvaluationItem.vue index a6fd67f..b5e76c7 100644 --- a/src/pages/evaluation/components/EvaluationItem.vue +++ b/src/pages/evaluation/components/EvaluationItem.vue @@ -1,12 +1,12 @@