From e0780b7dadb1d785bfae01e2c1d2fe8ccf032909 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期四, 05 十二月 2024 13:46:55 +0800
Subject: [PATCH] Merge branch 'master' into test

---
 src/main.ts |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index a681408..c036b4c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -5,13 +5,13 @@
 import router from '/@/router/index';
 import pinia from '/@/stores/index';
 import other from '/@/utils/other';
-
+import '/@/extend';
 import * as ElementPlusIconsVue from '@element-plus/icons-vue';
 import ElementPlus from 'element-plus';
-import VueGridLayout from 'vue-grid-layout';
 import { initBackEndControlRoutes } from './router/backEnd';
 import '/@/theme/index.scss';
-import "@amap/amap-jsapi-types";
+import '@amap/amap-jsapi-types';
+import { getAllData } from './stores/chatRoom';
 
 const app = createApp(App);
 for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
@@ -20,7 +20,12 @@
 directive(app);
 other.elSvg(app);
 
+console.log(123)
+
 (async function () {
 	await initBackEndControlRoutes();
-	app.use(pinia).use(router).use(ElementPlus).use(i18n).use(VueGridLayout).mount('#app');
+	app.use(pinia).use(router).use(ElementPlus).use(i18n).mount('#app');
 })();
+
+// 鑾峰彇鍏ㄥ眬鏁版嵁
+getAllData();

--
Gitblit v1.9.3