From 8ff3ca01a0bd3f77eaf6d6f56284d9cf8899cdfe Mon Sep 17 00:00:00 2001 From: Huang <596417202@qq.com> Date: Mon, 20 Feb 2023 15:14:14 +0800 Subject: [PATCH] =?UTF-8?q?style-=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 40 ++-- src/androidPrivacy.json | 54 ++--- src/assets/main.scss | 44 ++-- src/components/AppProvider/inedx.vue | 6 +- src/components/BasicButton/index.vue | 46 ++-- src/components/BasicButton/prpos.ts | 4 +- src/components/BasicInput/index.vue | 46 ++-- src/components/Iconify/index.vue | 78 +++---- src/components/Navbar/index.vue | 260 ++++++++++------------- src/components/Test/index.vue | 16 +- src/enums/appEnum.ts | 4 +- src/enums/httpEnum.ts | 8 +- src/enums/platformEnum.ts | 150 ++++++------- src/enums/routerEnum.ts | 17 +- src/hooks/router.ts | 44 ++-- src/hooks/useGlobalStyle.ts | 19 +- src/hooks/useSystem.ts | 302 +++++++++++++-------------- src/main.ts | 12 +- src/pages/about/index.vue | 136 ++++++------ src/pages/demo/index.vue | 34 +-- src/pages/index/index.vue | 112 +++++----- src/pages/log/index.vue | 10 +- src/pages/login/index.vue | 168 +++++++-------- src/pages/notFound/404.vue | 48 ++--- src/pages/template/index.vue | 2 +- src/pagesA/list/test1/index.vue | 18 +- src/pagesA/list/test2/index.vue | 20 +- src/pagesB/detail/index.vue | 2 +- src/services/api/auth.ts | 14 +- src/services/model/authModel.d.ts | 6 +- src/services/model/baseModel.d.ts | 6 +- src/settings/encryptionSetting.ts | 9 +- src/state/app.ts | 10 +- src/state/index.ts | 2 +- src/state/modules/auth.ts | 110 +++++----- src/state/modules/router.ts | 52 ++--- src/state/modules/user.ts | 10 +- src/types/env.d.ts | 26 +-- src/types/router/route.d.ts | 42 ++-- src/utils/cache/index.ts | 31 +-- src/utils/cache/storageCache.ts | 190 ++++++++--------- src/utils/cipher.ts | 58 ++--- src/utils/env.ts | 20 +- src/utils/http/index.ts | 74 +++---- src/utils/index.ts | 12 +- src/utils/interceptors/index.ts | 9 +- src/utils/is.ts | 69 +++--- src/utils/log.ts | 4 +- src/utils/platform.ts | 262 +++++++++++------------ src/utils/router/constant.ts | 24 +-- src/utils/router/interceptor.ts | 86 ++++---- src/utils/router/navigates.ts | 202 +++++++++--------- src/utils/router/routes.ts | 46 ++-- src/utils/uniapi/index.ts | 48 ++--- src/utils/uniapi/prompt.ts | 82 ++++---- 55 files changed, 1535 insertions(+), 1669 deletions(-) diff --git a/src/App.vue b/src/App.vue index 945a14f..b5fe7dc 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,25 +1,25 @@ diff --git a/src/androidPrivacy.json b/src/androidPrivacy.json index 69db317..71cdce4 100644 --- a/src/androidPrivacy.json +++ b/src/androidPrivacy.json @@ -1,29 +1,29 @@ { - "version" : "1", - "prompt" : "template", - "title" : "服务协议和隐私政策", - "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", - "buttonAccept" : "同意并接受", - "buttonRefuse" : "暂不同意", - // HX 3.4.13之后版本新增，system 使用系统webview 打开隐私协议链接，默认使用uni-app内置web组件 - "hrefLoader" : "default", - "second" : { - "title" : "确认提示", - "message" : "　　进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。", - "buttonAccept" : "同意并继续", - "buttonRefuse" : "退出应用" - }, - "styles" : { - "backgroundColor" : "#00FF00", - "borderRadius" : "5px", - "title" : { - "color" : "#ff00ff" - }, - "buttonAccept" : { - "color" : "#ffff00" - }, - "buttonRefuse" : { - "color" : "#00ffff" - } - } + "version": "1", + "prompt": "template", + "title": "服务协议和隐私政策", + "message": "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
　　你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。", + "buttonAccept": "同意并接受", + "buttonRefuse": "暂不同意", + // HX 3.4.13之后版本新增，system 使用系统webview 打开隐私协议链接，默认使用uni-app内置web组件 + "hrefLoader": "default", + "second": { + "title": "确认提示", + "message": "　　进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。", + "buttonAccept": "同意并继续", + "buttonRefuse": "退出应用" + }, + "styles": { + "backgroundColor": "#00FF00", + "borderRadius": "5px", + "title": { + "color": "#ff00ff" + }, + "buttonAccept": { + "color": "#ffff00" + }, + "buttonRefuse": { + "color": "#00ffff" + } + } } diff --git a/src/assets/main.scss b/src/assets/main.scss index 5dd63f4..c85494c 100644 --- a/src/assets/main.scss +++ b/src/assets/main.scss @@ -34,36 +34,36 @@ canvas, web-view, :before, :after { - box-sizing: border-box; + box-sizing: border-box; } /* 隐藏scroll-view的滚动条 */ ::-webkit-scrollbar { - display: none; - width: 0 !important; - height: 0 !important; - -webkit-appearance: none; - background: transparent; + display: none; + width: 0 !important; + height: 0 !important; + -webkit-appearance: none; + background: transparent; } // 超出省略,最多5行 @for $i from 1 through 5 { - .text-ellipsis-#{$i} { - // vue下，单行和多行显示省略号需要单独处理 - @if $i == '1' { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } @else { - display: -webkit-box !important; - overflow: hidden; - text-overflow: ellipsis; - word-break: break-all; - -webkit-line-clamp: $i; - -webkit-box-orient: vertical !important; - } - } + .text-ellipsis-#{$i} { + // vue下，单行和多行显示省略号需要单独处理 + @if $i == '1' { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } @else { + display: -webkit-box !important; + overflow: hidden; + text-overflow: ellipsis; + word-break: break-all; + -webkit-line-clamp: $i; + -webkit-box-orient: vertical !important; + } + } } page { - background-color: #f2f2f2; + background-color: #f2f2f2; } diff --git a/src/components/AppProvider/inedx.vue b/src/components/AppProvider/inedx.vue index 3b277ec..4546f65 100644 --- a/src/components/AppProvider/inedx.vue +++ b/src/components/AppProvider/inedx.vue @@ -1,7 +1,7 @@ diff --git a/src/components/BasicButton/index.vue b/src/components/BasicButton/index.vue index 6ccb144..a660ccc 100644 --- a/src/components/BasicButton/index.vue +++ b/src/components/BasicButton/index.vue @@ -1,32 +1,32 @@ diff --git a/src/components/BasicButton/prpos.ts b/src/components/BasicButton/prpos.ts index d9b5d9e..1613b8a 100644 --- a/src/components/BasicButton/prpos.ts +++ b/src/components/BasicButton/prpos.ts @@ -1,4 +1,4 @@ export const buttonProps = { - disabled: { type: Boolean, default: false }, - click: { type: Function }, + disabled: { type: Boolean, default: false }, + click: { type: Function }, }; diff --git a/src/components/BasicInput/index.vue b/src/components/BasicInput/index.vue index 9be0257..df5e66c 100644 --- a/src/components/BasicInput/index.vue +++ b/src/components/BasicInput/index.vue @@ -1,31 +1,31 @@ diff --git a/src/components/Iconify/index.vue b/src/components/Iconify/index.vue index 26d8fb7..1848a2d 100644 --- a/src/components/Iconify/index.vue +++ b/src/components/Iconify/index.vue @@ -1,54 +1,42 @@ diff --git a/src/components/Navbar/index.vue b/src/components/Navbar/index.vue index cc5ed6d..45075dc 100644 --- a/src/components/Navbar/index.vue +++ b/src/components/Navbar/index.vue @@ -1,163 +1,119 @@ diff --git a/src/components/Test/index.vue b/src/components/Test/index.vue index bccc7f4..8fcf4f1 100644 --- a/src/components/Test/index.vue +++ b/src/components/Test/index.vue @@ -1,14 +1,14 @@ diff --git a/src/enums/appEnum.ts b/src/enums/appEnum.ts index 0d89b72..73e5334 100644 --- a/src/enums/appEnum.ts +++ b/src/enums/appEnum.ts @@ -2,6 +2,6 @@ * @description: 客户端 api 返回结果设置 */ export enum ClientApiResultEnum { - CLIENT_SUCCESS = 1, - CLIENT_ERROR = 0, + CLIENT_SUCCESS = 1, + CLIENT_ERROR = 0, } diff --git a/src/enums/httpEnum.ts b/src/enums/httpEnum.ts index b67197b..18cd6a5 100644 --- a/src/enums/httpEnum.ts +++ b/src/enums/httpEnum.ts @@ -2,8 +2,8 @@ * @description: 请求结果设置 */ export enum ResultEnum { - SUCCESS = 10000, - ERROR = 1, - TIMEOUT = 401, - TYPE = 'success', + SUCCESS = 10000, + ERROR = 1, + TIMEOUT = 401, + TYPE = 'success', } diff --git a/src/enums/platformEnum.ts b/src/enums/platformEnum.ts index 5e6e865..e9b1ddb 100644 --- a/src/enums/platformEnum.ts +++ b/src/enums/platformEnum.ts @@ -2,25 +2,25 @@ * 平台 */ export enum PLATFORMS { - DEFAULT = 'DEFAULT' /* 默认 */, - VUE3 = 'VUE3' /* HBuilderX 3.2.0+ */, - APP_PLUS = 'APP-PLUS' /* App */, - APP_PLUS_NVUE = 'APP-PLUS-NVUE' /* App nvue 页面 */, - APP_NVUE = 'APP-NVUE' /* App nvue 页面 */, - H5 = 'H5' /* H5 */, - MP_WEIXIN = 'MP-WEIXIN' /* 微信小程序 */, - MP_ALIPAY = 'MP-ALIPAY' /* 支付宝小程序 */, - MP_BAIDU = 'MP_BAIDU' /* 百度小程序 */, - MP_TOUTIAO = 'MP-TOUTIAO' /* 字节跳动小程序 */, - MP_LARK = 'MP-LARK' /* 飞书小程序 */, - MP_QQ = 'MP-QQ' /* QQ小程序 */, - MP_KUAISHOU = 'MP-KUAISHOU' /* 快手小程序 */, - MP_JD = 'MP-JD' /* 京东小程序 */, - MP_360 = 'MP-360' /* 360小程序 */, - MP = 'MP' /* 微信小程序/支付宝小程序/百度小程序/字节跳动小程序/飞书小程序/QQ小程序/360小程序 */, - QUICKAPP_WEBVIEW = 'QUICKAPP-WEBVIEW' /* 快应用通用(包含联盟、华为) */, - QUICKAPP_WEBVIEW_UNION = 'QUICKAPP-WEBVIEW-UNION' /* 快应用联盟 */, - QUICKAPP_WEBVIEW_HUAWEI = 'QUICKAPP-WEBVIEW-HUAWEI' /* 快应用华为 */, + DEFAULT = 'DEFAULT' /* 默认 */, + VUE3 = 'VUE3' /* HBuilderX 3.2.0+ */, + APP_PLUS = 'APP-PLUS' /* App */, + APP_PLUS_NVUE = 'APP-PLUS-NVUE' /* App nvue 页面 */, + APP_NVUE = 'APP-NVUE' /* App nvue 页面 */, + H5 = 'H5' /* H5 */, + MP_WEIXIN = 'MP-WEIXIN' /* 微信小程序 */, + MP_ALIPAY = 'MP-ALIPAY' /* 支付宝小程序 */, + MP_BAIDU = 'MP_BAIDU' /* 百度小程序 */, + MP_TOUTIAO = 'MP-TOUTIAO' /* 字节跳动小程序 */, + MP_LARK = 'MP-LARK' /* 飞书小程序 */, + MP_QQ = 'MP-QQ' /* QQ小程序 */, + MP_KUAISHOU = 'MP-KUAISHOU' /* 快手小程序 */, + MP_JD = 'MP-JD' /* 京东小程序 */, + MP_360 = 'MP-360' /* 360小程序 */, + MP = 'MP' /* 微信小程序/支付宝小程序/百度小程序/字节跳动小程序/飞书小程序/QQ小程序/360小程序 */, + QUICKAPP_WEBVIEW = 'QUICKAPP-WEBVIEW' /* 快应用通用(包含联盟、华为) */, + QUICKAPP_WEBVIEW_UNION = 'QUICKAPP-WEBVIEW-UNION' /* 快应用联盟 */, + QUICKAPP_WEBVIEW_HUAWEI = 'QUICKAPP-WEBVIEW-HUAWEI' /* 快应用华为 */, } /** @@ -28,81 +28,81 @@ export enum PLATFORMS { * @constructor */ function PLATFORM_ENV() { - let platform = PLATFORMS.DEFAULT; + let platform = PLATFORMS.DEFAULT; - /* #ifdef VUE3 */ - platform = PLATFORMS.VUE3; - /* #endif */ + /* #ifdef VUE3 */ + platform = PLATFORMS.VUE3; + /* #endif */ - /* #ifdef APP-PLUS */ - platform = PLATFORMS.APP_PLUS; - /* #endif */ + /* #ifdef APP-PLUS */ + platform = PLATFORMS.APP_PLUS; + /* #endif */ - /* #ifdef APP-PLUS-NVUE */ - platform = PLATFORMS.APP_PLUS_NVUE; - /* #endif */ + /* #ifdef APP-PLUS-NVUE */ + platform = PLATFORMS.APP_PLUS_NVUE; + /* #endif */ - /* #ifdef APP-NVUE */ - platform = PLATFORMS.APP_NVUE; - /* #endif */ + /* #ifdef APP-NVUE */ + platform = PLATFORMS.APP_NVUE; + /* #endif */ - /* #ifdef H5 */ - platform = PLATFORMS.H5; - /* #endif */ + /* #ifdef H5 */ + platform = PLATFORMS.H5; + /* #endif */ - /* #ifdef MP */ - platform = PLATFORMS.MP; - /* #endif */ + /* #ifdef MP */ + platform = PLATFORMS.MP; + /* #endif */ - /* #ifdef MP-WEIXIN */ - platform = PLATFORMS.MP_WEIXIN; - /* #endif */ + /* #ifdef MP-WEIXIN */ + platform = PLATFORMS.MP_WEIXIN; + /* #endif */ - /* #ifdef MP-ALIPAY */ - platform = PLATFORMS.MP_ALIPAY; - /* #endif */ + /* #ifdef MP-ALIPAY */ + platform = PLATFORMS.MP_ALIPAY; + /* #endif */ - /* #ifdef MP_BAIDU */ - platform = PLATFORMS.MP_BAIDU; - /* #endif */ + /* #ifdef MP_BAIDU */ + platform = PLATFORMS.MP_BAIDU; + /* #endif */ - /* #ifdef MP-TOUTIAO */ - platform = PLATFORMS.MP_TOUTIAO; - /* #endif */ + /* #ifdef MP-TOUTIAO */ + platform = PLATFORMS.MP_TOUTIAO; + /* #endif */ - /* #ifdef MP-LARK */ - platform = PLATFORMS.MP_LARK; - /* #endif */ + /* #ifdef MP-LARK */ + platform = PLATFORMS.MP_LARK; + /* #endif */ - /* #ifdef MP-QQ */ - platform = PLATFORMS.MP_QQ; - /* #endif */ + /* #ifdef MP-QQ */ + platform = PLATFORMS.MP_QQ; + /* #endif */ - /* #ifdef MP-KUAISHOU */ - platform = PLATFORMS.MP_KUAISHOU; - /* #endif */ + /* #ifdef MP-KUAISHOU */ + platform = PLATFORMS.MP_KUAISHOU; + /* #endif */ - /* #ifdef MP-JD */ - platform = PLATFORMS.MP_JD; - /* #endif */ + /* #ifdef MP-JD */ + platform = PLATFORMS.MP_JD; + /* #endif */ - /* #ifdef MP-360 */ - platform = PLATFORMS.MP_360; - /* #endif */ + /* #ifdef MP-360 */ + platform = PLATFORMS.MP_360; + /* #endif */ - /* #ifdef QUICKAPP-WEBVIEW */ - platform = PLATFORMS.QUICKAPP_WEBVIEW; - /* #endif */ + /* #ifdef QUICKAPP-WEBVIEW */ + platform = PLATFORMS.QUICKAPP_WEBVIEW; + /* #endif */ - /* #ifdef QUICKAPP-WEBVIEW-UNION */ - platform = PLATFORMS.QUICKAPP_WEBVIEW_UNION; - /* #endif */ + /* #ifdef QUICKAPP-WEBVIEW-UNION */ + platform = PLATFORMS.QUICKAPP_WEBVIEW_UNION; + /* #endif */ - /* #ifdef QUICKAPP-WEBVIEW-HUAWEI */ - platform = PLATFORMS.QUICKAPP_WEBVIEW_HUAWEI; - /* #endif */ + /* #ifdef QUICKAPP-WEBVIEW-HUAWEI */ + platform = PLATFORMS.QUICKAPP_WEBVIEW_HUAWEI; + /* #endif */ - return platform; + return platform; } /* 当前平台 */ diff --git a/src/enums/routerEnum.ts b/src/enums/routerEnum.ts index 81955a7..5d01d90 100644 --- a/src/enums/routerEnum.ts +++ b/src/enums/routerEnum.ts @@ -1,17 +1,12 @@ export enum NAVIGATE_TYPE { - NAVIGATE_TO = 'navigateTo', - REDIRECT_TO = 'redirectTo', - RE_LAUNCH = 'reLaunch', - SWITCH_TAB = 'switchTab', - NAVIGATE_BACK = 'navigateBack', + NAVIGATE_TO = 'navigateTo', + REDIRECT_TO = 'redirectTo', + RE_LAUNCH = 'reLaunch', + SWITCH_TAB = 'switchTab', + NAVIGATE_BACK = 'navigateBack', } -export const NAVIGATE_TYPE_LIST = [ - 'navigateTo', - 'redirectTo', - 'reLaunch', - 'switchTab', -]; +export const NAVIGATE_TYPE_LIST = ['navigateTo', 'redirectTo', 'reLaunch', 'switchTab']; export const HOME_PAGE = '/pages/index/index'; export const LOGIN_PAGE = '/pages/login/index'; diff --git a/src/hooks/router.ts b/src/hooks/router.ts index 9d4e9b6..c33c0d0 100644 --- a/src/hooks/router.ts +++ b/src/hooks/router.ts @@ -8,7 +8,7 @@ const router = new Navigates(); * 路由hook */ export function useRouter() { - return router; + return router; } /** @@ -19,26 +19,26 @@ export function useRouter() { * @return RouteLocationNormalized */ export function useRoute(): RouteLocationNormalized { - const currentPages = getCurrentPages(); - const currentPage = currentPages[currentPages.length - 1]; - const path = currentPage?.route || ''; - const routerStore = useRouterStore(); - const currentRoute = routerStore.getRoutes?.get(path as string); - let query = {}; - /* #ifndef MP-WEIXIN */ - // @ts-ignore - query = currentPage?.$page?.options || {}; - /* #endif */ + const currentPages = getCurrentPages(); + const currentPage = currentPages[currentPages.length - 1]; + const path = currentPage?.route || ''; + const routerStore = useRouterStore(); + const currentRoute = routerStore.getRoutes?.get(path as string); + let query = {}; + /* #ifndef MP-WEIXIN */ + // @ts-ignore + query = currentPage?.$page?.options || {}; + /* #endif */ - /* #ifdef MP-WEIXIN */ - // @ts-ignore - query = currentPage?.options || {}; - /* #endif */ - return { - currentPages, - currentPage, - path, - currentRoute, - query, - }; + /* #ifdef MP-WEIXIN */ + // @ts-ignore + query = currentPage?.options || {}; + /* #endif */ + return { + currentPages, + currentPage, + path, + currentRoute, + query, + }; } diff --git a/src/hooks/useGlobalStyle.ts b/src/hooks/useGlobalStyle.ts index 5ab6e93..259f533 100644 --- a/src/hooks/useGlobalStyle.ts +++ b/src/hooks/useGlobalStyle.ts @@ -5,16 +5,11 @@ const { globalStyle } = pagesJson; * 全局样式 */ export const useGlobalStyle = () => { - const { - navigationBarTextStyle, - navigationBarTitleText, - navigationBarBackgroundColor, - backgroundColor, - } = globalStyle; - return { - navigationBarTextStyle, - navigationBarTitleText, - navigationBarBackgroundColor, - backgroundColor, - }; + const { navigationBarTextStyle, navigationBarTitleText, navigationBarBackgroundColor, backgroundColor } = globalStyle; + return { + navigationBarTextStyle, + navigationBarTitleText, + navigationBarBackgroundColor, + backgroundColor, + }; }; diff --git a/src/hooks/useSystem.ts b/src/hooks/useSystem.ts index c738a6d..c6c08f8 100644 --- a/src/hooks/useSystem.ts +++ b/src/hooks/useSystem.ts @@ -4,161 +4,149 @@ * @link https://uniapp.dcloud.net.cn/api/system/info.html */ export const useSystem = () => { - const { - // device - deviceId, - deviceBrand, - deviceModel, - deviceType, - devicePixelRatio, - deviceOrientation, - // os - osName, - osVersion, - osLanguage, - osTheme, - // @ts-ignore - osAndroidAPILevel, - // rom - romName, - romVersion, - // browser - browserName, - browserVersion, - // host - hostFontSizeSetting, - hostSDKVersion, - hostName, - hostVersion, - hostLanguage, - hostTheme, - hostPackageName, - // uni-app框架 - uniPlatform, - uniCompileVersion, - uniRuntimeVersion, - // app - appId, - appName, - appVersion, - appVersionCode, - appLanguage, - // @ts-ignore - appWgtVersion, - // 其他 - ua, - screenWidth, - screenHeight, - windowWidth, - windowHeight, - windowTop, - windowBottom, - statusBarHeight, - safeArea, - safeAreaInsets, - // 某些小程序特殊的返回参数 - // @ts-ignore - benchmarkLevel, - // @ts-ignore - batteryLevel, - currentBattery, - navigationBarHeight, - titleBarHeight, - albumAuthorized, - cameraAuthorized, - locationAuthorized, - microphoneAuthorized, - notificationAuthorized, - notificationAlertAuthorized, - notificationBadgeAuthorized, - notificationSoundAuthorized, - bluetoothEnabled, - locationEnabled, - wifiEnabled, - cacheLocation, - storage, - } = uni.getSystemInfoSync(); - const { - top: safeAreaTop, - bottom: safeAreaBottom, - left: safeAreaLeft, - right: safeAreaRight, - height: safeAreaHeight, - width: safeAreaWidth, - } = safeArea!; - const { - top: safeAreaInsetsTop, - bottom: safeAreaInsetsBottom, - left: safeAreaInsetsLeft, - right: safeAreaInsetsRight, - } = safeAreaInsets!; - return { - deviceId, - deviceBrand, - deviceModel, - deviceType, - devicePixelRatio, - deviceOrientation, - osName, - osVersion, - osLanguage, - osTheme, - osAndroidAPILevel, - romName, - romVersion, - browserName, - browserVersion, - hostFontSizeSetting, - hostSDKVersion, - hostName, - hostVersion, - hostLanguage, - hostTheme, - hostPackageName, - uniPlatform, - uniCompileVersion, - uniRuntimeVersion, - appId, - appName, - appVersion, - appVersionCode, - appLanguage, - appWgtVersion, - ua, - screenWidth, - screenHeight, - windowWidth, - windowHeight, - windowTop, - windowBottom, - statusBarHeight, - safeAreaTop, - safeAreaBottom, - safeAreaLeft, - safeAreaRight, - safeAreaHeight, - safeAreaWidth, - safeAreaInsetsTop, - safeAreaInsetsBottom, - safeAreaInsetsLeft, - safeAreaInsetsRight, - benchmarkLevel, - batteryLevel, - currentBattery, - navigationBarHeight, - titleBarHeight, - albumAuthorized, - cameraAuthorized, - locationAuthorized, - microphoneAuthorized, - notificationAuthorized, - notificationAlertAuthorized, - notificationBadgeAuthorized, - notificationSoundAuthorized, - bluetoothEnabled, - locationEnabled, - wifiEnabled, - cacheLocation, - storage, - }; + const { + // device + deviceId, + deviceBrand, + deviceModel, + deviceType, + devicePixelRatio, + deviceOrientation, + // os + osName, + osVersion, + osLanguage, + osTheme, + // @ts-ignore + osAndroidAPILevel, + // rom + romName, + romVersion, + // browser + browserName, + browserVersion, + // host + hostFontSizeSetting, + hostSDKVersion, + hostName, + hostVersion, + hostLanguage, + hostTheme, + hostPackageName, + // uni-app框架 + uniPlatform, + uniCompileVersion, + uniRuntimeVersion, + // app + appId, + appName, + appVersion, + appVersionCode, + appLanguage, + // @ts-ignore + appWgtVersion, + // 其他 + ua, + screenWidth, + screenHeight, + windowWidth, + windowHeight, + windowTop, + windowBottom, + statusBarHeight, + safeArea, + safeAreaInsets, + // 某些小程序特殊的返回参数 + // @ts-ignore + benchmarkLevel, + // @ts-ignore + batteryLevel, + currentBattery, + navigationBarHeight, + titleBarHeight, + albumAuthorized, + cameraAuthorized, + locationAuthorized, + microphoneAuthorized, + notificationAuthorized, + notificationAlertAuthorized, + notificationBadgeAuthorized, + notificationSoundAuthorized, + bluetoothEnabled, + locationEnabled, + wifiEnabled, + cacheLocation, + storage, + } = uni.getSystemInfoSync(); + const { top: safeAreaTop, bottom: safeAreaBottom, left: safeAreaLeft, right: safeAreaRight, height: safeAreaHeight, width: safeAreaWidth } = safeArea!; + const { top: safeAreaInsetsTop, bottom: safeAreaInsetsBottom, left: safeAreaInsetsLeft, right: safeAreaInsetsRight } = safeAreaInsets!; + return { + deviceId, + deviceBrand, + deviceModel, + deviceType, + devicePixelRatio, + deviceOrientation, + osName, + osVersion, + osLanguage, + osTheme, + osAndroidAPILevel, + romName, + romVersion, + browserName, + browserVersion, + hostFontSizeSetting, + hostSDKVersion, + hostName, + hostVersion, + hostLanguage, + hostTheme, + hostPackageName, + uniPlatform, + uniCompileVersion, + uniRuntimeVersion, + appId, + appName, + appVersion, + appVersionCode, + appLanguage, + appWgtVersion, + ua, + screenWidth, + screenHeight, + windowWidth, + windowHeight, + windowTop, + windowBottom, + statusBarHeight, + safeAreaTop, + safeAreaBottom, + safeAreaLeft, + safeAreaRight, + safeAreaHeight, + safeAreaWidth, + safeAreaInsetsTop, + safeAreaInsetsBottom, + safeAreaInsetsLeft, + safeAreaInsetsRight, + benchmarkLevel, + batteryLevel, + currentBattery, + navigationBarHeight, + titleBarHeight, + albumAuthorized, + cameraAuthorized, + locationAuthorized, + microphoneAuthorized, + notificationAuthorized, + notificationAlertAuthorized, + notificationBadgeAuthorized, + notificationSoundAuthorized, + bluetoothEnabled, + locationEnabled, + wifiEnabled, + cacheLocation, + storage, + }; }; diff --git a/src/main.ts b/src/main.ts index c3f39ef..fbbb9a4 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,12 +4,12 @@ import { setupStore } from '@/state'; import 'uno.css'; export function createApp() { - const app = createSSRApp(App); + const app = createSSRApp(App); - // Configure store - setupStore(app); + // Configure store + setupStore(app); - return { - app, - }; + return { + app, + }; } diff --git a/src/pages/about/index.vue b/src/pages/about/index.vue index 7f8df3c..c5d233b 100644 --- a/src/pages/about/index.vue +++ b/src/pages/about/index.vue @@ -1,82 +1,74 @@ diff --git a/src/pages/demo/index.vue b/src/pages/demo/index.vue index 360b4e5..100fc63 100644 --- a/src/pages/demo/index.vue +++ b/src/pages/demo/index.vue @@ -1,26 +1,26 @@ diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index a126d7c..00982f9 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,69 +1,69 @@ diff --git a/src/pages/log/index.vue b/src/pages/log/index.vue index 400e0e1..907258a 100644 --- a/src/pages/log/index.vue +++ b/src/pages/log/index.vue @@ -1,13 +1,13 @@ diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 5081f61..f2522d9 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -1,99 +1,91 @@ diff --git a/src/pages/notFound/404.vue b/src/pages/notFound/404.vue index d2a663b..246f4b9 100644 --- a/src/pages/notFound/404.vue +++ b/src/pages/notFound/404.vue @@ -1,33 +1,33 @@ diff --git a/src/pages/template/index.vue b/src/pages/template/index.vue index 61e6091..6d8783a 100644 --- a/src/pages/template/index.vue +++ b/src/pages/template/index.vue @@ -1,7 +1,7 @@ diff --git a/src/pagesA/list/test1/index.vue b/src/pagesA/list/test1/index.vue index 78d9ce9..4eab012 100644 --- a/src/pagesA/list/test1/index.vue +++ b/src/pagesA/list/test1/index.vue @@ -1,16 +1,14 @@ diff --git a/src/pagesA/list/test2/index.vue b/src/pagesA/list/test2/index.vue index d81093f..a065f34 100644 --- a/src/pagesA/list/test2/index.vue +++ b/src/pagesA/list/test2/index.vue @@ -1,16 +1,16 @@ diff --git a/src/pagesB/detail/index.vue b/src/pagesB/detail/index.vue index 53e96c8..32a2e11 100644 --- a/src/pagesB/detail/index.vue +++ b/src/pagesB/detail/index.vue @@ -1,3 +1,3 @@ - + diff --git a/src/services/api/auth.ts b/src/services/api/auth.ts index 3ce3737..b517b4c 100644 --- a/src/services/api/auth.ts +++ b/src/services/api/auth.ts @@ -9,23 +9,23 @@ const REFRESH_TOKEN = '/refresh/token'; * @param params */ export function login(params: LoginParams) { - return request.post(LOGIN, params, { - custom: { - auth: false, - }, - }); + return request.post(LOGIN, params, { + custom: { + auth: false, + }, + }); } /** * 登出 */ export function logout() { - return request.post(LOGIN_OUT, {}); + return request.post(LOGIN_OUT, {}); } /** * 刷新token */ export function refreshToken() { - return request.post(REFRESH_TOKEN, {}); + return request.post(REFRESH_TOKEN, {}); } diff --git a/src/services/model/authModel.d.ts b/src/services/model/authModel.d.ts index 76f8681..29e46db 100644 --- a/src/services/model/authModel.d.ts +++ b/src/services/model/authModel.d.ts @@ -1,7 +1,7 @@ declare interface LoginParams { - email: string; - password: string; + email: string; + password: string; } declare interface LoginModel { - token: string; + token: string; } diff --git a/src/services/model/baseModel.d.ts b/src/services/model/baseModel.d.ts index 46fd6e3..5f7d96e 100644 --- a/src/services/model/baseModel.d.ts +++ b/src/services/model/baseModel.d.ts @@ -1,5 +1,5 @@ declare interface API { - code: number; - data?: T; - message: string; + code: number; + data?: T; + message: string; } diff --git a/src/settings/encryptionSetting.ts b/src/settings/encryptionSetting.ts index 876294d..a305dc3 100644 --- a/src/settings/encryptionSetting.ts +++ b/src/settings/encryptionSetting.ts @@ -2,16 +2,13 @@ import { getEnvValue, getPkgVersion, isDevMode } from '@/utils/env'; // System default cache time, in seconds export const DEFAULT_CACHE_TIME = 60 * 60 * 24 * 7; -const PREFIX = - getEnvValue('VITE_APP_CACHE_PREFIX') || - getEnvValue('VITE_APP_TITLE') || - 'UNI_APP_VUE3_TS'; +const PREFIX = getEnvValue('VITE_APP_CACHE_PREFIX') || getEnvValue('VITE_APP_TITLE') || 'UNI_APP_VUE3_TS'; export const DEFAULT_PREFIX_KEY = `${PREFIX}${getPkgVersion()}`; // aes encryption key export const cacheCipher = { - key: 'aQ0{gD1@c_0@oH5:', - iv: 'aF0#gC_$hE1$eA1!', + key: 'aQ0{gD1@c_0@oH5:', + iv: 'aF0#gC_$hE1$eA1!', }; // Whether the system cache is encrypted using aes diff --git a/src/state/app.ts b/src/state/app.ts index 567eda7..824a503 100644 --- a/src/state/app.ts +++ b/src/state/app.ts @@ -1,12 +1,12 @@ import { defineStore } from 'pinia'; interface AppState { - sys?: string | number; + sys?: string | number; } export const useAppStore = defineStore({ - id: 'app-store', - state: (): AppState => ({}), - getters: {}, - actions: {}, + id: 'app-store', + state: (): AppState => ({}), + getters: {}, + actions: {}, }); diff --git a/src/state/index.ts b/src/state/index.ts index efaf6c9..0e27f43 100644 --- a/src/state/index.ts +++ b/src/state/index.ts @@ -4,7 +4,7 @@ import { createPinia } from 'pinia'; const store = createPinia(); export function setupStore(app: App) { - app.use(store); + app.use(store); } export { store }; diff --git a/src/state/modules/auth.ts b/src/state/modules/auth.ts index f518a6d..1c6a2a9 100644 --- a/src/state/modules/auth.ts +++ b/src/state/modules/auth.ts @@ -4,62 +4,62 @@ import { TOKEN_KEY } from '@/enums/cacheEnum'; import { login, logout, refreshToken } from '@/services/api/auth'; interface AuthState { - token?: string; + token?: string; } export const useAuthStore = defineStore({ - id: 'auth', - state: (): AuthState => ({ - token: undefined, - }), - getters: { - getToken: state => state.token, - isLogin: (state): boolean => !!state.token, - }, - actions: { - initToken() { - this.token = getCache(TOKEN_KEY) || undefined; - }, - setToken(token: string | undefined) { - setCache(TOKEN_KEY, token); - this.token = token; - }, - /** - * @description 登录 - */ - async login(params: LoginParams): Promise { - try { - const { data } = await login(params); - this.setToken(data.token); - return Promise.resolve(data); - } catch (err: any) { - return Promise.reject(err); - } - }, - /** - * @description 登出 - */ - async loginOut(): Promise { - try { - const res = await logout(); - removeCache(TOKEN_KEY); - this.setToken(undefined); - return Promise.resolve(res); - } catch (err: any) { - return Promise.reject(err); - } - }, - /** - * @description 刷新token - */ - async refreshToken(): Promise { - try { - const { data } = await refreshToken(); - this.setToken(data.token); - return Promise.resolve(data); - } catch (err: any) { - return Promise.reject(err); - } - }, - }, + id: 'auth', + state: (): AuthState => ({ + token: undefined, + }), + getters: { + getToken: (state) => state.token, + isLogin: (state): boolean => !!state.token, + }, + actions: { + initToken() { + this.token = getCache(TOKEN_KEY) || undefined; + }, + setToken(token: string | undefined) { + setCache(TOKEN_KEY, token); + this.token = token; + }, + /** + * @description 登录 + */ + async login(params: LoginParams): Promise { + try { + const { data } = await login(params); + this.setToken(data.token); + return Promise.resolve(data); + } catch (err: any) { + return Promise.reject(err); + } + }, + /** + * @description 登出 + */ + async loginOut(): Promise { + try { + const res = await logout(); + removeCache(TOKEN_KEY); + this.setToken(undefined); + return Promise.resolve(res); + } catch (err: any) { + return Promise.reject(err); + } + }, + /** + * @description 刷新token + */ + async refreshToken(): Promise { + try { + const { data } = await refreshToken(); + this.setToken(data.token); + return Promise.resolve(data); + } catch (err: any) { + return Promise.reject(err); + } + }, + }, }); diff --git a/src/state/modules/router.ts b/src/state/modules/router.ts index f717193..00d92b9 100644 --- a/src/state/modules/router.ts +++ b/src/state/modules/router.ts @@ -3,33 +3,33 @@ import { Route } from '@/types/router/route'; import { pagesMap } from '@/utils/router/routes'; interface routeStore { - routes: Map | undefined; - currentRouter: Route | undefined; + routes: Map | undefined; + currentRouter: Route | undefined; } export const useRouterStore = defineStore({ - id: 'routerStore', - state: (): routeStore => ({ - routes: undefined, - currentRouter: undefined, - }), - getters: { - getRoutes(state) { - return state.routes; - }, - getCurrentRoute(state) { - return state.currentRouter; - }, - }, - actions: { - initialize() { - this.setRoutes(); - }, - setRoutes() { - this.routes = pagesMap; - }, - setCurrentRoute(path: string) { - this.currentRouter = this.routes?.get(path) || undefined; - }, - }, + id: 'routerStore', + state: (): routeStore => ({ + routes: undefined, + currentRouter: undefined, + }), + getters: { + getRoutes(state) { + return state.routes; + }, + getCurrentRoute(state) { + return state.currentRouter; + }, + }, + actions: { + initialize() { + this.setRoutes(); + }, + setRoutes() { + this.routes = pagesMap; + }, + setCurrentRoute(path: string) { + this.currentRouter = this.routes?.get(path) || undefined; + }, + }, }); diff --git a/src/state/modules/user.ts b/src/state/modules/user.ts index 90bf926..ad861ce 100644 --- a/src/state/modules/user.ts +++ b/src/state/modules/user.ts @@ -1,12 +1,12 @@ import { defineStore } from 'pinia'; interface UserState { - id?: string | number; + id?: string | number; } export const useUserStore = defineStore({ - id: 'user', - state: (): UserState => ({}), - getters: {}, - actions: {}, + id: 'user', + state: (): UserState => ({}), + getters: {}, + actions: {}, }); diff --git a/src/types/env.d.ts b/src/types/env.d.ts index 6ddfa2b..480a3d9 100644 --- a/src/types/env.d.ts +++ b/src/types/env.d.ts @@ -1,23 +1,23 @@ // / declare module '*.vue' { - import { DefineComponent } from 'vue'; - // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types - const component: DefineComponent<{}, {}, any>; - export default component; + import { DefineComponent } from 'vue'; + // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types + const component: DefineComponent<{}, {}, any>; + export default component; } interface ImportMetaEnv { - readonly VITE_ENV: string; - readonly VITE_APP_TITLE: string; - readonly VITE_BASE_URL: string; - readonly VITE_UPLOAD_URL: string; - readonly VITE_PROD: boolean; - readonly VITE_DEV: boolean; - readonly VITE_APP_CACHE_PREFIX: string; - readonly VITE_PORT: number; + readonly VITE_ENV: string; + readonly VITE_APP_TITLE: string; + readonly VITE_BASE_URL: string; + readonly VITE_UPLOAD_URL: string; + readonly VITE_PROD: boolean; + readonly VITE_DEV: boolean; + readonly VITE_APP_CACHE_PREFIX: string; + readonly VITE_PORT: number; } interface ImportMeta { - readonly env: ImportMetaEnv; + readonly env: ImportMetaEnv; } diff --git a/src/types/router/route.d.ts b/src/types/router/route.d.ts index b6ee4a2..ce61a9b 100644 --- a/src/types/router/route.d.ts +++ b/src/types/router/route.d.ts @@ -2,31 +2,31 @@ import { types } from 'sass'; import Boolean = types.Boolean; export interface Route extends Record { - path: string; - meta?: { - ignoreAuth?: boolean; - tabBar: boolean; - }; - style: { - navigationBarTitleText: string; - [key: string]: string | boolean; - }; + path: string; + meta?: { + ignoreAuth?: boolean; + tabBar: boolean; + }; + style: { + navigationBarTitleText: string; + [key: string]: string | boolean; + }; } export interface SubPackages { - root: string; - pages: Route[]; + root: string; + pages: Route[]; } export interface RouteLocationNormalized { - /* 当前页面栈的实例 */ - currentPages: Page.PageInstance[]; - /* 当前页面的实例 */ - currentPage: Page.PageInstance; - /* 当前页面在pages.json中的配置 */ - currentRoute?: Route; - /* 当前页面的path */ - path?: string; - /* 当前页面的url参数 */ - query: Record; + /* 当前页面栈的实例 */ + currentPages: Page.PageInstance[]; + /* 当前页面的实例 */ + currentPage: Page.PageInstance | undefined; + /* 当前页面在pages.json中的配置 */ + currentRoute?: Route; + /* 当前页面的path */ + path?: string; + /* 当前页面的url参数 */ + query: Record; } diff --git a/src/utils/cache/index.ts b/src/utils/cache/index.ts index 4846eee..67ea1ba 100644 --- a/src/utils/cache/index.ts +++ b/src/utils/cache/index.ts @@ -1,37 +1,28 @@ import { createStorage, CreateStorageParams } from './storageCache'; -import { - cacheCipher, - DEFAULT_CACHE_TIME, - DEFAULT_PREFIX_KEY, - enableStorageEncryption, -} from '@/settings/encryptionSetting'; +import { cacheCipher, DEFAULT_CACHE_TIME, DEFAULT_PREFIX_KEY, enableStorageEncryption } from '@/settings/encryptionSetting'; const options: Partial = { - prefixKey: DEFAULT_PREFIX_KEY, - key: cacheCipher.key, - iv: cacheCipher.iv, - hasEncrypt: enableStorageEncryption, - timeout: DEFAULT_CACHE_TIME, + prefixKey: DEFAULT_PREFIX_KEY, + key: cacheCipher.key, + iv: cacheCipher.iv, + hasEncrypt: enableStorageEncryption, + timeout: DEFAULT_CACHE_TIME, }; export const storage = createStorage(options); -export function setCache( - key: string, - value: any, - expire?: number | null, -): void { - storage.set(key, value, expire); +export function setCache(key: string, value: any, expire?: number | null): void { + storage.set(key, value, expire); } export function getCache(key: string): T { - return storage.get(key); + return storage.get(key); } export function removeCache(key: string): void { - return storage.remove(key); + return storage.remove(key); } export function clearCache(): void { - return storage.clear(); + return storage.clear(); } diff --git a/src/utils/cache/storageCache.ts b/src/utils/cache/storageCache.ts index 52c0616..cf20668 100644 --- a/src/utils/cache/storageCache.ts +++ b/src/utils/cache/storageCache.ts @@ -4,116 +4,110 @@ import { AesEncryption } from '@/utils/cipher'; import { isNullOrUnDef } from '@/utils/is'; export interface CreateStorageParams extends EncryptionParams { - prefixKey: string; - hasEncrypt: boolean; - timeout?: number | null; + prefixKey: string; + hasEncrypt: boolean; + timeout?: number | null; } export const createStorage = ({ - prefixKey = '', - key = cacheCipher.key, - iv = cacheCipher.iv, - timeout = null, - hasEncrypt = true, + prefixKey = '', + key = cacheCipher.key, + iv = cacheCipher.iv, + timeout = null, + hasEncrypt = true, }: Partial = {}) => { - if (hasEncrypt && [key.length, iv.length].some(item => item !== 16)) { - throw new Error('When hasEncrypt is true, the key or iv must be 16 bits!'); - } + if (hasEncrypt && [key.length, iv.length].some((item) => item !== 16)) { + throw new Error('When hasEncrypt is true, the key or iv must be 16 bits!'); + } - const encryption = new AesEncryption({ key, iv }); + const encryption = new AesEncryption({ key, iv }); - /** - * Cache class - * Construction parameters can be passed into sessionStorage, localStorage, - * @class Cache - * @example - */ - class Storage { - private prefixKey?: string; + /** + * Cache class + * Construction parameters can be passed into sessionStorage, localStorage, + * @class Cache + * @example + */ + class Storage { + private prefixKey?: string; - private encryption: AesEncryption; + private encryption: AesEncryption; - private hasEncrypt: boolean; + private hasEncrypt: boolean; - /** - * - * @param {*} storage - */ - constructor() { - this.prefixKey = prefixKey; - this.encryption = encryption; - this.hasEncrypt = hasEncrypt; - } + /** + * + * @param {*} storage + */ + constructor() { + this.prefixKey = prefixKey; + this.encryption = encryption; + this.hasEncrypt = hasEncrypt; + } - private getKey(key: string) { - return `${this.prefixKey}${key}`.toUpperCase(); - } + private getKey(key: string) { + return `${this.prefixKey}${key}`.toUpperCase(); + } - /** - * Set cache - * @param {string} key - * @param {*} value - * @param {*} expire Expiration time in seconds - * @memberof Cache - */ - set(key: string, value: any, expire: number | null = timeout) { - try { - const stringData = JSON.stringify({ - value, - time: Date.now(), - expire: !isNullOrUnDef(expire) - ? new Date().getTime() + expire * 1000 - : null, - }); - const stringifyValue = this.hasEncrypt - ? this.encryption.encryptByAES(stringData) - : stringData; - uni.setStorageSync(this.getKey(key), stringifyValue); - } catch (err) { - throw new Error(`setStorageSync error: ${err}`); - } - } + /** + * Set cache + * @param {string} key + * @param {*} value + * @param {*} expire Expiration time in seconds + * @memberof Cache + */ + set(key: string, value: any, expire: number | null = timeout) { + try { + const stringData = JSON.stringify({ + value, + time: Date.now(), + expire: !isNullOrUnDef(expire) ? new Date().getTime() + expire * 1000 : null, + }); + const stringifyValue = this.hasEncrypt ? this.encryption.encryptByAES(stringData) : stringData; + uni.setStorageSync(this.getKey(key), stringifyValue); + } catch (err) { + throw new Error(`setStorageSync error: ${err}`); + } + } - /** - * Read cache - * @param {string} key - * @param {*} def - * @memberof Cache - */ - get(key: string, def: any = null): T { - const val = uni.getStorageSync(this.getKey(key)); - if (!val) return def; + /** + * Read cache + * @param {string} key + * @param {*} def + * @memberof Cache + */ + get(key: string, def: any = null): T { + const val = uni.getStorageSync(this.getKey(key)); + if (!val) return def; - try { - const decVal = this.hasEncrypt - ? this.encryption.decryptByAES(val) - : val; - const data = JSON.parse(decVal); - const { value, expire } = data; - if (isNullOrUnDef(expire) || expire < new Date().getTime()) { - this.remove(key); - return def; - } - return value; - } catch (e) { - return def; - } - } + try { + const decVal = this.hasEncrypt ? this.encryption.decryptByAES(val) : val; + const data = JSON.parse(decVal); + const { value, expire } = data; + if (isNullOrUnDef(expire) || expire < new Date().getTime()) { + this.remove(key); + return def; + } + return value; + } catch (e) { + return def; + } + } - /** - * Delete cache based on key - * @param {string} key - * @memberof Cache - */ - remove(key: string) { - uni.removeStorageSync(this.getKey(key)); - } + /** + * Delete cache based on key + * @param {string} key + * @memberof Cache + */ + remove(key: string) { + uni.removeStorageSync(this.getKey(key)); + } - /** - * Delete all caches of this instance - */ - clear(): void { - uni.clearStorageSync(); - } - } - return new Storage(); + /** + * Delete all caches of this instance + */ + clear(): void { + uni.clearStorageSync(); + } + } + return new Storage(); }; diff --git a/src/utils/cipher.ts b/src/utils/cipher.ts index dacb4e3..9289e68 100644 --- a/src/utils/cipher.ts +++ b/src/utils/cipher.ts @@ -7,43 +7,43 @@ import md5 from 'crypto-js/md5'; import Base64 from 'crypto-js/enc-base64'; export interface EncryptionParams { - key: string; - iv: string; + key: string; + iv: string; } /** * AES 加密解密 */ export class AesEncryption { - private key; + private key; - private iv; + private iv; - constructor(opt: Partial = {}) { - const { key, iv } = opt; - if (key) { - this.key = parse(key); - } - if (iv) { - this.iv = parse(iv); - } - } + constructor(opt: Partial = {}) { + const { key, iv } = opt; + if (key) { + this.key = parse(key); + } + if (iv) { + this.iv = parse(iv); + } + } - get getOptions() { - return { - mode: ECB, - padding: pkcs7, - iv: this.iv, - }; - } + get getOptions() { + return { + mode: ECB, + padding: pkcs7, + iv: this.iv, + }; + } - encryptByAES(cipherText: string) { - return encrypt(cipherText, this.key!, this.getOptions).toString(); - } + encryptByAES(cipherText: string) { + return encrypt(cipherText, this.key!, this.getOptions).toString(); + } - decryptByAES(cipherText: string) { - return decrypt(cipherText, this.key!, this.getOptions).toString(UTF8); - } + decryptByAES(cipherText: string) { + return decrypt(cipherText, this.key!, this.getOptions).toString(UTF8); + } } /** @@ -51,7 +51,7 @@ export class AesEncryption { * @param cipherText */ export function encryptByBase64(cipherText: string) { - return UTF8.parse(cipherText).toString(Base64); + return UTF8.parse(cipherText).toString(Base64); } /** @@ -59,7 +59,7 @@ export function encryptByBase64(cipherText: string) { * @param cipherText */ export function decodeByBase64(cipherText: string) { - return Base64.parse(cipherText).toString(UTF8); + return Base64.parse(cipherText).toString(UTF8); } /** @@ -67,5 +67,5 @@ export function decodeByBase64(cipherText: string) { * @param password */ export function encryptByMd5(password: string) { - return md5(password).toString(); + return md5(password).toString(); } diff --git a/src/utils/env.ts b/src/utils/env.ts index 2962fac..a0721cf 100644 --- a/src/utils/env.ts +++ b/src/utils/env.ts @@ -6,7 +6,7 @@ import { PLATFORMS } from '@/enums/platformEnum'; * @description: Generate cache key according to version */ export function getPkgVersion() { - return `${`__${pkg.version}`}__`.toUpperCase(); + return `${`__${pkg.version}`}__`.toUpperCase(); } /** @@ -25,7 +25,7 @@ export const prodMode = 'production'; * @example: */ export function getEnvMode(): string { - return isDevMode() ? devMode : prodMode; + return isDevMode() ? devMode : prodMode; } /** @@ -34,8 +34,8 @@ export function getEnvMode(): string { * @example: */ export function getEnvValue(key: string): T { - // @ts-ignore - return import.meta.env[key]; + // @ts-ignore + return import.meta.env[key]; } /** @@ -44,7 +44,7 @@ export function getEnvValue(key: string): T { * @example: */ export function isDevMode(): boolean { - return getEnvValue('VITE_DEV'); + return getEnvValue('VITE_DEV'); } /** @@ -53,7 +53,7 @@ export function isDevMode(): boolean { * @example: */ export function isProdMode(): boolean { - return getEnvValue('VITE_PROD'); + return getEnvValue('VITE_PROD'); } /** @@ -62,8 +62,8 @@ export function isProdMode(): boolean { * @example: */ export function getBaseUrl(): string { - if (judgePlatform(PLATFORMS.H5) && isDevMode()) return '/api'; - return getEnvValue('VITE_BASE_URL'); + if (judgePlatform(PLATFORMS.H5) && isDevMode()) return '/api'; + return getEnvValue('VITE_BASE_URL'); } /** @@ -72,6 +72,6 @@ export function getBaseUrl(): string { * @example: */ export function getUploadUrl(): string { - if (judgePlatform(PLATFORMS.H5) && isDevMode()) return '/upload'; - return getEnvValue('VITE_UPLOAD_URL'); + if (judgePlatform(PLATFORMS.H5) && isDevMode()) return '/upload'; + return getEnvValue('VITE_UPLOAD_URL'); } diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts index 675af2d..0ed0a67 100644 --- a/src/utils/http/index.ts +++ b/src/utils/http/index.ts @@ -7,18 +7,18 @@ import { ResultEnum } from '@/enums/httpEnum'; const BASE_URL = getBaseUrl(); const HEADER = { - 'Content-Type': 'application/json;charset=UTF-8;', - Accept: 'application/json, text/plain, */*', + 'Content-Type': 'application/json;charset=UTF-8;', + Accept: 'application/json, text/plain, */*', }; function createRequest() { - return new Request({ - baseURL: BASE_URL, - header: HEADER, - custom: { - auth: true, - }, - }); + return new Request({ + baseURL: BASE_URL, + header: HEADER, + custom: { + auth: true, + }, + }); } const request = createRequest(); @@ -26,40 +26,40 @@ const request = createRequest(); * 请求拦截器 */ request.interceptors.request.use( - options => { - if (options.custom?.auth) { - const authStore = useAuthStore(); - if (!authStore.isLogin) { - Toast('请先登录'); - // token不存在跳转到登录页 - return Promise.reject(options); - } - options.header = assign(options.header, { - authorization: `Bearer ${authStore.getToken}`, - }); - } - return options; - }, - options => Promise.reject(options), + (options) => { + if (options.custom?.auth) { + const authStore = useAuthStore(); + if (!authStore.isLogin) { + Toast('请先登录'); + // token不存在跳转到登录页 + return Promise.reject(options); + } + options.header = assign(options.header, { + authorization: `Bearer ${authStore.getToken}`, + }); + } + return options; + }, + (options) => Promise.reject(options) ); /** * 响应拦截器 */ request.interceptors.response.use( - async response => { - const { data: resData } = response; - const { code, message } = resData; - if (code === ResultEnum.SUCCESS) { - return resData as any; - } - Toast(message); - return Promise.reject(resData); - }, - response => - // 请求错误做点什么。可以使用async await 做异步操作 - // error('Request Error!'); - Promise.reject(response), + async (response) => { + const { data: resData } = response; + const { code, message } = resData; + if (code === ResultEnum.SUCCESS) { + return resData as any; + } + Toast(message); + return Promise.reject(resData); + }, + (response) => + // 请求错误做点什么。可以使用async await 做异步操作 + // error('Request Error!'); + Promise.reject(response) ); export { request }; diff --git a/src/utils/index.ts b/src/utils/index.ts index ae79ea7..e2bd4e0 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -6,11 +6,9 @@ import { isObject } from '@/utils/is'; * @param target */ export function deepMerge(src: any = {}, target: any = {}): T { - let key: string; - for (key in target) { - src[key] = isObject(src[key]) - ? deepMerge(src[key], target[key]) - : (src[key] = target[key]); - } - return src; + let key: string; + for (key in target) { + src[key] = isObject(src[key]) ? deepMerge(src[key], target[key]) : (src[key] = target[key]); + } + return src; } diff --git a/src/utils/interceptors/index.ts b/src/utils/interceptors/index.ts index d6fa8d4..bce0a04 100644 --- a/src/utils/interceptors/index.ts +++ b/src/utils/interceptors/index.ts @@ -1,12 +1,9 @@ -import { - routerInterceptor, - routerRemoveInterceptor, -} from '@/utils/router/interceptor'; +import { routerInterceptor, routerRemoveInterceptor } from '@/utils/router/interceptor'; export function setupInterceptors() { - routerInterceptor(); + routerInterceptor(); } export function removeInterceptor() { - routerRemoveInterceptor(); + routerRemoveInterceptor(); } diff --git a/src/utils/is.ts b/src/utils/is.ts index 5feaea8..b43e7c9 100644 --- a/src/utils/is.ts +++ b/src/utils/is.ts @@ -1,96 +1,91 @@ const { toString } = Object.prototype; export function is(val: unknown, type: string) { - return toString.call(val) === `[object ${type}]`; + return toString.call(val) === `[object ${type}]`; } export function isDef(val?: T): val is T { - return typeof val !== 'undefined'; + return typeof val !== 'undefined'; } export function isUnDef(val?: T): val is T { - return !isDef(val); + return !isDef(val); } export function isObject(val: any): val is Record { - return val !== null && is(val, 'Object'); + return val !== null && is(val, 'Object'); } export function isEmpty(val: T): val is T { - if (isArray(val) || isString(val)) { - return val.length === 0; - } + if (isArray(val) || isString(val)) { + return val.length === 0; + } - if (val instanceof Map || val instanceof Set) { - return val.size === 0; - } + if (val instanceof Map || val instanceof Set) { + return val.size === 0; + } - if (isObject(val)) { - return Object.keys(val).length === 0; - } + if (isObject(val)) { + return Object.keys(val).length === 0; + } - return false; + return false; } export function isDate(val: unknown): val is Date { - return is(val, 'Date'); + return is(val, 'Date'); } export function isNull(val: unknown): val is null { - return val === null; + return val === null; } export function isNullAndUnDef(val: unknown): val is null | undefined { - return isUnDef(val) && isNull(val); + return isUnDef(val) && isNull(val); } export function isNullOrUnDef(val: unknown): val is null | undefined { - return isUnDef(val) || isNull(val); + return isUnDef(val) || isNull(val); } export function isNumber(val: unknown): val is number { - return is(val, 'Number'); + return is(val, 'Number'); } export function isPromise(val: unknown): val is Promise { - return ( - is(val, 'Promise') && - isObject(val) && - isFunction(val.then) && - isFunction(val.catch) - ); + return is(val, 'Promise') && isObject(val) && isFunction(val.then) && isFunction(val.catch); } export function isString(val: unknown): val is string { - return is(val, 'String'); + return is(val, 'String'); } export function isFunction(val: unknown): val is Function { - return typeof val === 'function'; + return typeof val === 'function'; } export function isBoolean(val: unknown): val is boolean { - return is(val, 'Boolean'); + return is(val, 'Boolean'); } export function isRegExp(val: unknown): val is RegExp { - return is(val, 'RegExp'); + return is(val, 'RegExp'); } export function isArray(val: any): val is Array { - return val && Array.isArray(val); + return val && Array.isArray(val); } export function isWindow(val: any): val is Window { - return typeof window !== 'undefined' && is(val, 'Window'); + return typeof window !== 'undefined' && is(val, 'Window'); } export function isElement(val: unknown): val is Element { - return isObject(val) && !!val.tagName; + return isObject(val) && !!val.tagName; } export function isMap(val: unknown): val is Map { - return is(val, 'Map'); + return is(val, 'Map'); } export const isServer = typeof window === 'undefined'; @@ -98,8 +93,8 @@ export const isServer = typeof window === 'undefined'; export const isClient = !isServer; export function isUrl(path: string): boolean { - // @ts-ignore - const reg = - /^((https|http|ftp|rtsp|mms):\/\/)(([0-9a-zA-Z_!~*'().&=+$%-]+: )?[0-9a-zA-Z_!~*'().&=+$%-]+@)?(([0-9]{1,3}.){3}[0-9]{1,3}|([0-9a-zA-Z_!~*'()-]+.)*([0-9a-zA-Z][0-9a-zA-Z-]{0,61})?[0-9a-zA-Z].[a-zA-Z]{2,6})(:[0-9]{1,4})?((\/?)|(\/[0-9a-zA-Z_!~*'().;?:@&=+$,%#-]+)+\/?)$/; - return reg.test(path); + // @ts-ignore + const reg = + /^((https|http|ftp|rtsp|mms):\/\/)(([0-9a-zA-Z_!~*'().&=+$%-]+: )?[0-9a-zA-Z_!~*'().&=+$%-]+@)?(([0-9]{1,3}.){3}[0-9]{1,3}|([0-9a-zA-Z_!~*'()-]+.)*([0-9a-zA-Z][0-9a-zA-Z-]{0,61})?[0-9a-zA-Z].[a-zA-Z]{2,6})(:[0-9]{1,4})?((\/?)|(\/[0-9a-zA-Z_!~*'().;?:@&=+$,%#-]+)+\/?)$/; + return reg.test(path); } diff --git a/src/utils/log.ts b/src/utils/log.ts index 944d9b0..56725e8 100644 --- a/src/utils/log.ts +++ b/src/utils/log.ts @@ -3,9 +3,9 @@ import { getEnvValue } from '@/utils/env'; const projectName = getEnvValue('VITE_APP_TITLE'); export function warn(message: string) { - console.warn(`[${projectName} warn]:${message}`); + console.warn(`[${projectName} warn]:${message}`); } export function error(message: string) { - throw new Error(`[${projectName} error]:${message}`); + throw new Error(`[${projectName} error]:${message}`); } diff --git a/src/utils/platform.ts b/src/utils/platform.ts index 89f9d0f..b95fb13 100644 --- a/src/utils/platform.ts +++ b/src/utils/platform.ts @@ -7,136 +7,136 @@ import { PLATFORMS } from '@/enums/platformEnum'; * @return boolean */ export function judgePlatform(target: PLATFORMS): boolean { - let isVue3 = false; - let isAppPlus = false; - let isAppPlusNvue = false; - let isAppNvue = false; - let isH5 = false; - let isMp = false; - let isMpWeinxin = false; - let isMpAlipay = false; - let isMpBaidu = false; - let isMpToutiao = false; - let isMpLark = false; - let isMpQq = false; - let isMpKuaishou = false; - let isMpJd = false; - let isMp360 = false; - let isQuickAppWebView = false; - let isQuickAppWebViewUnion = false; - let isQuickAppWebViewHuawei = false; + let isVue3 = false; + let isAppPlus = false; + let isAppPlusNvue = false; + let isAppNvue = false; + let isH5 = false; + let isMp = false; + let isMpWeinxin = false; + let isMpAlipay = false; + let isMpBaidu = false; + let isMpToutiao = false; + let isMpLark = false; + let isMpQq = false; + let isMpKuaishou = false; + let isMpJd = false; + let isMp360 = false; + let isQuickAppWebView = false; + let isQuickAppWebViewUnion = false; + let isQuickAppWebViewHuawei = false; - switch (target) { - case PLATFORMS.VUE3: - /* #ifdef VUE3 */ - isVue3 = true; - /* #endif */ - return isVue3; - break; - case PLATFORMS.APP_PLUS: - /* #ifdef APP-PLUS */ - isAppPlus = true; - /* #endif */ - return isAppPlus; - break; - case PLATFORMS.APP_PLUS_NVUE: - /* #ifdef APP-PLUS-NVUE */ - isAppPlusNvue = true; - /* #endif */ - return isAppPlusNvue; - break; - case PLATFORMS.APP_NVUE: - /* #ifdef APP-NVUE */ - isAppNvue = true; - /* #endif */ - return isAppNvue; - break; - case PLATFORMS.H5: - /* #ifdef H5 */ - isH5 = true; - /* #endif */ - return isH5; - break; - case PLATFORMS.MP: - /* #ifdef MP */ - isMp = true; - /* #endif */ - return isMp; - break; - case PLATFORMS.MP_WEIXIN: - /* #ifdef MP-WEIXIN */ - isMpWeinxin = true; - /* #endif */ - return isMpWeinxin; - break; - case PLATFORMS.MP_ALIPAY: - /* #ifdef MP-ALIPAY */ - isMpAlipay = true; - /* #endif */ - return isMpAlipay; - break; - case PLATFORMS.MP_BAIDU: - /* #ifdef MP_BAIDU */ - isMpBaidu = true; - /* #endif */ - return isMpBaidu; - break; - case PLATFORMS.MP_TOUTIAO: - /* #ifdef MP-TOUTIAO */ - isMpToutiao = true; - /* #endif */ - return isMpToutiao; - break; - case PLATFORMS.MP_LARK: - /* #ifdef MP-LARK */ - isMpLark = true; - /* #endif */ - return isMpLark; - break; - case PLATFORMS.MP_QQ: - /* #ifdef MP-QQ */ - isMpQq = true; - /* #endif */ - return isMpQq; - break; - case PLATFORMS.MP_KUAISHOU: - /* #ifdef MP-KUAISHOU */ - isMpKuaishou = true; - /* #endif */ - return isMpKuaishou; - break; - case PLATFORMS.MP_JD: - /* #ifdef MP-JD */ - isMpJd = true; - /* #endif */ - return (isMpJd = true); - break; - case PLATFORMS.MP_360: - /* #ifdef MP-360 */ - isMp360 = true; - /* #endif */ - return isMp360; - break; - case PLATFORMS.QUICKAPP_WEBVIEW: - /* #ifdef QUICKAPP-WEBVIEW */ - isQuickAppWebView = true; - /* #endif */ - return isQuickAppWebView; - break; - case PLATFORMS.QUICKAPP_WEBVIEW_UNION: - /* #ifdef QUICKAPP-WEBVIEW-UNION */ - isQuickAppWebViewUnion = true; - /* #endif */ - return isQuickAppWebViewUnion; - break; - case PLATFORMS.QUICKAPP_WEBVIEW_HUAWEI: - /* #ifdef QUICKAPP-WEBVIEW-HUAWEI */ - isQuickAppWebViewHuawei = true; - /* #endif */ - return isQuickAppWebViewHuawei; - break; - default: - return false; - } - return false; + switch (target) { + case PLATFORMS.VUE3: + /* #ifdef VUE3 */ + isVue3 = true; + /* #endif */ + return isVue3; + break; + case PLATFORMS.APP_PLUS: + /* #ifdef APP-PLUS */ + isAppPlus = true; + /* #endif */ + return isAppPlus; + break; + case PLATFORMS.APP_PLUS_NVUE: + /* #ifdef APP-PLUS-NVUE */ + isAppPlusNvue = true; + /* #endif */ + return isAppPlusNvue; + break; + case PLATFORMS.APP_NVUE: + /* #ifdef APP-NVUE */ + isAppNvue = true; + /* #endif */ + return isAppNvue; + break; + case PLATFORMS.H5: + /* #ifdef H5 */ + isH5 = true; + /* #endif */ + return isH5; + break; + case PLATFORMS.MP: + /* #ifdef MP */ + isMp = true; + /* #endif */ + return isMp; + break; + case PLATFORMS.MP_WEIXIN: + /* #ifdef MP-WEIXIN */ + isMpWeinxin = true; + /* #endif */ + return isMpWeinxin; + break; + case PLATFORMS.MP_ALIPAY: + /* #ifdef MP-ALIPAY */ + isMpAlipay = true; + /* #endif */ + return isMpAlipay; + break; + case PLATFORMS.MP_BAIDU: + /* #ifdef MP_BAIDU */ + isMpBaidu = true; + /* #endif */ + return isMpBaidu; + break; + case PLATFORMS.MP_TOUTIAO: + /* #ifdef MP-TOUTIAO */ + isMpToutiao = true; + /* #endif */ + return isMpToutiao; + break; + case PLATFORMS.MP_LARK: + /* #ifdef MP-LARK */ + isMpLark = true; + /* #endif */ + return isMpLark; + break; + case PLATFORMS.MP_QQ: + /* #ifdef MP-QQ */ + isMpQq = true; + /* #endif */ + return isMpQq; + break; + case PLATFORMS.MP_KUAISHOU: + /* #ifdef MP-KUAISHOU */ + isMpKuaishou = true; + /* #endif */ + return isMpKuaishou; + break; + case PLATFORMS.MP_JD: + /* #ifdef MP-JD */ + isMpJd = true; + /* #endif */ + return (isMpJd = true); + break; + case PLATFORMS.MP_360: + /* #ifdef MP-360 */ + isMp360 = true; + /* #endif */ + return isMp360; + break; + case PLATFORMS.QUICKAPP_WEBVIEW: + /* #ifdef QUICKAPP-WEBVIEW */ + isQuickAppWebView = true; + /* #endif */ + return isQuickAppWebView; + break; + case PLATFORMS.QUICKAPP_WEBVIEW_UNION: + /* #ifdef QUICKAPP-WEBVIEW-UNION */ + isQuickAppWebViewUnion = true; + /* #endif */ + return isQuickAppWebViewUnion; + break; + case PLATFORMS.QUICKAPP_WEBVIEW_HUAWEI: + /* #ifdef QUICKAPP-WEBVIEW-HUAWEI */ + isQuickAppWebViewHuawei = true; + /* #endif */ + return isQuickAppWebViewHuawei; + break; + default: + return false; + } + return false; } diff --git a/src/utils/router/constant.ts b/src/utils/router/constant.ts index 6c33a49..4821aa7 100644 --- a/src/utils/router/constant.ts +++ b/src/utils/router/constant.ts @@ -8,12 +8,12 @@ import { useRouter } from '@/hooks/router'; * @return boolean */ export function isIgnoreAuth(path: string): boolean { - const _path = filterPath(path); - const routerStore = useRouterStore(); - const routes = routerStore.getRoutes; - if (!routes) return false; - const route = routes.get(_path); - return route === undefined ? true : !!route?.meta?.ignoreAuth; + const _path = filterPath(path); + const routerStore = useRouterStore(); + const routes = routerStore.getRoutes; + if (!routes) return false; + const route = routes.get(_path); + return route === undefined ? true : !!route?.meta?.ignoreAuth; } /** @@ -21,10 +21,10 @@ export function isIgnoreAuth(path: string): boolean { * @param path */ export function jumpLogin(path: string) { - const _path = path.startsWith('/') ? path : `/${path}`; - const pathQuery = encodeURIComponent(_path); - const router = useRouter(); - router.push(`${LOGIN_PAGE}?redirect=${pathQuery}`); + const _path = path.startsWith('/') ? path : `/${path}`; + const pathQuery = encodeURIComponent(_path); + const router = useRouter(); + router.push(`${LOGIN_PAGE}?redirect=${pathQuery}`); } /** @@ -33,6 +33,6 @@ export function jumpLogin(path: string) { * @param prefix */ export function filterPath(url: string, prefix = '') { - const path = url.split('?')[0]; - return prefix + (path.startsWith('/') ? path.substring(1) : path); + const path = url.split('?')[0]; + return prefix + (path.startsWith('/') ? path.substring(1) : path); } diff --git a/src/utils/router/interceptor.ts b/src/utils/router/interceptor.ts index 9615fbf..49bfee8 100644 --- a/src/utils/router/interceptor.ts +++ b/src/utils/router/interceptor.ts @@ -1,8 +1,4 @@ -import { - HOME_PAGE, - NAVIGATE_TYPE_LIST, - NOT_FOUND_PAGE, -} from '@/enums/routerEnum'; +import { HOME_PAGE, NAVIGATE_TYPE_LIST, NOT_FOUND_PAGE } from '@/enums/routerEnum'; import { useAuthStore } from '@/state/modules/auth'; import { isIgnoreAuth, jumpLogin } from '@/utils/router/constant'; @@ -13,12 +9,12 @@ import { isIgnoreAuth, jumpLogin } from '@/utils/router/constant'; */ export function routerBeforeEach(path: string): boolean { - const isIgnore = isIgnoreAuth(path); - if (isIgnore) return true; - const authStore = useAuthStore(); - if (authStore.isLogin) return true; - jumpLogin(path); - return false; + const isIgnore = isIgnoreAuth(path); + if (isIgnore) return true; + const authStore = useAuthStore(); + if (authStore.isLogin) return true; + jumpLogin(path); + return false; } /** @@ -30,50 +26,50 @@ export function routerBeforeEach(path: string): boolean { * @export void */ function addInterceptor(routerName: string) { - uni.addInterceptor(routerName, { - // 跳转前拦截 - invoke: args => { - const flag = routerBeforeEach(args.url); - return flag ? args : false; - }, - // 成功回调拦截 - success: () => {}, - // 失败回调拦截 - fail: (err: any) => { - let reg: RegExp; - /* #ifdef MP-WEIXIN */ - reg = /(.*)?(fail page ")(.*)(" is not found$)/; - /* #endif */ - /* #ifndef MP-WEIXIN */ - reg = /(.*)?(fail page `)(.*)(` is not found$)/; - /* #endif */ - if (reg.test(err.errMsg)) { - const go = err.errMsg.replace(reg, '$3') || ''; - uni.navigateTo({ - url: `${NOT_FOUND_PAGE}?redirect=${HOME_PAGE}&go=${go}`, - }); - } - return false; - }, - // 完成回调拦截 - complete: () => {}, - }); + uni.addInterceptor(routerName, { + // 跳转前拦截 + invoke: (args) => { + const flag = routerBeforeEach(args.url); + return flag ? args : false; + }, + // 成功回调拦截 + success: () => {}, + // 失败回调拦截 + fail: (err: any) => { + let reg: RegExp; + /* #ifdef MP-WEIXIN */ + reg = /(.*)?(fail page ")(.*)(" is not found$)/; + /* #endif */ + /* #ifndef MP-WEIXIN */ + reg = /(.*)?(fail page `)(.*)(` is not found$)/; + /* #endif */ + if (reg.test(err.errMsg)) { + const go = err.errMsg.replace(reg, '$3') || ''; + uni.navigateTo({ + url: `${NOT_FOUND_PAGE}?redirect=${HOME_PAGE}&go=${go}`, + }); + } + return false; + }, + // 完成回调拦截 + complete: () => {}, + }); } /** * 添加路由拦截器 */ export function routerInterceptor() { - NAVIGATE_TYPE_LIST.forEach(item => { - addInterceptor(item); - }); + NAVIGATE_TYPE_LIST.forEach((item) => { + addInterceptor(item); + }); } /** * 移除路由拦截器 */ export function routerRemoveInterceptor() { - NAVIGATE_TYPE_LIST.forEach(item => { - uni.removeInterceptor(item); - }); + NAVIGATE_TYPE_LIST.forEach((item) => { + uni.removeInterceptor(item); + }); } diff --git a/src/utils/router/navigates.ts b/src/utils/router/navigates.ts index 0a8dd0d..360fcf1 100644 --- a/src/utils/router/navigates.ts +++ b/src/utils/router/navigates.ts @@ -7,117 +7,117 @@ import { useRouterStore } from '@/state/modules/router'; import { filterPath } from '@/utils/router/constant'; export type NavigateOptions = Partial> & { - delta?: number; + delta?: number; }; export class Navigates { - private type: string; + private type: string; - private readonly options: NavigateOptions; + private readonly options: NavigateOptions; - constructor(type?: string, options?: NavigateOptions) { - this.type = type || NAVIGATE_TYPE.NAVIGATE_TO; - this.options = options || {}; - } + constructor(type?: string, options?: NavigateOptions) { + this.type = type || NAVIGATE_TYPE.NAVIGATE_TO; + this.options = options || {}; + } - navigate(url: string, options?: NavigateOptions) { - const navigateOptions = deepMerge(cloneDeep(this.options), options); - const _options = deepMerge({ url }, navigateOptions); - switch (this.type) { - case NAVIGATE_TYPE.NAVIGATE_TO: - uni.navigateTo(_options); - break; - case NAVIGATE_TYPE.REDIRECT_TO: - uni.redirectTo(_options); - break; - case NAVIGATE_TYPE.RE_LAUNCH: - uni.reLaunch(_options); - break; - case NAVIGATE_TYPE.SWITCH_TAB: - uni.switchTab(_options); - break; - case NAVIGATE_TYPE.NAVIGATE_BACK: - uni.navigateBack(navigateOptions); - break; - default: - warn('navigate Error'); - break; - } - } + navigate(url: string, options?: NavigateOptions) { + const navigateOptions = deepMerge(cloneDeep(this.options), options); + const _options = deepMerge({ url }, navigateOptions); + switch (this.type) { + case NAVIGATE_TYPE.NAVIGATE_TO: + uni.navigateTo(_options); + break; + case NAVIGATE_TYPE.REDIRECT_TO: + uni.redirectTo(_options); + break; + case NAVIGATE_TYPE.RE_LAUNCH: + uni.reLaunch(_options); + break; + case NAVIGATE_TYPE.SWITCH_TAB: + uni.switchTab(_options); + break; + case NAVIGATE_TYPE.NAVIGATE_BACK: + uni.navigateBack(navigateOptions); + break; + default: + warn('navigate Error'); + break; + } + } - /** - * uni.navigateTo - * @param url - * @param options - */ - push(url: string, options?: NavigateOptions) { - this.type = NAVIGATE_TYPE.NAVIGATE_TO; - this.navigate(url, options); - } + /** + * uni.navigateTo + * @param url + * @param options + */ + push(url: string, options?: NavigateOptions) { + this.type = NAVIGATE_TYPE.NAVIGATE_TO; + this.navigate(url, options); + } - /** - * uni.redirectTo - * @param url - * @param options - */ - replace(url: string, options?: NavigateOptions) { - this.type = NAVIGATE_TYPE.REDIRECT_TO; - this.navigate(url, options); - } + /** + * uni.redirectTo + * @param url + * @param options + */ + replace(url: string, options?: NavigateOptions) { + this.type = NAVIGATE_TYPE.REDIRECT_TO; + this.navigate(url, options); + } - /** - * uni.reLaunch - * @param url - * @param options - */ - replaceAll(url: string, options?: NavigateOptions) { - this.type = NAVIGATE_TYPE.RE_LAUNCH; - this.navigate(url, options); - } + /** + * uni.reLaunch + * @param url + * @param options + */ + replaceAll(url: string, options?: NavigateOptions) { + this.type = NAVIGATE_TYPE.RE_LAUNCH; + this.navigate(url, options); + } - /** - * uni.switchTab - * @param url - * @param options - */ - pushTab(url: string, options?: NavigateOptions) { - // 微信小程序端uni.switchTab拦截无效处理 - /* #ifdef MP-WEIXIN */ - if (!routerBeforeEach(url)) { - return; - } - /* #endif */ - this.type = NAVIGATE_TYPE.SWITCH_TAB; - this.navigate(url, options); - } + /** + * uni.switchTab + * @param url + * @param options + */ + pushTab(url: string, options?: NavigateOptions) { + // 微信小程序端uni.switchTab拦截无效处理 + /* #ifdef MP-WEIXIN */ + if (!routerBeforeEach(url)) { + return; + } + /* #endif */ + this.type = NAVIGATE_TYPE.SWITCH_TAB; + this.navigate(url, options); + } - /** - * uni.navigateBack - * @param options - */ - back(options?: NavigateOptions) { - this.type = NAVIGATE_TYPE.NAVIGATE_BACK; - this.navigate('', options); - } + /** + * uni.navigateBack + * @param options + */ + back(options?: NavigateOptions) { + this.type = NAVIGATE_TYPE.NAVIGATE_BACK; + this.navigate('', options); + } - /** - * 自动判断跳转页面 (navigateTo|switchTab) - * @param url - * @param options - */ - go(url: string, options?: NavigateOptions & { replace?: boolean }) { - const path = filterPath(url); - const routerStore = useRouterStore(); - const routes = routerStore.getRoutes; - const route = routes?.get(path); - if (route?.meta?.tabBar) { - this.pushTab(url, options); - return; - } - if (options?.replace) { - this.replace(url, options); - return; - } - this.push(url, options); - } + /** + * 自动判断跳转页面 (navigateTo|switchTab) + * @param url + * @param options + */ + go(url: string, options?: NavigateOptions & { replace?: boolean }) { + const path = filterPath(url); + const routerStore = useRouterStore(); + const routes = routerStore.getRoutes; + const route = routes?.get(path); + if (route?.meta?.tabBar) { + this.pushTab(url, options); + return; + } + if (options?.replace) { + this.replace(url, options); + return; + } + this.push(url, options); + } } diff --git a/src/utils/router/routes.ts b/src/utils/router/routes.ts index a6c4c9e..77ebd61 100644 --- a/src/utils/router/routes.ts +++ b/src/utils/router/routes.ts @@ -7,35 +7,35 @@ const { pages, subPackages, tabBar } = pagesJson; // 将pages.json转换成Map对象,path为key const pagesMap = new Map(); -pages.forEach(page => { - pagesMap.set(page.path, page as Route); +pages.forEach((page) => { + pagesMap.set(page.path, page as Route); }); if (Array.isArray(subPackages) && subPackages.length) { - subPackages.forEach(el => { - const rootPath = el.root; - el.pages.forEach(page => { - page.path = `${rootPath}/${page.path}`; - pagesMap.set(page.path, page as Route); - }); - }); + subPackages.forEach((el) => { + const rootPath = el.root; + el.pages.forEach((page) => { + page.path = `${rootPath}/${page.path}`; + pagesMap.set(page.path, page as Route); + }); + }); } if (tabBar) { - const tabBarList = tabBar.list; - if (Array.isArray(tabBarList)) { - tabBarList.forEach(el => { - if (pagesMap.has(el.pagePath)) { - const page = pagesMap.get(el.pagePath); - const meta = page?.meta || {}; - // @ts-ignore - meta.tabBar = true; - // @ts-ignore - page.meta = assign({}, meta); - pagesMap.set(el.pagePath, page as Route); - } - }); - } + const tabBarList = tabBar.list; + if (Array.isArray(tabBarList)) { + tabBarList.forEach((el) => { + if (pagesMap.has(el.pagePath)) { + const page = pagesMap.get(el.pagePath); + const meta = page?.meta || {}; + // @ts-ignore + meta.tabBar = true; + // @ts-ignore + page.meta = assign({}, meta); + pagesMap.set(el.pagePath, page as Route); + } + }); + } } export { pagesMap }; diff --git a/src/utils/uniapi/index.ts b/src/utils/uniapi/index.ts index 0f47d16..ee1a667 100644 --- a/src/utils/uniapi/index.ts +++ b/src/utils/uniapi/index.ts @@ -5,41 +5,41 @@ * @constructor */ export const SetClipboardData = (data: string, showToast = true) => - new Promise((resolve, reject) => { - uni.setClipboardData({ - data, - showToast, - success: res => { - resolve(res); - }, - fail: err => { - reject(err); - }, - }); - }); + new Promise((resolve, reject) => { + uni.setClipboardData({ + data, + showToast, + success: (res) => { + resolve(res); + }, + fail: (err) => { + reject(err); + }, + }); + }); /** * @description 获取系统剪贴板内容 * @constructor */ export const GetClipboardData = () => - new Promise((resolve, reject) => { - uni.getClipboardData({ - success: res => { - resolve(res); - }, - fail: err => { - reject(err); - }, - }); - }); + new Promise((resolve, reject) => { + uni.getClipboardData({ + success: (res) => { + resolve(res); + }, + fail: (err) => { + reject(err); + }, + }); + }); /** * rpx 换算为 px * @param upx */ export const rpx2px = (upx: number) => { - return uni.upx2px(upx); + return uni.upx2px(upx); }; /** @@ -47,5 +47,5 @@ export const rpx2px = (upx: number) => { * @param upx */ export const px2rpx = (px: number) => { - return px / (uni.upx2px(100) / 100); + return px / (uni.upx2px(100) / 100); }; diff --git a/src/utils/uniapi/prompt.ts b/src/utils/uniapi/prompt.ts index dc82464..9ece681 100644 --- a/src/utils/uniapi/prompt.ts +++ b/src/utils/uniapi/prompt.ts @@ -9,24 +9,21 @@ * @param options * @constructor */ -export function Toast( - title: string, - options?: Partial, -) { - uni.showToast({ - title, - duration: 1500, - icon: 'none', - mask: true, - ...options, - }); +export function Toast(title: string, options?: Partial) { + uni.showToast({ + title, + duration: 1500, + icon: 'none', + mask: true, + ...options, + }); } /** * 隐藏消息提示框 */ export function HideToast() { - uni.hideToast(); + uni.hideToast(); } /** @@ -35,22 +32,19 @@ export function HideToast() { * @param options * @constructor */ -export function Loading( - title: string, - options?: Partial, -) { - uni.showLoading({ - title, - mask: true, - ...options, - }); +export function Loading(title: string, options?: Partial) { + uni.showLoading({ + title, + mask: true, + ...options, + }); } /** * 隐藏 loading 提示框 */ export function HideLoading() { - uni.hideLoading(); + uni.hideLoading(); } /** @@ -59,17 +53,17 @@ export function HideLoading() { * @constructor */ export function Modal(options: UniApp.ShowModalOptions) { - return new Promise((resolve, reject) => { - uni.showModal({ - ...options, - success: res => { - resolve(res); - }, - fail: res => { - reject(res); - }, - }); - }); + return new Promise((resolve, reject) => { + uni.showModal({ + ...options, + success: (res) => { + resolve(res); + }, + fail: (res) => { + reject(res); + }, + }); + }); } /** @@ -78,15 +72,15 @@ export function Modal(options: UniApp.ShowModalOptions) { * @constructor */ export function ActionSheet(options: UniApp.ShowActionSheetOptions) { - return new Promise((resolve, reject) => { - uni.showActionSheet({ - ...options, - success: res => { - resolve(res); - }, - fail: res => { - reject(res); - }, - }); - }); + return new Promise((resolve, reject) => { + uni.showActionSheet({ + ...options, + success: (res) => { + resolve(res); + }, + fail: (res) => { + reject(res); + }, + }); + }); }