From 6d37dc93b40c6935f65ec4c68b7f6985c9d3bad5 Mon Sep 17 00:00:00 2001
From: jxmanxk <312142485@qq.com>
Date: 星期二, 23 一月 2024 17:44:14 +0800
Subject: [PATCH] Merge branch 'xio_dev'

---
 src/main.js |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main.js b/src/main.js
index b5688cd..84fe861 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2,9 +2,10 @@
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 
 // 鐩存帴浠巆ore-js寮曞叆鍏ㄥ眬鐨刾olyfill
-import 'core-js/fn/promise';
+import 'core-js/fn/promise'
 
 import Vue from 'vue'
+import Element from 'element-ui'
 import App from './App'
 
 import router from './router' // 璺敱琛�
@@ -15,6 +16,12 @@
 import Req from './utils/jun_httpInstall' // http 璇锋眰
 import fn from './utils/g_fn_install'
 
+import 'element-ui/lib/theme-chalk/index.css'
+import 'element-ui/lib/theme-chalk/display.css'
+import '@/icons' // icon
+
+Vue.prototype.isTestView = config.isTestView
+
 Vue.config.productionTip = false
 
 Vue.config.devtools = config.devtools
@@ -23,7 +30,11 @@
   require('./mock.js')
 }
 Vue.config.productionTip = false
-// Vue.use(element)
+// 瑙e喅elementui涓嬫媺鎼滅储妗嗗湪ios涓婂敜涓嶈捣杞敭鐩�
+import ElementUI from '@/utils/element-ui-preprocessing'
+
+Vue.use(Element)
+Vue.use(ElementUI)
 Vue.use(Axios)
 Vue.use(filter)
 Vue.use(Req)

--
Gitblit v1.8.0