合并冲突

config/index.js

@@ -27,15 +27,7 @@ module.exports = {
         autoOpenBrowser: true,
         assetsSubDirectory: 'static',
         assetsPublicPath: '/',
-        proxyTable: {
-            '/api':{
-                target:'http://jsonplaceholder.typicode.com',
-                changeOrigin:true,
-                pathRewrite:{
-                    '^/api':''
-                }
-            }
-        },
+        proxyTable: {},
         // CSS Sourcemaps off by default because relative paths are "buggy"
         // with this option, according to the CSS-Loader README
         // (https://github.com/webpack/css-loader#sourcemaps)

src/components/page/Upload.vue

@@ -41,6 +41,7 @@
 </template>
 
 <script>
+    import axios from 'axios';
     import VueCoreImageUpload  from 'vue-core-image-upload';
     export default {
         data: function(){