Merge branch 'feature/GFRS-232【待确定】业绩查询' into release/0803

# Conflicts:
#	src/main.js
#	src/router/ebiz/index.js

src/main.js

@@ -12,40 +12,25 @@ import noMoreClick from '@/directive/noMoreClick'
 import vueHashCalendar from 'vue-hash-calendar'
 import 'vue-hash-calendar/lib/vue-hash-calendar.css'
 
-import {
-  Cell, CellGroup,
-  DatetimePicker ,
-  Popup ,
-  Picker,
-  Col, 
-  Row,
-  Tab, 
-  Tabs,
-  NavBar,
-  Toast,
-  Button,
-  Dialog,
-  Icon,
-  Lazyload 
-} from 'vant'
-Vue.use(Cell);
+import { Cell, CellGroup, DatetimePicker, Popup, Picker, Col, Row, Tab, Tabs, NavBar, Toast, Button, Dialog, Icon, Lazyload } from 'vant'
+Vue.use(Cell)
 Vue.use(CellGroup)
-Vue.use(DatetimePicker);
+Vue.use(DatetimePicker)
 Vue.use(Popup)
 Vue.use(Picker)
 Vue.use(Col)
-Vue.use(Row);
+Vue.use(Row)
 Vue.use(Tab)
-Vue.use(Tabs);
+Vue.use(Tabs)
 Vue.use(Icon)
 Vue.use(vueHashCalendar)
-Vue.use(NavBar);
+Vue.use(NavBar)
 Vue.use(Toast)
 Vue.use(Button)
 Vue.use(Dialog)
 Vue.use(Lazyload, {
-  lazyComponent: true,
-});
+  lazyComponent: true
+})
 
 Vue.prototype.$assetsUrl = config.assetsUrl
 Vue.prototype.$mainUrl = config.mainUrl
@@ -56,7 +41,7 @@ Vue.directive('no-more-click', noMoreClick)
 //解决ios移动端input调软键盘问题
 let isIphone = navigator.userAgent.indexOf('iPhone') != -1
 if (isIphone) {
-  FastClick.prototype.focus = function (targetElement) {
+  FastClick.prototype.focus = function(targetElement) {
     let length
     if (
       isIphone &&
@@ -100,14 +85,12 @@ if (process.env.VUE_APP_FLAG != 'prd') {
 // Eruda.init()
 
 // 注册过滤器
-Object.keys(Filters).forEach(function (k) {
+Object.keys(Filters).forEach(function(k) {
   Vue.filter(k, Filters[k])
 })
 
 //权限控制
-import {
-  permission
-} from '@/assets/js/utils/permission'
+import { permission } from '@/assets/js/utils/permission'
 permission()
 
 //ios点击300毫秒时延
@@ -118,4 +101,4 @@ new Vue({
   router,
   store,
   render: h => h(App)
-}).$mount('#app')
+}).$mount('#app')