Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/vue/src/main.js

@@ -7,13 +7,11 @@ import axios from 'axios'
 import VueAxios from 'vue-axios'
 import VueRouter from 'vue-router'
 import store from './store/'
+import VueAwesomeSwiper from 'vue-awesome-swiper'
+
 Vue.use(VueAxios, axios)
 Vue.config.productionTip = false
 Vue.use(VueRouter)
-// axios.defaults.baseURL = '/o2o'
-/* eslint-disable no-new */
-
-import VueAwesomeSwiper from 'vue-awesome-swiper'
 Vue.use(VueAwesomeSwiper)
 
 const router = new VueRouter({
@@ -64,6 +62,7 @@ Vue.component('indemnity', require('./components/CompanyProfile/indemnity'))
 // 公司工具
 Vue.component('tool', require('./components/CompanyProfile/tool'))
 
+/* eslint-disable no-new */
 new Vue({
   el: '#app',
   router,