修改

backmanage/package-lock.json

@@ -1927,9 +1927,8 @@
     },
     "node_modules/@wangeditor/editor": {
       "version": "5.1.23",
-      "resolved": "https://registry.npmjs.org/@wangeditor/editor/-/editor-5.1.23.tgz",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz",
       "integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==",
-      "license": "MIT",
       "dependencies": {
         "@uppy/core": "^2.1.1",
         "@uppy/xhr-upload": "^2.0.3",
@@ -1956,9 +1955,8 @@
     },
     "node_modules/@wangeditor/editor-for-vue": {
       "version": "5.1.12",
-      "resolved": "https://registry.npmjs.org/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz",
       "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==",
-      "license": "MIT",
       "peerDependencies": {
         "@wangeditor/editor": ">=5.1.0",
         "vue": "^3.0.5"
@@ -7062,7 +7060,7 @@
     },
     "@wangeditor/editor": {
       "version": "5.1.23",
-      "resolved": "https://registry.npmjs.org/@wangeditor/editor/-/editor-5.1.23.tgz",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz",
       "integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==",
       "requires": {
         "@uppy/core": "^2.1.1",
@@ -7090,7 +7088,7 @@
     },
     "@wangeditor/editor-for-vue": {
       "version": "5.1.12",
-      "resolved": "https://registry.npmjs.org/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz",
       "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==",
       "requires": {}
     },

backmanage/src/components/common/CustomEditor.vue

@@ -5,12 +5,8 @@ import { useGlobalStore } from '@/store/modules/global'
 const { token, language } = useGlobalStore()
 
 import '@wangeditor/editor/dist/css/style.css' // 引入 css
-<<<<<<< HEAD
-// import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
-=======
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { ElMessage } from 'element-plus'
->>>>>>> b0cbf726ce167fde417a4d0fdf256ebf838e7092
 
 const emits = defineEmits(['updateContent'])