From 34d6cfdf9ef404ad836bf1638548c450ff78ef3b Mon Sep 17 00:00:00 2001 From: fuchao <2577131060@qq.com> Date: Fri, 12 Dec 2025 14:33:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E8=AE=BF=E5=AE=A2?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=E5=9B=BE?= =?UTF-8?q?=E4=B9=A6=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 22 -------------- api/modules/book_home.ts | 8 ++--- api/modules/common.ts | 4 +-- api/modules/course.ts | 4 +-- api/modules/cousre_subject_classification.ts | 5 +--- pages/book/index.vue | 31 +++++++++++++++++--- pages/course/index.vue | 8 +---- pages/user/index.vue | 6 ++-- pages/user/recharge/index.vue | 2 +- pages/visitor/index.vue | 6 ++-- 10 files changed, 43 insertions(+), 53 deletions(-) diff --git a/App.vue b/App.vue index fda19e4..0ece09a 100644 --- a/App.vue +++ b/App.vue @@ -3,31 +3,9 @@ import update from "@/uni_modules/uni-upgrade-center-app/utils/check-update"; // #endif - import { useUserStore } from '@/stores/user' export default { onLaunch: function() { - const userStore = useUserStore() console.log('App Launch') - // 保存原生 switchTab 方法 - const originalSwitchTab = uni.switchTab; - uni.switchTab = (options) => { - if (options.url.includes('/pages/book/index') && !uni.getStorageSync('token')) { - uni.showModal({ - title: '提示', - content: '请先登录后访问该页面', - confirmText: '去登录', - success: (res) => { - console.log(res, 'res'); - if (res.confirm) uni.navigateTo({ - url: '/pages/login/login' - }); - } - }); - return; // 拦截跳转 - } - // 已登录/非拦截页 → 执行原生跳转 - originalSwitchTab.call(uni, options); - } // 检测自动更新 // #ifdef APP-PLUS update(); diff --git a/api/modules/book_home.ts b/api/modules/book_home.ts index e622dc4..93def69 100644 --- a/api/modules/book_home.ts +++ b/api/modules/book_home.ts @@ -42,7 +42,7 @@ export const bookHomeApi = { */ getRecommendBooks() { return skeletonClient.request({ - url: 'bookAbroad/home/getRecommendBooks', + url: uni.getStorageSync('token') ? 'bookAbroad/home/getRecommendBooks' : 'visitor/bookAbroad/getRecommendBooks', method: 'POST', data: {} }) @@ -54,7 +54,7 @@ export const bookHomeApi = { */ getBookLabelList(type: number) { return skeletonClient.request({ - url: 'bookAbroad/home/getBookAbroadLableList', + url: uni.getStorageSync('token') ? 'bookAbroad/home/getBookAbroadLableList' : 'visitor/bookAbroad//getBookAbroadLableList', method: 'POST', data: { type } }) @@ -66,7 +66,7 @@ export const bookHomeApi = { */ getSubLabelList(pid: number) { return skeletonClient.request({ - url: 'bookAbroad/home/getBookAbroadLableListByPid', + url: uni.getStorageSync('token') ? 'bookAbroad/home/getBookAbroadLableListByPid' : 'visitor/bookAbroad//getBookAbroadLableListByPid', method: 'POST', data: { pid } }) @@ -78,7 +78,7 @@ export const bookHomeApi = { */ getBooksByLabel(lableId: number) { return skeletonClient.request({ - url: 'bookAbroad/home/getAbroadBookListByLable', + url: uni.getStorageSync('token') ? 'bookAbroad/home/getAbroadBookListByLable' : 'visitor/bookAbroad/getAbroadBookListByLable', method: 'POST', data: { lableId } }) diff --git a/api/modules/common.ts b/api/modules/common.ts index 2871b65..564d8ae 100644 --- a/api/modules/common.ts +++ b/api/modules/common.ts @@ -2,7 +2,6 @@ import { mainClient, skeletonClient } from '@/api/clients' import type { IApiResponse } from '@/api/types' import type { IAgreement } from '@/types/user' -import { useUserStore } from '@/stores/user' export const commonApi = { /** @@ -37,9 +36,8 @@ export const commonApi = { * @returns 消息列表 */ getMessageList(isBook: number, isMedical: number, isSociology: number) { - const userStore = useUserStore() return skeletonClient.request({ - url: userStore.token ? 'common/message/listByPage' : '/visitor/listByPage', + url: uni.getStorageSync('token') ? 'common/message/listByPage' : '/visitor/listByPage', method: 'POST', data: { isBook, isMedical, isSociology } }) diff --git a/api/modules/course.ts b/api/modules/course.ts index 19752a1..9a2502a 100644 --- a/api/modules/course.ts +++ b/api/modules/course.ts @@ -13,7 +13,6 @@ import type { } from '@/types/course' import type { ISearchRequest, ISearchResponse } from '@/types/search' import type { ICommentListResponse, IAddCommentResponse, IComment } from '@/types/comment' -import { useUserStore } from '@/stores/user' /** * 课程相关API @@ -55,9 +54,8 @@ export const courseApi = { page: number, limit: number }) { - const userStore = useUserStore() return skeletonClient.request({ - url: userStore.token ? 'medical/home/getMarketCourseList' : 'visitor/getMarketCourseList', + url: uni.getStorageSync('token') ? 'medical/home/getMarketCourseList' : 'visitor/getMarketCourseList', method: 'POST', data }) diff --git a/api/modules/cousre_subject_classification.ts b/api/modules/cousre_subject_classification.ts index 59d543e..6fb9dd8 100644 --- a/api/modules/cousre_subject_classification.ts +++ b/api/modules/cousre_subject_classification.ts @@ -7,8 +7,6 @@ import type { IMarketCourseListResponse, ICourseMedicalLabelsResponse } from '@/types/course' -import { useUserStore } from '@/stores/user' -import { skeletonClient } from '../clients' const client = createRequestClient({ baseURL: SERVICE_MAP.MAIN }) @@ -23,9 +21,8 @@ export const courseSubjectClassificationApi = { * @returns 分类数据 */ getCourseMedicalTree() { - const userStore = useUserStore() return client.request({ - url: userStore.token ? 'medical/home/getCourseMedicalTree' : '/visitor/getCourseMedicalTree', + url: uni.getStorageSync('token') ? 'medical/home/getCourseMedicalTree' : '/visitor/getCourseMedicalTree', method: 'POST', data: {} }) diff --git a/pages/book/index.vue b/pages/book/index.vue index 79d781a..5c2e88f 100644 --- a/pages/book/index.vue +++ b/pages/book/index.vue @@ -35,16 +35,16 @@ {{ $t('bookHome.block1') }} {{ $t('bookHome.more') }} - + userStore.userInfo?.userEbookVip?.[0] || null) /** * 获取我的书单 */ -const getMyBooks = () => bookHomeApi.getMyBooks(1, 10) +const getMyBooks = () => uni.getStorageSync('token') ? bookHomeApi.getMyBooks(1, 10) : [] /** * 获取推荐图书 @@ -364,6 +364,8 @@ const handleMyBookClick = (bookId: number) => { * 处理图书点击 */ const handleBookClick = (bookId: number) => { + getPrompt() + if(!uni.getStorageSync('token')) return uni.navigateTo({ url: `/pages/book/detail?id=${bookId}` }) @@ -382,6 +384,8 @@ const handleMoreClick = () => { * 处理活动标签点击 */ const handleActivityLabelClick = async (labelId: number, index: number) => { + getPrompt() + if(!uni.getStorageSync('token')) return currentActivityIndex.value = index activityBooksSkeleton.value.reload() } @@ -404,6 +408,25 @@ const handleCategoryLevel2Click = async (labelId: number, index: number) => { categoryBooksSkeleton.value.reload() } +/** + * 登录提示语 + */ +const getPrompt = () => { + if(!uni.getStorageSync('token')) { + uni.showModal({ + title: '提示', + content: '请先登录后访问该页面', + confirmText: '去登录', + success: (res) => { + console.log(res , 'res'); + if (res.confirm) uni.navigateTo({ + url: '/pages/login/login' + }); + } + }); + } +} + /** * 页面显示 */ diff --git a/pages/course/index.vue b/pages/course/index.vue index ca99dd9..c7695e3 100644 --- a/pages/course/index.vue +++ b/pages/course/index.vue @@ -457,17 +457,11 @@ const requestAll = async () => { * 页面挂载 */ onMounted(() => { - if(!userStore.token) { - uni.navigateTo({ - url: '/pages/login/login' - }); - } // 重置分类索引 currentIndex.value = 0 // 请求所有数据 requestAll() - console.log('进来了2'); }) /** @@ -485,7 +479,7 @@ onShow(() => { // 刷新数据 // requestAll() - if(userStore.token){ + if(uni.getStorageSync('token')){ getLearnCourse() } }) diff --git a/pages/user/index.vue b/pages/user/index.vue index 44601b7..c786d04 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -1,5 +1,5 @@