From bd2d6adafaa6132e13c259e11536b72d0be15656 Mon Sep 17 00:00:00 2001 From: xingyu Date: Mon, 28 Aug 2023 17:40:07 +0800 Subject: [PATCH 1/6] chore: update deps --- package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 98533cee..798aa6d1 100644 --- a/package.json +++ b/package.json @@ -31,22 +31,22 @@ "@form-create/element-ui": "^3.1.17", "@iconify/iconify": "^3.1.1", "@videojs-player/vue": "^1.0.0", - "@vueuse/core": "^10.3.0", + "@vueuse/core": "^10.4.1", "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.10", "@zxcvbn-ts/core": "^3.0.3", "animate.css": "^4.1.1", - "axios": "^1.4.0", + "axios": "^1.5.0", "benz-amr-recorder": "^1.1.5", "bpmn-js-token-simulation": "^0.10.0", "camunda-bpmn-moddle": "^7.0.1", - "cropperjs": "^1.5.13", + "cropperjs": "^1.6.0", "crypto-js": "^4.1.1", "dayjs": "^1.11.9", - "diagram-js": "^11.6.0", + "diagram-js": "^12.3.0", "echarts": "^5.4.3", "echarts-wordcloud": "^2.1.0", - "element-plus": "2.3.9", + "element-plus": "2.3.12", "fast-xml-parser": "^4.2.7", "highlight.js": "^11.8.0", "intro.js": "^7.2.0", @@ -73,7 +73,7 @@ "devDependencies": { "@commitlint/cli": "^17.7.1", "@commitlint/config-conventional": "^17.7.0", - "@iconify/json": "^2.2.103", + "@iconify/json": "^2.2.107", "@intlify/unplugin-vue-i18n": "^0.12.3", "@purge-icons/generated": "^0.9.0", "@types/intro.js": "^5.1.1", @@ -84,16 +84,16 @@ "@types/qs": "^6.9.7", "@typescript-eslint/eslint-plugin": "^6.4.1", "@typescript-eslint/parser": "^6.4.1", - "@unocss/transformer-variant-group": "^0.55.2", + "@unocss/transformer-variant-group": "^0.55.3", "@vitejs/plugin-legacy": "^4.1.1", "@vitejs/plugin-vue": "^4.3.3", "@vitejs/plugin-vue-jsx": "^3.0.2", - "@vue-macros/volar": "^0.13.7", + "@vue-macros/volar": "^0.14.2", "autoprefixer": "^10.4.15", "bpmn-js": "^8.9.0", "bpmn-js-properties-panel": "^0.46.0", "consola": "^3.2.3", - "eslint": "^8.47.0", + "eslint": "^8.48.0", "eslint-config-prettier": "^9.0.0", "eslint-define-config": "^1.23.0", "eslint-plugin-prettier": "^5.0.0", @@ -113,7 +113,7 @@ "stylelint-order": "^6.0.3", "terser": "^5.19.2", "typescript": "5.1.6", - "unocss": "^0.55.2", + "unocss": "^0.55.3", "unplugin-auto-import": "^0.16.6", "unplugin-element-plus": "^0.8.0", "unplugin-vue-components": "^0.25.1", From 547b1741fc5943e17604139fafaef43c77a56fba Mon Sep 17 00:00:00 2001 From: xingyu Date: Mon, 28 Aug 2023 17:40:15 +0800 Subject: [PATCH 2/6] fix: router --- src/router/modules/remaining.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 87ffd1e5..3872c145 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -206,7 +206,8 @@ const remainingRouter: AppRouteRecordRaw[] = [ { path: 'detail', name: 'TradeOrderDetail', - component: () => import('@/views/mall/trade/order/tradeOrderDetail.vue'), + // component: () => import('@/views/mall/trade/order/tradeOrderDetail.vue'), + component: () => import('@/views/mall/trade/detail/index.vue'), meta: { title: '订单详情', hidden: true } } ] From 5724539caf254d8cb37ab6b45c4a25e8f2865440 Mon Sep 17 00:00:00 2001 From: xingyu Date: Mon, 28 Aug 2023 17:41:09 +0800 Subject: [PATCH 3/6] docs: update deps --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e9940959..5e6a43e0 100644 --- a/README.md +++ b/README.md @@ -40,13 +40,13 @@ |----------------------------------------------------------------------|------------------|--------| | [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.4 | | [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.9 | -| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.9 | +| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.12 | | [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.1.6 | | [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.6 | -| [vueuse](https://vueuse.org/) | 常用工具集 | 10.3.0 | +| [vueuse](https://vueuse.org/) | 常用工具集 | 10.4.1 | | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 | | [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.4 | -| [unocss](https://uno.antfu.me/) | 原子 css | 0.55.2 | +| [unocss](https://uno.antfu.me/) | 原子 css | 0.55.3 | | [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.1 | | [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 | From 54c41b44452c1af8f2e00f526f0bf8ec71c1020b Mon Sep 17 00:00:00 2001 From: xingyu Date: Mon, 28 Aug 2023 17:44:47 +0800 Subject: [PATCH 4/6] fix: router --- src/router/modules/remaining.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 3872c145..504a6e9e 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -207,7 +207,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ path: 'detail', name: 'TradeOrderDetail', // component: () => import('@/views/mall/trade/order/tradeOrderDetail.vue'), - component: () => import('@/views/mall/trade/detail/index.vue'), + component: () => import('@/views/mall/trade/order/detail/index.vue'), meta: { title: '订单详情', hidden: true } } ] From e8dce93d661d700b2bbf99f8540e212fcb56263f Mon Sep 17 00:00:00 2001 From: xingyu Date: Mon, 28 Aug 2023 17:44:59 +0800 Subject: [PATCH 5/6] perf: add ep include --- build/vite/optimize.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/vite/optimize.ts b/build/vite/optimize.ts index d34e1b37..3dda50b0 100644 --- a/build/vite/optimize.ts +++ b/build/vite/optimize.ts @@ -31,6 +31,8 @@ const include = [ 'element-plus/es', 'element-plus/es/locale/lang/zh-cn', 'element-plus/es/locale/lang/en', + 'element-plus/es/components/avatar/style/css', + 'element-plus/es/components/space/style/css', 'element-plus/es/components/backtop/style/css', 'element-plus/es/components/form/style/css', 'element-plus/es/components/radio-group/style/css', From e6a9dd0e4ca41d5ec36daf4614ec492e1a6dc88c Mon Sep 17 00:00:00 2001 From: xingyu Date: Mon, 28 Aug 2023 17:53:45 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Cropper/src/CropperAvatar.vue | 2 ++ src/views/Profile/components/UserAvatar.vue | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Cropper/src/CropperAvatar.vue b/src/components/Cropper/src/CropperAvatar.vue index 8886c4e9..414ba144 100644 --- a/src/components/Cropper/src/CropperAvatar.vue +++ b/src/components/Cropper/src/CropperAvatar.vue @@ -1,6 +1,7 @@