diff --git a/package-lock.json b/package-lock.json index 196af4d..62eb8c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3474,6 +3474,11 @@ "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==", "dev": true }, + "cssfilter": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz", + "integrity": "sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==" + }, "cssnano": { "version": "4.1.10", "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz", @@ -6680,12 +6685,8 @@ "highlight.js": { "version": "9.16.2", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.16.2.tgz", - "integrity": "sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==" - }, - "highlight.js-async-webpack": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/highlight.js-async-webpack/-/highlight.js-async-webpack-1.0.4.tgz", - "integrity": "sha1-wGtnv5nwSQRdYrdW5YVbCRLsYWw=" + "integrity": "sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==", + "dev": true }, "hmac-drbg": { "version": "1.0.1", @@ -8086,12 +8087,11 @@ } }, "mavon-editor": { - "version": "2.7.7", - "resolved": "https://registry.npmjs.org/mavon-editor/-/mavon-editor-2.7.7.tgz", - "integrity": "sha512-lXnYe+dztKepbv8bi2nedRqG/AwyUDF8gmkv9lHD3fpVJ1+pzAS6YILRIryKCvO9qPIOPEThHsda2DxtlzRsZA==", + "version": "2.10.4", + "resolved": "https://registry.npmjs.org/mavon-editor/-/mavon-editor-2.10.4.tgz", + "integrity": "sha512-CFsBLkgt/KZBDg+SJYe2fyYv4zClY149PiwpH0rDAiiP4ae1XNs0GC8nBsoTeipsHcebDLN1QMkt3bUsnMDjQw==", "requires": { - "highlight.js": "^9.11.0", - "highlight.js-async-webpack": "^1.0.4" + "xss": "^1.0.6" } }, "md5.js": { @@ -13455,6 +13455,15 @@ "async-limiter": "~1.0.0" } }, + "xss": { + "version": "1.0.14", + "resolved": "https://registry.npmjs.org/xss/-/xss-1.0.14.tgz", + "integrity": "sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw==", + "requires": { + "commander": "^2.20.3", + "cssfilter": "0.0.10" + } + }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", diff --git a/package.json b/package.json index 3f0f969..82256e1 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "file-saver": "^2.0.5", "image-conversion": "^2.1.1", "js-cookie": "^3.0.1", - "mavon-editor": "^2.6.17", + "mavon-editor": "^2.10.4", "postcss-px2rem": "^0.3.0", "px2rem-loader": "^0.1.9", "qs": "^6.11.2", diff --git a/src/assets/img/mini.jpg b/src/assets/img/mini.jpg index 94253d2..5ed371d 100644 Binary files a/src/assets/img/mini.jpg and b/src/assets/img/mini.jpg differ diff --git a/src/components/quill/index.vue b/src/components/quill/index.vue index ad02ce0..6a6349c 100644 --- a/src/components/quill/index.vue +++ b/src/components/quill/index.vue @@ -1,253 +1,322 @@ - diff --git a/src/setting.js b/src/setting.js index b8f4811..2e098f1 100644 --- a/src/setting.js +++ b/src/setting.js @@ -11,7 +11,7 @@ if (isDev) { jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 host = 'http://121.37.12.51/' // host = 'https://huorantech.cn/' - host = 'http://192.168.31.217:9000/'// 榕 + // host = 'http://192.168.31.217:9000/'// 榕 // host = 'http://192.168.31.51:9000/'// 赓 } else if (isPro) { jumpPath = 'https://www.huorantech.cn/judgmentPoint/' diff --git a/src/views/course/contentSettings.vue b/src/views/course/contentSettings.vue index 638a00a..a5dfa1a 100644 --- a/src/views/course/contentSettings.vue +++ b/src/views/course/contentSettings.vue @@ -1,214 +1,356 @@