Merge remote-tracking branch 'origin/master'

# Conflicts:
#	QMPlusVuePage/src/view/example/rte/rte.vue

QMPlusVuePage/src/view/example/rte/rte.vue

@@ -1,39 +1,41 @@
 <template>
-    <div class="edit_container">
-        <quill-editor
-                v-model="content"
-                ref="myQuillEditor"
-                :options="editorOption"
-                @blur="onEditorBlur($event)" @focus="onEditorFocus($event)"
-                @change="onEditorChange($event)">
-        </quill-editor>
-        <button v-on:click="saveHtml">保存</button>
-    </div>
+  <div class="edit_container">
+    <quill-editor
+      :options="editorOption"
+      @blur="onEditorBlur($event)"
+      @change="onEditorChange($event)"
+      @focus="onEditorFocus($event)"
+      ref="myQuillEditor"
+      v-model="content"
+    ></quill-editor>
+    <button v-on:click="saveHtml">保存</button>
+  </div>
 </template>
 
 <script>
-    export default {
-        name: 'App',
-        data(){
-            return {
-                content: `<p>hello world</p>`,
-                editorOption: {}
-            }
-        },computed: {
-            editor() {
-                return this.$refs.myQuillEditor.quill;
-            },
-        },methods: {
-            onEditorReady(editor) { // 准备编辑器
-            },
-            onEditorBlur(){}, // 失去焦点事件
-            onEditorFocus(){}, // 获得焦点事件
-            onEditorChange(){}, // 内容改变事件
-            saveHtml:function(event){
-                alert(this.content);
-            }
-        }
+export default {
+  name: 'App',
+  data() {
+    return {
+      content: `<p>hello world</p>`,
+      editorOption: {}
     }
+  },
+  computed: {
+    editor() {
+      return this.$refs.myQuillEditor.quill
+    }
+  },
+  methods: {
+    // onEditorReady(editor) { // 准备编辑器
+
+    // },
+    onEditorBlur() {}, // 失去焦点事件
+    onEditorFocus() {}, // 获得焦点事件
+    onEditorChange() {}, // 内容改变事件
+    saveHtml() {} // 保存方法
+  }
+}
 </script>
 
 <style>

QMPlusVuePage/src/view/example/upload/upload.vue

@@ -91,15 +91,16 @@ export default {
       }
       return (isPng || isJPG) && isLt2M
     },
-    uploadSuccess(res, file) {
-      console.log(res, file)
+    uploadSuccess(res) {
       this.$message({
         type: 'success',
         message: '上传成功'
       })
-      this.getTableData()
+      if(res.success){
+        this.getTableData()
+      }
     },
-    uploadError(err) {
+    uploadError() {
       this.$message({
         type: 'error',
         message: '上传失败'