diff --git a/yshop-drink-vue/.eslintrc.js b/yshop-drink-vue/.eslintrc.js index 4543113..a2f6317 100644 --- a/yshop-drink-vue/.eslintrc.js +++ b/yshop-drink-vue/.eslintrc.js @@ -22,9 +22,10 @@ module.exports = defineConfig({ 'plugin:@typescript-eslint/recommended', 'prettier', 'plugin:prettier/recommended', - './.eslintrc-auto-import.json' + // '@unocss' ], rules: { + 'vue/no-setup-props-destructure': 'off', 'vue/script-setup-uses-vars': 'error', 'vue/no-reserved-component-names': 'off', '@typescript-eslint/ban-ts-ignore': 'off', @@ -39,8 +40,8 @@ module.exports = defineConfig({ '@typescript-eslint/ban-types': 'off', '@typescript-eslint/no-non-null-assertion': 'off', '@typescript-eslint/explicit-module-boundary-types': 'off', - '@typescript-eslint/no-unused-vars': 'error', - 'no-unused-vars': 'error', + '@typescript-eslint/no-unused-vars': 'off', + 'no-unused-vars': 'off', 'space-before-function-paren': 'off', 'vue/attributes-order': 'off', @@ -52,6 +53,7 @@ module.exports = defineConfig({ 'vue/attribute-hyphenation': 'off', 'vue/require-default-prop': 'off', 'vue/require-explicit-emits': 'off', + 'vue/require-toggle-inside-transition': 'off', 'vue/html-self-closing': [ 'error', { @@ -65,6 +67,9 @@ module.exports = defineConfig({ } ], 'vue/multi-word-component-names': 'off', - "prettier/prettier": "off" + 'vue/no-v-html': 'off', + 'prettier/prettier': 'off', + '@unocss/order': 'off', + '@unocss/order-attributify': 'off' } }) diff --git a/yshop-drink-vue/package.json b/yshop-drink-vue/package.json index cddf1e0..012aec7 100644 --- a/yshop-drink-vue/package.json +++ b/yshop-drink-vue/package.json @@ -1,6 +1,6 @@ { - "name": "yshop-pro-vue3", - "version": "1.0.0", + "name": "yshop-drink-vue3", + "version": "1.2.0", "description": "基于vue3、vite4、element-plus、typesScript", "author": "yshop", "private": false, @@ -32,6 +32,7 @@ "@form-create/designer": "^3.1.0", "@form-create/element-ui": "^3.1.17", "@iconify/iconify": "^3.1.0", + "@rollup/rollup-darwin-x64": "^4.13.2", "@videojs-player/vue": "^1.0.0", "@vueuse/core": "^10.1.0", "@wangeditor/editor": "^5.1.23", @@ -48,7 +49,7 @@ "diagram-js": "^11.6.0", "echarts": "^5.4.2", "echarts-wordcloud": "^2.1.0", - "element-plus": "2.3.3", + "element-plus": "^2.4.3", "fast-xml-parser": "^4.2.2", "highlight.js": "^11.7.0", "intro.js": "^7.0.1", @@ -57,13 +58,14 @@ "min-dash": "^4.1.0", "mitt": "^3.0.0", "nprogress": "^0.2.0", - "pinia": "^2.0.35", + "pinia": "^2.1.6", "qrcode": "^1.5.3", "qs": "^6.11.1", + "speak-tts": "^2.0.8", "steady-xml": "^0.1.0", "url": "^0.11.0", - "video.js": "^8.0.4", - "vue": "3.2.47", + "video.js": "^7.21.5", + "vue": "3.3.4", "vue-baidu-map-3x": "^1.0.34", "vue-i18n": "9.2.2", "vue-jsonp": "^2.0.0", @@ -90,9 +92,9 @@ "@types/qs": "^6.9.7", "@typescript-eslint/eslint-plugin": "^5.59.0", "@typescript-eslint/parser": "^5.59.0", - "@vitejs/plugin-legacy": "^4.0.2", - "@vitejs/plugin-vue": "^4.1.0", - "@vitejs/plugin-vue-jsx": "^3.0.1", + "@vitejs/plugin-legacy": "^5.3.1", + "@vitejs/plugin-vue": "^5.0.4", + "@vitejs/plugin-vue-jsx": "^3.1.0", "autoprefixer": "^10.4.14", "bpmn-js": "^8.9.0", "bpmn-js-properties-panel": "^0.46.0", @@ -108,7 +110,7 @@ "postcss-scss": "^4.0.6", "prettier": "^2.8.8", "rimraf": "^5.0.0", - "rollup": "^3.20.7", + "rollup": "^4.12.0", "sass": "^1.62.0", "stylelint": "^15.6.0", "stylelint-config-html": "^1.1.0", @@ -120,14 +122,14 @@ "unplugin-auto-import": "^0.15.3", "unplugin-element-plus": "^0.7.1", "unplugin-vue-components": "^0.24.1", - "vite": "4.3.1", + "vite": "5.1.4", "vite-plugin-compression": "^0.5.1", - "vite-plugin-ejs": "^1.6.4", + "vite-plugin-ejs": "^1.7.0", "vite-plugin-eslint": "^1.8.1", "vite-plugin-progress": "^0.0.7", - "vite-plugin-purge-icons": "^0.9.2", + "vite-plugin-purge-icons": "^0.10.0", "vite-plugin-svg-icons": "^2.0.1", - "vite-plugin-top-level-await": "^1.3.0", + "vite-plugin-top-level-await": "^1.3.1", "vite-plugin-vue-setup-extend-plus": "^0.1.0", "vite-plugin-windicss": "^1.8.10", "vue-tsc": "^1.4.4", @@ -139,10 +141,10 @@ "license": "MIT", "repository": { "type": "git", - "url": "git+https://gitee.com/yudaocode/yudao-ui-admin-vue3" + "url": "git+https://gitee.com/guchengwuyue/yshop-drink" }, "bugs": { - "url": "https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues" + "url": "https://gitee.com/guchengwuyue/yshop-drink" }, - "homepage": "https://gitee.com/yudaocode/yudao-ui-admin-vue3" + "homepage": "https://gitee.com/guchengwuyue/yshop-drink" } diff --git a/yshop-drink-vue/src/router/modules/remaining.ts b/yshop-drink-vue/src/router/modules/remaining.ts index 6edef2d..a90b125 100644 --- a/yshop-drink-vue/src/router/modules/remaining.ts +++ b/yshop-drink-vue/src/router/modules/remaining.ts @@ -228,7 +228,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ { path: '/yshop/materia/index', - component: () => import('@/components/Materials/src/EditorMaterials.vue'), + component: () => import('@/components/Materials/src/editorMaterials.vue'), name: 'EditorMaterials', meta: { noCache: true, diff --git a/yshop-drink-vue/src/views/infra/apiErrorLog/index.vue b/yshop-drink-vue/src/views/infra/apiErrorLog/index.vue index 89928be..46cacb9 100644 --- a/yshop-drink-vue/src/views/infra/apiErrorLog/index.vue +++ b/yshop-drink-vue/src/views/infra/apiErrorLog/index.vue @@ -1,6 +1,4 @@