diff --git a/dist.zip b/dist.zip index 047a61c..b9b2586 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/package.json b/package.json index 01588c2..c6ca159 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "version": "0.0.0", "type": "module", "scripts": { - "preinstall": "npx only-allow npm", + "preinstall": "npx only-allow pnpm", "dev": "vite", "dev:test": "vite --mode testing", "build": "vite build", @@ -20,7 +20,7 @@ }, "dependencies": { "@element-plus/icons-vue": "2.1.0", - "@smallwei/avue": "^3.2.22", + "@smallwei/avue": "^3.3.0", "@tinymce/tinymce-vue": "^5.1.0", "axios": "1.3.4", "big.js": "6.2.1", diff --git a/src/main.js b/src/main.js index 7ec1935..fbc8b5a 100644 --- a/src/main.js +++ b/src/main.js @@ -1,3 +1,5 @@ +import Avue from '@smallwei/avue' +import '@smallwei/avue/lib/index.css' import { createApp } from 'vue' import App from './App.vue' import { createPinia } from 'pinia' @@ -7,9 +9,6 @@ import 'element-plus/dist/index.css' import * as ElementPlusIconsVue from '@element-plus/icons-vue' import router from '@/router' import locale from 'element-plus/lib/locale/lang/zh-cn' -import Avue from '@smallwei/avue' -import '@smallwei/avue/lib/index.css' - // 全局样式 import '@/styles/index.scss' // svg @@ -29,21 +28,18 @@ moment.locale('zh-cn', { } }) const app = createApp(App) - // router app.use(router) // pinia const pinia = createPinia() app.use(pinia) - app.component('SvgIcon', svgIcon) - -// Avue -app.use(Avue) -// element-plus +// element-pl +// us app.use(ElementPlus, { locale }) for (const [key, component] of Object.entries(ElementPlusIconsVue)) { app.component(key, component) } - +// Avue +app.use(Avue) app.mount('#app') diff --git a/src/views/modules/prod/prodList/index.vue b/src/views/modules/prod/prodList/index.vue index d0169f7..3b54e4f 100644 --- a/src/views/modules/prod/prodList/index.vue +++ b/src/views/modules/prod/prodList/index.vue @@ -101,6 +101,7 @@ import { isAuth } from '@/utils' import { ElMessage, ElMessageBox } from 'element-plus' import { tableOption } from '@/crud/prod/prodList.js' + const permission = reactive({ delBtn: isAuth('prod:prod:delete') }) @@ -185,7 +186,8 @@ const onDelete = (id) => { }) }) }) - .catch(() => { }) + .catch(() => { + }) } /** * 条件查询 diff --git a/src/views/modules/user/user/add-or-update.vue b/src/views/modules/user/user/add-or-update.vue index 1c9c6cb..d0fab64 100644 --- a/src/views/modules/user/user/add-or-update.vue +++ b/src/views/modules/user/user/add-or-update.vue @@ -66,6 +66,7 @@