From 1348c11eceeecc172e2a069b67e197de90aa5827 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 11 三月 2021 10:00:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main.js | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main.js b/src/main.js
index 96479c7..b2139c0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,3 +1,4 @@
+// import 'babel-polyfill'
import Vue from 'vue'
import App from './App.vue'
import router from './router'
@@ -7,23 +8,27 @@
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'
Vue.config.productionTip = false
-Vue.use(ElementUI, { size: 'small' })
-// 娉ㄥ唽鎸囦护
+Vue.use(ElementUI)
+Vue.prototype.$cancels = []
+Vue.prototype.L = L
+// 娉ㄥ唽鎸囦护7
// registerDirectives(Vue)
// 娉ㄥ唽echarts鐨偆
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,
store,
- render: h => h(App),
+ render: h => h(App)
}).$mount('#app')
--
Gitblit v1.8.0