merge

src/main.js

@@ -5,7 +5,7 @@ import Cookies from 'js-cookie'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 
 import Element from 'element-ui'
-import 'element-ui/lib/theme-chalk/index.css'
+import './styles/element-variables.scss'
 
 import '@/styles/index.scss' // global css
 
@@ -15,19 +15,22 @@ import router from './router'
 
 import i18n from './lang' // Internationalization
 import './icons' // icon
-import './errorLog' // error log
 import './permission' // permission control
-import './mock' // simulation data
+import './utils/errorLog' // error log
 
 import * as filters from './filters' // global filters
 
 import VueAnalytics from 'vue-analytics'
+import { mockXHR } from '../mock' // simulation data
 
 Vue.use(VueAnalytics, {
   id: 'UA-109340118-1',
   router
 })
 
+// mock api in github pages site build
+if (process.env.NODE_ENV === 'production') { mockXHR() }
+
 Vue.use(Element, {
   size: Cookies.get('size') || 'medium', // set element-ui default size
   i18n: (key, value) => i18n.t(key, value)