github
/
vue-manage-system
mirror of https://github.com/lin-xin/vue-manage-system
1
0
Fork 0
Code Issues Releases Wiki Activity

合并冲突

pull/38/head
lin-xin 2017-03-01 11:28:25 +08:00
parent bd7647007d
commit f1567590ac
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/index.js
View File

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

1
src/components/page/Upload.vue
View File

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