Merge branch 'yoona' into 'master'

解决博客markdown上传图片冲突

See merge request pigbigbig/beyond-clouds-front!43

pages/blog/release/index.vue

@@ -359,11 +359,7 @@
         // 第一步.将图片上传到服务器.
         let formdata  = new window.FormData();
         formdata.append('file', file);
-<<<<<<< pages/blog/release/index.vue
         formdata.append('type', 4);
-=======
-        formdata.append('type', 5);
->>>>>>> pages/blog/release/index.vue
         this.$axios.$post(config.api.post.Resource.file, formdata)
           .then((res) => {
             console.log(res);