diff --git a/package.json b/package.json index fdebab8..4da2779 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "dependencies": { "@alova/adapter-uniapp": "^2.0.4", "@alova/mock": "^2.0.4", + "@alova/shared": "^1.0.4", "@dcloudio/uni-app": "3.0.0-alpha-4020520240808001", "@dcloudio/uni-app-plus": "3.0.0-alpha-4020520240808001", "@dcloudio/uni-components": "3.0.0-alpha-4020520240808001", @@ -59,17 +60,16 @@ "@dcloudio/uni-mp-weixin": "3.0.0-alpha-4020520240808001", "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-4020520240808001", "@multiavatar/multiavatar": "^1.0.7", - "normalize-path": "^3.0.0", - "pinia-plugin-persistedstate": "^3.2.1", - "unplugin-vue-components": "^0.27.0", "alova": "^3.0.9", "crypto-js": "^4.2.0", "lodash-es": "^4.17.21", + "normalize-path": "^3.0.0", "pinia": "^2.2.2", + "pinia-plugin-persistedstate": "^3.2.1", + "unplugin-vue-components": "^0.27.0", "vue": "^3.4.38" }, "devDependencies": { - "@types/normalize-path": "^3.0.0", "@antfu/eslint-config": "^2.26.0", "@dcloudio/types": "^3.4.12", "@dcloudio/uni-automator": "3.0.0-alpha-4020520240808001", @@ -81,6 +81,7 @@ "@types/crypto-js": "^4.2.2", "@types/lodash-es": "^4.17.12", "@types/node": "^20.16.1", + "@types/normalize-path": "^3.0.0", "@vitejs/plugin-vue": "^5.1.2", "@vue/runtime-core": "^3.4.38", "autoprefixer": "^10.4.20", diff --git a/src/utils/http/faultTolerance.ts b/src/utils/http/faultTolerance.ts index 57a0ddc..55ccacc 100644 --- a/src/utils/http/faultTolerance.ts +++ b/src/utils/http/faultTolerance.ts @@ -7,7 +7,7 @@ import { ResultEnum } from '@/enums/httpEnum'; * @param msg */ export function handleHttpStatus(status: number, msg: string): void { - let errMessage = null; + let errMessage: string = ''; switch (status) { case 400: errMessage = `${msg}`; diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts index 6142a86..b37181b 100644 --- a/src/utils/http/index.ts +++ b/src/utils/http/index.ts @@ -52,11 +52,11 @@ const alovaInstance = createAlova({ const { config } = method; const { requestType } = config; const { statusCode, data: rawData, errMsg } = response as UniNamespace.RequestSuccessCallbackResult; + const { code, message, data } = rawData as API; if (statusCode === 200) { if (requestType) { return response; } - const { code, message, data } = rawData as API; if (code === ResultEnum.SUCCESS) { return data as any; } diff --git a/unocss.config.ts b/unocss.config.ts index 9563fee..2e8fe2a 100644 --- a/unocss.config.ts +++ b/unocss.config.ts @@ -1,98 +1,97 @@ +/** + * unocss defineConfig + * @link unocss: https://github.com/unocss/unocss + * @link unocss-preset-weapp: https://github.com/MellowCo/unocss-preset-weapp + */ +import presetWeapp from 'unocss-preset-weapp'; +import { extractorAttributify, transformerClass } from 'unocss-preset-weapp/transformer'; +import { presetIcons } from 'unocss'; - /** - * unocss defineConfig - * @link unocss: https://github.com/unocss/unocss - * @link unocss-preset-weapp: https://github.com/MellowCo/unocss-preset-weapp - * */ - import presetWeapp from 'unocss-preset-weapp' - import { extractorAttributify, transformerClass } from 'unocss-preset-weapp/transformer' - import { presetIcons } from 'unocss' +import transformerDirectives from '@unocss/transformer-directives'; - import transformerDirectives from '@unocss/transformer-directives' +const { presetWeappAttributify, transformerAttributify } = extractorAttributify(); - const { presetWeappAttributify, transformerAttributify } = extractorAttributify() +export default { + presets: [ + // https://github.com/MellowCo/unocss-preset-weapp + presetWeapp(), + // attributify autocomplete + presetWeappAttributify(), + presetIcons(), + ], + shortcuts: [ + { + 'border-base': 'border border-gray-500_10', + 'center': 'flex justify-center items-center', + }, + ], + transformers: [ + transformerDirectives({ + enforce: 'pre', + }), - export default { - presets: [ - // https://github.com/MellowCo/unocss-preset-weapp - presetWeapp(), - // attributify autocomplete - presetWeappAttributify(), - presetIcons(), - ], - shortcuts: [ - { - 'border-base': 'border border-gray-500_10', - 'center': 'flex justify-center items-center', + // https://github.com/MellowCo/unocss-preset-weapp/tree/main/src/transformer/transformerAttributify + transformerAttributify(), + + // https://github.com/MellowCo/unocss-preset-weapp/tree/main/src/transformer/transformerClass + transformerClass(), + ], + theme: { + extend: { + opacity: { + disabled: 'var(--opacity-disabled)', }, - ], - transformers: [ - transformerDirectives({ - enforce: 'pre', - }), - - // https://github.com/MellowCo/unocss-preset-weapp/tree/main/src/transformer/transformerAttributify - transformerAttributify(), - - // https://github.com/MellowCo/unocss-preset-weapp/tree/main/src/transformer/transformerClass - transformerClass(), - ], - theme: { - "extend": { - "opacity": { - "disabled": "var(--opacity-disabled)" - } + }, + colors: { + primary: 'var(--colors-primary)', + secondary: 'var(--colors-secondary)', + accent: 'var(--colors-accent)', + success: 'var(--colors-success)', + warning: 'var(--colors-warning)', + error: 'var(--colors-error)', + disable: 'var(--colors-disable)', + danger: 'var(--colors-danger)', + mark: 'var(--colors-mark)', + title: 'var(--colors-title)', + subtitle: 'var(--colors-subtitle)', + paragraph: 'var(--colors-paragraph)', + fontColorblack: 'var(--colors-fontColorblack)', + fontColorPrimary: 'var(--colors-fontColorPrimary)', + fontColorInverse: 'var(--colors-fontColorInverse)', + fontColorGrey: 'var(--colors-fontColorGrey)', + fontColorPlaceholder: 'var(--colors-fontColorPlaceholder)', + fontColorDisable: 'var(--colors-fontColorDisable)', + fontColorBottomText: 'var(--colors-fontColorBottomText)', + container: 'var(--colors-container)', + page: 'var(--colors-page)', + containerInverse: 'var(--colors-containerInverse)', + containerHover: 'var(--colors-containerHover)', + secondaryHover: 'var(--colors-secondaryHover)', + containerMask: 'var(--colors-containerMask)', + iconButton: 'var(--colors-iconButton)', + borderColor: 'var(--colors-borderColor)', + }, + fontSize: { + sm: 'var(--fontSize-sm)', + base: 'var(--fontSize-base)', + lg: 'var(--fontSize-lg)', + title: 'var(--fontSize-title)', + subtitle: 'var(--fontSize-subtitle)', + paragraph: 'var(--fontSize-paragraph)', + }, + borderRadius: { + sm: 'var(--borderRadius-sm)', + base: 'var(--borderRadius-base)', + lg: 'var(--borderRadius-lg)', + circle: 'var(--borderRadius-circle)', + }, + spacing: { + rowSm: 'var(--spacing-rowSm)', + rowBase: 'var(--spacing-rowBase)', + rowLg: 'var(--spacing-rowLg)', + colSm: 'var(--spacing-colSm)', + colBase: 'var(--spacing-colBase)', + colLg: 'var(--spacing-colLg)', + }, }, - "colors": { - "primary": "var(--colors-primary)", - "secondary": "var(--colors-secondary)", - "accent": "var(--colors-accent)", - "success": "var(--colors-success)", - "warning": "var(--colors-warning)", - "error": "var(--colors-error)", - "disable": "var(--colors-disable)", - "danger": "var(--colors-danger)", - "mark": "var(--colors-mark)", - "title": "var(--colors-title)", - "subtitle": "var(--colors-subtitle)", - "paragraph": "var(--colors-paragraph)", - "fontColorblack": "var(--colors-fontColorblack)", - "fontColorPrimary": "var(--colors-fontColorPrimary)", - "fontColorInverse": "var(--colors-fontColorInverse)", - "fontColorGrey": "var(--colors-fontColorGrey)", - "fontColorPlaceholder": "var(--colors-fontColorPlaceholder)", - "fontColorDisable": "var(--colors-fontColorDisable)", - "fontColorBottomText": "var(--colors-fontColorBottomText)", - "container": "var(--colors-container)", - "page": "var(--colors-page)", - "containerInverse": "var(--colors-containerInverse)", - "containerHover": "var(--colors-containerHover)", - "secondaryHover": "var(--colors-secondaryHover)", - "containerMask": "var(--colors-containerMask)", - "iconButton": "var(--colors-iconButton)", - "borderColor": "var(--colors-borderColor)" - }, - "fontSize": { - "sm": "var(--fontSize-sm)", - "base": "var(--fontSize-base)", - "lg": "var(--fontSize-lg)", - "title": "var(--fontSize-title)", - "subtitle": "var(--fontSize-subtitle)", - "paragraph": "var(--fontSize-paragraph)" - }, - "borderRadius": { - "sm": "var(--borderRadius-sm)", - "base": "var(--borderRadius-base)", - "lg": "var(--borderRadius-lg)", - "circle": "var(--borderRadius-circle)" - }, - "spacing": { - "rowSm": "var(--spacing-rowSm)", - "rowBase": "var(--spacing-rowBase)", - "rowLg": "var(--spacing-rowLg)", - "colSm": "var(--spacing-colSm)", - "colBase": "var(--spacing-colBase)", - "colLg": "var(--spacing-colLg)" - } -} - } +};