From ae038d50b068a02c4fe53725095dc952bf75b797 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 15 Dec 2021 17:36:21 +0800
Subject: [PATCH] 冲突

---
 src/main.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.js b/src/main.js
index ec145f3..27a4777 100644
--- a/src/main.js
+++ b/src/main.js
@@ -31,6 +31,9 @@
 
 import divForms from '@/divForms/divForms'
 
+// 手机弹窗
+import mobileDivForms from '@/mobileDivForms/mobileDivForms'
+
 Vue.prototype.$echarts = echarts
 
 console.log(DcCore)
@@ -41,9 +44,6 @@
 global.echarts = echarts // 将DC提升到全局变量，方便在工程中直接使用
 
 DC.divForms = divForms
-
-//手机弹窗
-import mobileDivForms from '@/mobileDivForms/mobileDivForms'
 DC.mobileDivForms = mobileDivForms
 
 DC.use(DcCore) // 安装DC核心库

--
Gitblit v1.9.3