From cfb52200f39d0c659eb884a1df331dd997af7e72 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期三, 10 三月 2021 09:06:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main.js | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main.js b/src/main.js
index cf57dcb..1d1c6ac 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,4 @@
-// import 'babel-polyfill'
+import 'babel-polyfill'
import Vue from 'vue'
import App from './App.vue'
import router from './router'
@@ -11,10 +11,13 @@
import 'leaflet/dist/leaflet.css'
import L from 'leaflet'
import 'leaflet.markercluster'
-import 'leaflet-canvas-markers'
+// import 'leaflet-canvas-markers'
+import './components/plugin/Leaflet.GridLayer.FadeOut'
+
+import './components/plugin/leaflet-canvas-markers'
Vue.config.productionTip = false
-Vue.use(ElementUI, { size: 'small' })
+Vue.use(ElementUI)
Vue.prototype.$cancels = []
Vue.prototype.L = L
// 娉ㄥ唽鎸囦护
@@ -26,7 +29,7 @@
// 寮�鍙戠幆澧冧笅鍔犺浇鍋囨暟鎹�
if (process.env.VUE_APP_MOCK && process.env.NODE_ENV === 'development') {
console.warn('褰撳墠澶勪簬mock鏁版嵁璇锋眰锛�')
- require('./mock')
+ // require('./mock')
}
window.vm = new Vue({
router,
--
Gitblit v1.8.0