diff --git a/package.json b/package.json index 052632f..2443e3b 100644 --- a/package.json +++ b/package.json @@ -1,65 +1,65 @@ { - "name": "vue-project", - "version": "0.0.0", - "license": "MIT", - "scripts": { - "dev": "vite", - "preview": "vite preview --port 4173", - "build": "vite build && node scripts/release.mjs", - "type-check": "vue-tsc --noEmit", - "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore" - }, - "dependencies": { - "@element-plus/icons-vue": "^2.0.6", - "@highlightjs/vue-plugin": "^2.1.0", - "@wangeditor/editor": "^5.1.12", - "@wangeditor/editor-for-vue": "^5.1.12", - "axios": "^0.27.2", - "css-color-function": "^1.3.3", - "echarts": "^5.3.3", - "element-plus": "^2.2.9", - "highlight.js": "^11.6.0", - "mavon-editor": "3.0.1", - "nprogress": "^0.2.0", - "pinia": "^2.0.14", - "vditor": "^3.9.9", - "vue": "^3.2.37", - "vue-clipboard3": "^2.0.0", - "vue-echarts": "^6.2.3", - "vue-router": "^4.0.16", - "vue3-video-play": "^1.3.2", - "vuedraggable": "^4.1.0" - }, - "devDependencies": { - "@rushstack/eslint-patch": "^1.1.0", - "@tailwindcss/line-clamp": "^0.4.2", - "@types/lodash-es": "^4.17.6", - "@types/node": "^16.11.41", - "@types/nprogress": "^0.2.0", - "@vitejs/plugin-legacy": "^2.3.1", - "@vitejs/plugin-vue": "^3.0.0", - "@vitejs/plugin-vue-jsx": "^2.0.0", - "@vue/eslint-config-prettier": "^7.0.0", - "@vue/eslint-config-typescript": "^11.0.0", - "@vue/tsconfig": "^0.1.3", - "autoprefixer": "^10.4.7", - "consola": "^2.15.3", - "eslint": "^8.5.0", - "eslint-plugin-vue": "^9.0.0", - "execa": "^6.1.0", - "fs-extra": "^10.1.0", - "postcss": "^8.4.14", - "prettier": "^2.5.1", - "sass": "^1.53.0", - "tailwindcss": "^3.0.24", - "terser": "^5.15.1", - "typescript": "~4.7.4", - "unplugin-auto-import": "^0.9.2", - "unplugin-vue-components": "^0.19.9", - "vite": "^3.0.0", - "vite-plugin-style-import": "^2.0.0", - "vite-plugin-svg-icons": "^2.0.1", - "vite-plugin-vue-setup-extend": "^0.4.0", - "vue-tsc": "^0.38.1" - } + "name": "vue-project", + "version": "0.0.0", + "license": "MIT", + "scripts": { + "dev": "vite", + "preview": "vite preview --port 4173", + "build": "vite build && node scripts/release.mjs", + "type-check": "vue-tsc --noEmit", + "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore" + }, + "dependencies": { + "@element-plus/icons-vue": "^2.0.6", + "@highlightjs/vue-plugin": "^2.1.0", + "@wangeditor/editor": "^5.1.12", + "@wangeditor/editor-for-vue": "^5.1.12", + "axios": "^0.27.2", + "css-color-function": "^1.3.3", + "echarts": "^5.3.3", + "element-plus": "^2.2.9", + "highlight.js": "^11.6.0", + "mavon-editor": "3.0.1", + "nprogress": "^0.2.0", + "pinia": "^2.0.14", + "vditor": "^3.9.9", + "vue": "^3.2.37", + "vue-clipboard3": "^2.0.0", + "vue-echarts": "^6.2.3", + "vue-router": "^4.0.16", + "vue3-video-play": "^1.3.2", + "vuedraggable": "^4.1.0" + }, + "devDependencies": { + "@rushstack/eslint-patch": "^1.1.0", + "@tailwindcss/line-clamp": "^0.4.2", + "@types/lodash-es": "^4.17.6", + "@types/node": "^16.11.41", + "@types/nprogress": "^0.2.0", + "@vitejs/plugin-legacy": "^2.3.1", + "@vitejs/plugin-vue": "^3.0.0", + "@vitejs/plugin-vue-jsx": "^2.0.0", + "@vue/eslint-config-prettier": "^7.0.0", + "@vue/eslint-config-typescript": "^11.0.0", + "@vue/tsconfig": "^0.1.3", + "autoprefixer": "^10.4.7", + "consola": "^2.15.3", + "eslint": "^8.5.0", + "eslint-plugin-vue": "^9.0.0", + "execa": "^6.1.0", + "fs-extra": "^10.1.0", + "postcss": "^8.4.14", + "prettier": "^2.5.1", + "sass": "^1.53.0", + "tailwindcss": "^3.0.24", + "terser": "^5.15.1", + "typescript": "~4.7.4", + "unplugin-auto-import": "^0.9.2", + "unplugin-vue-components": "^0.19.9", + "vite": "^3.0.0", + "vite-plugin-style-import": "^2.0.0", + "vite-plugin-svg-icons": "^2.0.1", + "vite-plugin-vue-setup-extend": "^0.4.0", + "vue-tsc": "^0.38.1" + } } diff --git a/src/App.vue b/src/App.vue index b352832..838cc2d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -59,7 +59,16 @@ watch( /* .el-select__wrapper{ width: 280px; } */ -.el-select.w-\[280px\]{ +.el-select.w-\[280px\] { width: 280px; } + +.el-table th.el-table__cell>.cell { + text-align: center; + +} + +.el-table td.el-table__cell div { + text-align: center; +} diff --git a/src/components/popup/index.vue b/src/components/popup/index.vue index 726f89f..b5fc599 100644 --- a/src/components/popup/index.vue +++ b/src/components/popup/index.vue @@ -4,15 +4,8 @@ - + @@ -24,11 +17,7 @@ {{ cancelButtonText }} - + {{ confirmButtonText }} @@ -78,7 +67,7 @@ export default defineComponent({ clickModalClose: { // 点击遮罩层关闭对话窗口 type: Boolean, - default: false + default: true }, center: { // 是否居中布局 diff --git a/src/views/data/merchant/merchant/edit.vue b/src/views/data/merchant/merchant/edit.vue index 2e581df..7923a02 100644 --- a/src/views/data/merchant/merchant/edit.vue +++ b/src/views/data/merchant/merchant/edit.vue @@ -1,124 +1,152 @@ - + - - - - + + + + @@ -132,20 +140,11 @@ diff --git a/src/views/data/supplier/supplier/details.vue b/src/views/data/supplier/supplier/details.vue index 86197c9..fc04e4a 100644 --- a/src/views/data/supplier/supplier/details.vue +++ b/src/views/data/supplier/supplier/details.vue @@ -1,101 +1,87 @@