diff --git a/pages.config.ts b/pages.config.ts index f94dc90..7fac5a5 100644 --- a/pages.config.ts +++ b/pages.config.ts @@ -26,27 +26,27 @@ export default defineUniPages({ spacing: '3px', list: [ { - iconPath: 'static/tabBar/home.png', - selectedIconPath: 'static/tabBar/home-active.png', + iconPath: '/static/tabBar/home.png', + selectedIconPath: '/static/tabBar/home-active.png', pagePath: 'pages/home/index/index', text: '首页', }, { - iconPath: 'static/tabBar/news.png', - selectedIconPath: 'static/tabBar/news-active.png', - pagePath: 'pages/news/index/index', + iconPath: '/static/tabBar/news.png', + selectedIconPath: '/static/tabBar/news-active.png', + pagePath: 'pages/evaluation/index/index', text: '测评', }, { - iconPath: 'static/tabBar/place.png', - selectedIconPath: 'static/tabBar/place-active.png', - pagePath: 'pages/place/index/index', + iconPath: '/static/tabBar/place.png', + selectedIconPath: '/static/tabBar/place-active.png', + pagePath: 'pages/expert/index/index', text: '专家', }, { - iconPath: 'static/tabBar/center.png', - selectedIconPath: 'static/tabBar/center-active.png', + iconPath: '/static/tabBar/center.png', + selectedIconPath: '/static/tabBar/center-active.png', pagePath: 'pages/ucenter/index/index', text: '我的', }, @@ -61,34 +61,6 @@ export default defineUniPages({ navigationStyle: 'custom', }, }, - { - path: 'pages/place/index/index', - type: 'page', - style: { - navigationBarTitleText: '专家', - }, - }, - { - path: 'pages/aiService/index/index', - type: 'page', - style: { - navigationBarTitleText: '六维管家', - }, - }, - { - path: 'pages/news/index/index', - type: 'page', - style: { - navigationBarTitleText: '测评', - }, - }, - { - path: 'pages/ucenter/index/index', - type: 'page', - style: { - navigationBarTitleText: '我的', - }, - }, ], preloadRule: { 'pages/home/index/index': { diff --git a/screenshots/pay-1.png b/screenshots/pay-1.png deleted file mode 100644 index 92e8019..0000000 Binary files a/screenshots/pay-1.png and /dev/null differ diff --git a/screenshots/pay-2.png b/screenshots/pay-2.png deleted file mode 100644 index 9004bed..0000000 Binary files a/screenshots/pay-2.png and /dev/null differ diff --git a/src/hooks/useTabbarList.ts b/src/hooks/useTabbarList.ts index 8e26afe..824ce7f 100644 --- a/src/hooks/useTabbarList.ts +++ b/src/hooks/useTabbarList.ts @@ -9,7 +9,7 @@ sysDictType({ id: 619330547859525 }).then((res) => { const _tabbarList = [ { id: 0, - path: '../../home/index/index', + path: '/pages/home/index/index', icon: '/static/tabBar/home.png', selectIcon: '/static/tabBar/home-active.png', text: '首页', @@ -17,7 +17,7 @@ sysDictType({ id: 619330547859525 }).then((res) => { }, { id: 3, - path: '../../news/index/index', + path: '/pages/evaluation/index/index', icon: '/static/tabBar/news.png', selectIcon: '/static/tabBar/news-active.png', text: '测评', @@ -25,7 +25,7 @@ sysDictType({ id: 619330547859525 }).then((res) => { }, { id: 2, - path: '../../aiService/index/index', + path: '/pages/aiService/index/index', icon: '/static/tabBar/ai.png', selectIcon: '/static/tabBar/ai-active.png', text: '', @@ -33,7 +33,7 @@ sysDictType({ id: 619330547859525 }).then((res) => { }, { id: 1, - path: '../../place/index/index', + path: '/pages/expert/index/index', icon: '/static/tabBar/place.png', selectIcon: '/static/tabBar/place-active.png', text: '专家', @@ -41,7 +41,7 @@ sysDictType({ id: 619330547859525 }).then((res) => { }, { id: 4, - path: '../../ucenter/index/index', + path: '/pages/ucenter/index/index', icon: '/static/tabBar/center.png', selectIcon: '/static/tabBar/center-active.png', text: '我的', diff --git a/src/interceptors/route.ts b/src/interceptors/route.ts index ddd6c98..f175df5 100644 --- a/src/interceptors/route.ts +++ b/src/interceptors/route.ts @@ -12,7 +12,7 @@ const loginRoute = '/pages/login/index' const isLogined = () => { const userStore = useUserStore() - return userStore.isLogined + return userStore.isLoginFlag } const isDev = import.meta.env.DEV diff --git a/src/pages.json b/src/pages.json index f991be8..cd9feb4 100644 --- a/src/pages.json +++ b/src/pages.json @@ -23,26 +23,26 @@ "spacing": "3px", "list": [ { - "iconPath": "static/tabBar/home.png", - "selectedIconPath": "static/tabBar/home-active.png", + "iconPath": "/static/tabBar/home.png", + "selectedIconPath": "/static/tabBar/home-active.png", "pagePath": "pages/home/index/index", "text": "首页" }, { - "iconPath": "static/tabBar/news.png", - "selectedIconPath": "static/tabBar/news-active.png", - "pagePath": "pages/news/index/index", + "iconPath": "/static/tabBar/news.png", + "selectedIconPath": "/static/tabBar/news-active.png", + "pagePath": "pages/evaluation/index/index", "text": "测评" }, { - "iconPath": "static/tabBar/place.png", - "selectedIconPath": "static/tabBar/place-active.png", - "pagePath": "pages/place/index/index", + "iconPath": "/static/tabBar/place.png", + "selectedIconPath": "/static/tabBar/place-active.png", + "pagePath": "pages/expert/index/index", "text": "专家" }, { - "iconPath": "static/tabBar/center.png", - "selectedIconPath": "static/tabBar/center-active.png", + "iconPath": "/static/tabBar/center.png", + "selectedIconPath": "/static/tabBar/center-active.png", "pagePath": "pages/ucenter/index/index", "text": "我的" } @@ -58,39 +58,37 @@ } }, { - "path": "pages/about/about", + "path": "pages/login/index", "type": "page", - "style": { - "navigationBarTitleText": "关于" - } + "style": {} }, { "path": "pages/aiService/index/index", "type": "page", - "style": { - "navigationBarTitleText": "六维管家" - } + "style": {} }, { - "path": "pages/news/index/index", + "path": "pages/evaluation/index/index", "type": "page", + "layout": "demo", "style": { - "navigationBarTitleText": "测评" - } + "navigationBarTitleText": "测评师" + }, + "needLogin": true }, { - "path": "pages/place/index/index", + "path": "pages/expert/index/index", "type": "page", + "layout": "demo", "style": { - "navigationBarTitleText": "专家" - } + "navigationBarTitleText": "测评师" + }, + "needLogin": true }, { "path": "pages/ucenter/index/index", "type": "page", - "style": { - "navigationBarTitleText": "我的" - } + "style": {} } ], "preloadRule": { diff --git a/src/pages/about/about.vue b/src/pages/about/about.vue deleted file mode 100644 index abda17f..0000000 --- a/src/pages/about/about.vue +++ /dev/null @@ -1,36 +0,0 @@ - -{ - style: { - navigationBarTitleText: '关于', - }, -} - - - - - - - diff --git a/src/pages/about/components/request.vue b/src/pages/about/components/request.vue deleted file mode 100644 index d8a1e96..0000000 --- a/src/pages/about/components/request.vue +++ /dev/null @@ -1,67 +0,0 @@ - -{ - layout: 'demo', - style: { - navigationBarTitleText: '请求', - }, -} - - - - - diff --git a/src/pages/about/components/upload.vue b/src/pages/about/components/upload.vue deleted file mode 100644 index 07f81f5..0000000 --- a/src/pages/about/components/upload.vue +++ /dev/null @@ -1,30 +0,0 @@ - -{ - layout: 'default', - style: { - navigationBarTitleText: '上传-状态一体化', - }, -} - - - - - - - diff --git a/src/pages/evaluation/index/index.vue b/src/pages/evaluation/index/index.vue new file mode 100644 index 0000000..4867d17 --- /dev/null +++ b/src/pages/evaluation/index/index.vue @@ -0,0 +1,18 @@ + +{ + layout: 'demo', + style: { + navigationBarTitleText: '测评师', + }, + needLogin: true, +} + + + + + diff --git a/src/pages/expert/index/index.vue b/src/pages/expert/index/index.vue new file mode 100644 index 0000000..14c88b2 --- /dev/null +++ b/src/pages/expert/index/index.vue @@ -0,0 +1,19 @@ + +{ + layout: 'demo', + style: { + navigationBarTitleText: '测评师', + }, + needLogin: true, +} + + + + diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue new file mode 100644 index 0000000..fdc69c1 --- /dev/null +++ b/src/pages/login/index.vue @@ -0,0 +1,12 @@ + diff --git a/src/pages/news/index/index.vue b/src/pages/news/index/index.vue deleted file mode 100644 index 65aceb7..0000000 --- a/src/pages/news/index/index.vue +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/src/pages/place/index/index.vue b/src/pages/place/index/index.vue deleted file mode 100644 index 28801f2..0000000 --- a/src/pages/place/index/index.vue +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/src/store/user.ts b/src/store/user.ts index 0be46bf..c20c7dd 100644 --- a/src/store/user.ts +++ b/src/store/user.ts @@ -59,13 +59,13 @@ export const useUserStore = defineStore( const reset = () => { userInfo.value = { ...initState } } - const isLogined = computed(() => !!userInfo.value.token) + const isLoginFlag = computed(() => !!userInfo.value.token) return { userInfo, setUserInfo, clearUserInfo, - isLogined, + isLoginFlag, reset, setUserCity, setEstimatedAchievement, diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index 06d8737..27f3b01 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -5,10 +5,10 @@ interface NavigateToOptions { url: "/pages/home/index/index" | - "/pages/about/about" | + "/pages/login/index" | "/pages/aiService/index/index" | - "/pages/news/index/index" | - "/pages/place/index/index" | + "/pages/evaluation/index/index" | + "/pages/expert/index/index" | "/pages/ucenter/index/index" | "/pages-sub/customerService/index/index" | "/pages-sub/home/aiAutoFill/index" | @@ -35,7 +35,7 @@ interface NavigateToOptions { interface RedirectToOptions extends NavigateToOptions {} interface SwitchTabOptions { - url: "/pages/home/index/index" | "/pages/news/index/index" | "/pages/place/index/index" | "/pages/ucenter/index/index" + url: "/pages/home/index/index" | "/pages/evaluation/index/index" | "/pages/expert/index/index" | "/pages/ucenter/index/index" } type ReLaunchOptions = NavigateToOptions | SwitchTabOptions;