Merge remote-tracking branch 'origin/master'

dangan-ui/src/api/dangan/collection.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 登录方法
+// 图片上传
 export function collectSaves(data) {
   return request({
     url: '/dangan/collect/saves',
@@ -8,6 +8,7 @@ export function collectSaves(data) {
       'Content-Type': 'multipart/form-data',
       repeatSubmit: false
     },
+    timeout: 100000000,
     method: 'post',
     data: data
   })

dangan-ui/src/views/dangan/collection/index.vue

@@ -84,7 +84,7 @@
         </div>
 
         <div v-show="upload.shelfId" style="width: 360px;margin-left: 20px;">
-          <el-upload :show-file-list="false"
+          <el-upload :show-file-list="false" :fileSize="200"
                      ref="upload"
                      action="#"
                      drag