Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx

main.js

@@ -20,3 +20,14 @@ import httpApi from '@/common/http.api.js'
 Vue.use(httpApi, app)
 
 app.$mount()
+
+
+
+// http拦截器，将此部分放在new Vue()和app.$mount()之间，才能App.vue中正常使用
+import httpInterceptor from '@/common/http.interceptor.js'
+Vue.use(httpInterceptor, app)
+
+// http接口API集中管理引入部分
+import httpApi from '@/common/http.api.js'
+Vue.use(httpApi, app)
+app.$mount()