From cc8fa61beaef1ddeeb7d1255dea7ef7ec53e5157 Mon Sep 17 00:00:00 2001 From: Jason <5340635+wen-jason@user.noreply.gitee.com> Date: Fri, 9 Sep 2022 14:44:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=EF=BC=8C?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/components/link/index.ts | 3 +- admin/src/components/link/shop-pages.vue | 58 ++++++++++++- admin/src/utils/util.ts | 2 +- app/src/api/news.ts | 22 ++--- app/src/components/widgets/banner/banner.vue | 10 ++- .../widgets/my-service/my-service.vue | 6 ++ app/src/components/widgets/nav/nav.vue | 5 ++ .../widgets/user-banner/user-banner.vue | 10 ++- .../widgets/user-info/user-info.vue | 7 +- app/src/pages.json | 3 + app/src/pages/webview/webview.vue | 16 ++++ app/src/router/index.ts | 48 +++++------ app/src/utils/request/index.ts | 8 +- app/src/utils/request/type.d.ts | 1 + app/src/utils/util.ts | 81 +++++++++++++++++++ 15 files changed, 233 insertions(+), 47 deletions(-) create mode 100644 app/src/pages/webview/webview.vue diff --git a/admin/src/components/link/index.ts b/admin/src/components/link/index.ts index 8e12a67a..bca179fb 100644 --- a/admin/src/components/link/index.ts +++ b/admin/src/components/link/index.ts @@ -7,5 +7,6 @@ export interface Link { path: string name?: string type: string - params?: Record + isTab: boolean + query?: Record } diff --git a/admin/src/components/link/shop-pages.vue b/admin/src/components/link/shop-pages.vue index ad7eb1cf..e7681210 100644 --- a/admin/src/components/link/shop-pages.vue +++ b/admin/src/components/link/shop-pages.vue @@ -4,7 +4,10 @@
@@ -32,16 +35,65 @@ const linkList = ref([ { path: '/pages/index/index', name: '商城首页', - type: LinkTypeEnum.SHOP_PAGES + type: LinkTypeEnum.SHOP_PAGES, + isTab: true }, { path: '/pages/news/news', name: '文章资讯', - type: LinkTypeEnum.SHOP_PAGES + type: LinkTypeEnum.SHOP_PAGES, + isTab: true }, { path: '/pages/user/user', name: '个人中心', + type: LinkTypeEnum.SHOP_PAGES, + isTab: true + }, + { + path: '/pages/collection/collection', + name: '我的收藏', + type: LinkTypeEnum.SHOP_PAGES + }, + { + path: '/pages/customer_service/customer_service', + name: '联系客服', + type: LinkTypeEnum.SHOP_PAGES + }, + { + path: '/pages/user_set/user_set', + name: '个人设置', + type: LinkTypeEnum.SHOP_PAGES + }, + { + path: '/pages/as_us/as_us', + name: '关于我们', + type: LinkTypeEnum.SHOP_PAGES + }, + { + path: '/pages/user_data/user_data', + name: '个人资料', + type: LinkTypeEnum.SHOP_PAGES + }, + { + path: '/pages/agreement/agreement', + name: '隐私政策', + query: { + type: 'privacy' + }, + type: LinkTypeEnum.SHOP_PAGES + }, + { + path: '/pages/agreement/agreement', + name: '服务协议', + query: { + type: 'service' + }, + type: LinkTypeEnum.SHOP_PAGES + }, + { + path: '/pages/search/search', + name: '搜索', type: LinkTypeEnum.SHOP_PAGES } ]) diff --git a/admin/src/utils/util.ts b/admin/src/utils/util.ts index 119b60bc..d553beb3 100644 --- a/admin/src/utils/util.ts +++ b/admin/src/utils/util.ts @@ -16,7 +16,7 @@ export const addUnit = (value: string | number, unit = 'px') => { * @return {Boolean} */ export const isEmpty = (value: unknown) => { - return value !== null && value !== '' && typeof value !== 'undefined' + return value == null && typeof value == 'undefined' } /** diff --git a/app/src/api/news.ts b/app/src/api/news.ts index c26c5a86..cddb8364 100644 --- a/app/src/api/news.ts +++ b/app/src/api/news.ts @@ -2,7 +2,7 @@ import request from '@/utils/request' /** * @description 获取文章分类 - * @return { Promise } + * @return { Promise } */ export function getArticleCate() { return request.get({ url: '/article/category' }) @@ -10,7 +10,7 @@ export function getArticleCate() { /** * @description 获取文章列表 - * @return { Promise } + * @return { Promise } */ export function getArticleList(data: Record) { return request.get({ url: '/article/list', data: data }) @@ -18,8 +18,8 @@ export function getArticleList(data: Record) { /** * @description 获取文章详情 - * @param { number } id - * @return { Promise } + * @param { number } id + * @return { Promise } */ export function getArticleDetail(data: { id: number }) { return request.get({ url: '/article/detail', data: data }) @@ -27,25 +27,25 @@ export function getArticleDetail(data: { id: number }) { /** * @description 加入收藏 - * @param { number } articleId - * @return { Promise } + * @param { number } articleId + * @return { Promise } */ export function addCollect(data: { articleId: number }) { - return request.post({ url: '/article/addCollect', data: data }) + return request.post({ url: '/article/addCollect', data: data }, { isAuth: true }) } /** * @description 取消收藏 - * @param { number } id - * @return { Promise } + * @param { number } id + * @return { Promise } */ export function cancelCollect(data: { articleId: number }) { - return request.post({ url: '/article/cancelCollect', data: data }) + return request.post({ url: '/article/cancelCollect', data: data }, { isAuth: true }) } /** * @description 获取收藏列表 - * @return { Promise } + * @return { Promise } */ export function getCollect() { return request.get({ url: '/article/collect' }) diff --git a/app/src/components/widgets/banner/banner.vue b/app/src/components/widgets/banner/banner.vue index 4cb00c18..0a27a787 100644 --- a/app/src/components/widgets/banner/banner.vue +++ b/app/src/components/widgets/banner/banner.vue @@ -9,7 +9,11 @@ indicator-active-color="#4173ff" :autoplay="true" > - + import { useAppStore } from '@/stores/app' +import { navigateTo } from '@/utils/util' const props = defineProps({ content: { @@ -35,6 +40,9 @@ const props = defineProps({ } }) const { getImageUrl } = useAppStore() +const handleClick = (link: any) => { + navigateTo(link) +} diff --git a/app/src/components/widgets/my-service/my-service.vue b/app/src/components/widgets/my-service/my-service.vue index 28dec2cc..9e4f583b 100644 --- a/app/src/components/widgets/my-service/my-service.vue +++ b/app/src/components/widgets/my-service/my-service.vue @@ -11,6 +11,7 @@ v-for="(item, index) in content.data" :key="index" class="flex flex-col items-center w-1/4 mb-[15px]" + @click="handleClick(item.link)" >
{{ item.name }}
@@ -21,6 +22,7 @@ v-for="(item, index) in content.data" :key="index" class="flex items-center border-light border-solid border-0 border-b h-[100rpx] px-[24rpx]" + @click="handleClick(item.link)" >
{{ item.name }}
@@ -33,6 +35,7 @@ diff --git a/app/src/components/widgets/nav/nav.vue b/app/src/components/widgets/nav/nav.vue index f8d596a2..b348f22c 100644 --- a/app/src/components/widgets/nav/nav.vue +++ b/app/src/components/widgets/nav/nav.vue @@ -5,6 +5,7 @@ v-for="(item, index) in content.data" :key="index" class="flex flex-col items-center w-1/5 mb-[30rpx]" + @click="handleClick(item.link)" > {{ item.name }} @@ -15,6 +16,7 @@ diff --git a/app/src/components/widgets/user-banner/user-banner.vue b/app/src/components/widgets/user-banner/user-banner.vue index 95647f8a..aac52319 100644 --- a/app/src/components/widgets/user-banner/user-banner.vue +++ b/app/src/components/widgets/user-banner/user-banner.vue @@ -9,7 +9,11 @@ indicator-active-color="#4173ff" :autoplay="true" > - + import { useAppStore } from '@/stores/app' +import { navigateTo } from '@/utils/util' const props = defineProps({ content: { @@ -35,6 +40,9 @@ const props = defineProps({ default: () => ({}) } }) +const handleClick = (link: any) => { + navigateTo(link) +} const { getImageUrl } = useAppStore() diff --git a/app/src/components/widgets/user-info/user-info.vue b/app/src/components/widgets/user-info/user-info.vue index 0813bf65..40319566 100644 --- a/app/src/components/widgets/user-info/user-info.vue +++ b/app/src/components/widgets/user-info/user-info.vue @@ -1,10 +1,10 @@ + + diff --git a/app/src/router/index.ts b/app/src/router/index.ts index 45a26e36..47114414 100644 --- a/app/src/router/index.ts +++ b/app/src/router/index.ts @@ -1,31 +1,27 @@ import { getToken } from '@/utils/auth' import { generateRoutes } from './transformPages' -const routes = generateRoutes() - -export default async function () { - const list = ['navigateTo', 'redirectTo', 'reLaunch', 'switchTab'] - list.forEach((item) => { - uni.addInterceptor(item, { - invoke(e) { - // 获取要跳转的页面路径（url去掉"?"和"?"后的参数） - const url = e.url.split('?')[0] - const currentRoute = routes.find((item) => { - return url === item.path +export const routes = generateRoutes() +const list = ['navigateTo', 'redirectTo', 'reLaunch', 'switchTab'] +list.forEach((item) => { + uni.addInterceptor(item, { + invoke(e) { + // 获取要跳转的页面路径（url去掉"?"和"?"后的参数） + const url = e.url.split('?')[0] + const currentRoute = routes.find((item) => { + return url === item.path + }) + // 需要登录并且没有token + if (currentRoute?.auth && !getToken()) { + uni.navigateTo({ + url: '/pages/login/login' }) - - // 需要登录并且没有token - if (currentRoute?.isAuth && !getToken()) { - uni.navigateTo({ - url: '/pages/login/login' - }) - return false - } - return e - }, - fail(err) { - // 失败回调拦截 - console.log(err) + return false } - }) + return e + }, + fail(err) { + // 失败回调拦截 + console.log(err) + } }) -} +}) diff --git a/app/src/utils/request/index.ts b/app/src/utils/request/index.ts index 1dc211e3..e0b9a8cf 100644 --- a/app/src/utils/request/index.ts +++ b/app/src/utils/request/index.ts @@ -23,7 +23,7 @@ const requestHooks: RequestHooks = { return options }, responseInterceptorsHook(response, config) { - const { isTransformResponse, isReturnDefaultResponse } = config + const { isTransformResponse, isReturnDefaultResponse, isAuth } = config //返回默认响应，当需要获取响应头及其他数据时可使用 if (isReturnDefaultResponse) { @@ -54,6 +54,11 @@ const requestHooks: RequestHooks = { case RequestCodeEnum.TOKEN_INVALID: case RequestCodeEnum.TOKEN_EMPTY: logout() + if (isAuth && !getToken()) { + uni.navigateTo({ + url: '/pages/login/login' + }) + } return Promise.reject() default: @@ -77,6 +82,7 @@ const defaultOptions: HttpRequestOptions = { ignoreCancel: false, // 是否携带token withToken: true, + isAuth: false, requestHooks: requestHooks } diff --git a/app/src/utils/request/type.d.ts b/app/src/utils/request/type.d.ts index fb127e42..f18665a6 100644 --- a/app/src/utils/request/type.d.ts +++ b/app/src/utils/request/type.d.ts @@ -14,6 +14,7 @@ export interface RequestConfig { urlPrefix: string ignoreCancel: boolean withToken: boolean + isAuth: boolean } export interface RequestHooks { diff --git a/app/src/utils/util.ts b/app/src/utils/util.ts index f77a3ef0..3010ae56 100644 --- a/app/src/utils/util.ts +++ b/app/src/utils/util.ts @@ -1,3 +1,5 @@ +import { isObject } from '@vue/shared' + /** * @description 获取元素节点信息（在组件中的元素必须要传ctx） * @param { String } selector 选择器 '.app' | '#app' @@ -23,3 +25,82 @@ export const getRect = (selector: string, all = false, context?: any) => { .exec() }) } + +/** + * @description 获取当前页面实例 + */ +export function currentPage() { + const pages = getCurrentPages() + const currentPage = pages[pages.length - 1] + return currentPage || {} +} + +/** + * @description 后台选择链接专用跳转 + */ +interface Link { + path: string + name?: string + type: string + isTab: boolean + query?: Record +} + +export enum LinkTypeEnum { + 'SHOP_PAGES' = 'shop', + 'CUSTOM_LINK' = 'custom' +} +export function navigateTo(link: Link) { + console.log(objectToQuery(link.query), link) + let url: string + switch (link.type) { + case LinkTypeEnum.SHOP_PAGES: + url = link.query ? `${link.path}?${objectToQuery(link.query)}` : link.path + if (link.isTab) { + uni.switchTab({ url }) + } else { + uni.navigateTo({ url }) + } + break + case LinkTypeEnum.CUSTOM_LINK: + uni.navigateTo({ url: `/pages/webview/webview?url=${link.path}` }) + } +} + +/** + * @description 是否为空 + * @param {unknown} value + * @return {Boolean} + */ +export const isEmpty = (value: unknown) => { + return value == null && typeof value == 'undefined' +} + +/** + * @description 对象格式化为Query语法 + * @param { Object } params + * @return {string} Query语法 + */ +export function objectToQuery(params: Record): string { + let query = '' + for (const props of Object.keys(params)) { + const value = params[props] + const part = encodeURIComponent(props) + '=' + if (!isEmpty(value)) { + console.log(encodeURIComponent(props), isObject(value)) + if (isObject(value)) { + for (const key of Object.keys(value)) { + if (!isEmpty(value[key])) { + const params = props + '[' + key + ']' + const subPart = encodeURIComponent(params) + '=' + query += subPart + encodeURIComponent(value[key]) + '&' + } + } + } else { + console.log(part + encodeURIComponent(value), '####') + query += part + encodeURIComponent(value) + '&' + } + } + } + return query.slice(0, -1) +}