Merge remote-tracking branch 'origin/ScrmStore' into ScrmStore

src/components/Editor/wang.vue

@@ -28,7 +28,7 @@ export default {
       if (this.editor == null) {
         this.editor = new E(that.$refs.editor1)
         this.editor.config.uploadImgServer = this.uploadUrl;
-        this.editor.config.uploadImgMaxSize = 2 * 1024 * 1024 // 2M
+        this.editor.config.uploadImgMaxSize = 6 * 1024 * 1024 // 2M
         this.editor.config.uploadImgAccept = ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp']
         this.editor.config.uploadFileName = 'fileName'
         this.editor.config.zIndex = 1
@@ -38,7 +38,6 @@ export default {
         this.editor.config.uploadImgMaxLength = 5;
         this.editor.config.uploadImgConcurrent = 1;
 
-        // 重写图片上传逻辑以获取选择的图片数量
         this.editor.config.customUploadImg = function (files, insertImgFn) {
           // 获取选择的图片数量
           that.selectedImageCount = files.length;