diff --git a/admin/package.json b/admin/package.json index e441f900..7cfa198b 100644 --- a/admin/package.json +++ b/admin/package.json @@ -1,7 +1,7 @@ { - "name": "vue-element-admin", + "name": "crmeb-java-webpc-admin", "version": "4.2.1", - "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features", + "description": "Java mall free open source CRMEB mall JAVA version, SpringBoot + Maven + Swagger + Mybatis Plus + Redis + Uniapp +Vue+elementUI Including mobile terminal, applet, PC background, Api interface; products, users, shopping carts, orders, points, Modules such as coupons, marketing, balance, permissions, roles, system settings, combined data, and drag-and-drop forms have greatly reduced the cost of second-opening.", "author": "CRMEB", "license": "MIT", "scripts": { @@ -27,20 +27,14 @@ ] }, "keywords": [ - "vue", - "admin", - "dashboard", - "element-ui", - "boilerplate", - "admin-template", - "management-system" + "CRMEB Java" ], "repository": { - "type": "git", - "url": "git+https://github.com/PanJiaChen/vue-element-admin.git" + "type": "gitee", + "url": "https://gitee.com/ZhongBangKeJi/crmeb_java" }, "bugs": { - "url": "https://github.com/PanJiaChen/vue-element-admin/issues" + "url": "https://gitee.com/ZhongBangKeJi/crmeb_java/issues" }, "dependencies": { "@babel/parser": "^7.9.6", @@ -58,9 +52,9 @@ "js-cookie": "2.2.0", "jsonlint": "1.6.3", "jszip": "3.2.1", - "monaco-editor": "^0.20.0", "mpvue-calendar": "^2.3.7", - "node-sass": "^4.13.1", + "sass": "1.26.2", + "sass-loader": "^7.2.0", "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", @@ -90,7 +84,7 @@ "babel-core": "7.0.0-bridge.0", "babel-jest": "23.6.0", "chalk": "2.4.2", - "chokidar": "2.1.5", + "chokidar": "^3.1.1", "connect": "3.6.6", "eslint": "5.15.3", "eslint-plugin-vue": "5.2.2", @@ -98,11 +92,12 @@ "husky": "1.3.1", "lint-staged": "8.1.5", "mockjs": "1.0.1-beta3", - "monaco-editor-webpack-plugin": "^1.9.0", "plop": "2.3.0", "runjs": "^4.3.2", "script-loader": "^0.7.2", + "script-ext-html-webpack-plugin": "2.1.3", "serve-static": "^1.13.2", + "svg-sprite-loader": "4.1.3", "svgo": "1.2.0", "vue-lazyload": "^1.3.3", "vue-template-compiler": "2.6.10" diff --git a/admin/src/components/HeaderSearch/index.vue b/admin/src/components/HeaderSearch/index.vue index 57c4c43e..34f039ac 100644 --- a/admin/src/components/HeaderSearch/index.vue +++ b/admin/src/components/HeaderSearch/index.vue @@ -164,7 +164,7 @@ export default { display: inline-block; /*vertical-align: middle;*/ line-height: 50px; - /deep/ .el-input__inner { + ::v-deep .el-input__inner { border-radius: 0; border: 0; padding-left: 0; diff --git a/admin/src/components/Tinymce/components/EditorImage.vue b/admin/src/components/Tinymce/components/EditorImage.vue index 4a8321bb..f628edd9 100644 --- a/admin/src/components/Tinymce/components/EditorImage.vue +++ b/admin/src/components/Tinymce/components/EditorImage.vue @@ -40,7 +40,7 @@ export default {