From c4044fb60e53e5c83da4ee645d5160f914e422a3 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期五, 05 三月 2021 16:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main.js | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main.js b/src/main.js
index 96479c7..95591a3 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,10 +8,15 @@
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'
+import 'leaflet-canvas-markers'
Vue.config.productionTip = false
-Vue.use(ElementUI, { size: 'small' })
+Vue.use(ElementUI)
+Vue.prototype.$cancels = []
+Vue.prototype.L = L
// 娉ㄥ唽鎸囦护
// registerDirectives(Vue)
@@ -18,12 +24,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,
store,
- render: h => h(App),
+ render: h => h(App)
}).$mount('#app')
--
Gitblit v1.8.0