From 6cdcf30b52502fa2b7db21064c40b7193bf7e25f Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期四, 25 二月 2021 10:55:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main.js | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main.js b/src/main.js
index 82425e2..45c8a84 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,15 +1,21 @@
+// import 'babel-polyfill'
import Vue from 'vue'
import App from './App.vue'
-// import router from './router'
+import router from './router'
import store from './store'
// import registerDirectives from './directive'
import echarts from 'echarts'
import echartsDarkTheme from '@/styles/theme-dark/echarts/theme.json'
import ElementUI from 'element-ui'
-
+import 'element-ui/lib/theme-chalk/index.css'
+import 'leaflet/dist/leaflet.css'
+import L from 'leaflet'
+import 'leaflet.markercluster'
Vue.config.productionTip = false
Vue.use(ElementUI, { size: 'small' })
+Vue.prototype.$cancels = []
+Vue.prototype.L = L
// 娉ㄥ唽鎸囦护
// registerDirectives(Vue)
@@ -17,12 +23,12 @@
echarts.registerTheme('dark', echartsDarkTheme)
// 寮�鍙戠幆澧冧笅鍔犺浇鍋囨暟鎹�
-if (process.env.NODE_ENV === 'development') {
- console.log('褰撳墠澶勪簬寮�鍙戞ā寮忥紒')
+if (process.env.VUE_APP_MOCK && process.env.NODE_ENV === 'development') {
+ console.warn('褰撳墠澶勪簬mock鏁版嵁璇锋眰锛�')
+ require('./mock')
}
-
window.vm = new Vue({
- // router,
+ router,
store,
- render: h => h(App),
+ render: h => h(App)
}).$mount('#app')
--
Gitblit v1.8.0