Merge branch 'dev' of 112.124.100.131:GFRS/ebiz-h5 into dev

# Conflicts:
#	src/views/ebiz/my/UserInfo.vue
#	src/views/ebiz/sale/SignatureConfirmation.vue
#	src/views/ebiz/sale/SignatureOfElectronic.vue

src/main.js

@@ -9,6 +9,7 @@ import Jump from '@/assets/js/utils/jump'
 import utils from '@/assets/js/business-common'
 import config from '@/config'
 import noMoreClick from '@/directive/noMoreClick'
+
 //全局注册vant常用组件
 import { Toast, Button, Dialog, Icon } from 'vant'
 
@@ -18,6 +19,7 @@ Vue.use(Toast)
 Vue.use(Button)
 Vue.use(Dialog)
 Vue.prototype.$assetsUrl = config.assetsUrl
+Vue.prototype.$mainUrl = config.mainUrl
 // 全局 防重复点击
 Vue.directive('no-more-click', noMoreClick)
 //解决ios移动端input调软键盘问题
@@ -76,5 +78,3 @@ new Vue({
   store,
   render: h => h(App)
 }).$mount('#app')
-import baseUrl from './config/index'
-console.log('--服务器url:', baseUrl.apiDomain)