From 60c4c39e7e7ac80494fe78cfdc366af01f87d95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=BC=A0=E6=B3=A2?= <1455047191@qq.com>
Date: Wed, 22 Jan 2025 10:47:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E8=B7=AF=E7=94=B1=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E8=87=B3=E5=AD=90=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/src/App.vue           |  6 ++----
 main/src/layouts/index.vue |  2 +-
 main/src/main.js           |  2 --
 main/src/micro/app.js      |  2 +-
 main/src/router/index.js   | 19 ++++++++++++++++---
 main/src/views/home.vue    |  7 +++++++
 main/src/views/subApp.vue  | 20 ++++++++++++++++++++
 7 files changed, 47 insertions(+), 11 deletions(-)
 create mode 100644 main/src/views/home.vue
 create mode 100644 main/src/views/subApp.vue

diff --git a/main/src/App.vue b/main/src/App.vue
index cab2d18..7032c14 100644
--- a/main/src/App.vue
+++ b/main/src/App.vue
@@ -1,8 +1,6 @@
 <template>
-  <div id="app">
-    <!-- <el-button v-for="item in microApps" :key="item.activeRule" type="primary" @click="gotoPage(item)">{{ item.name }}</el-button> -->
-    <router-view />
-  </div>
+  <!-- <el-button v-for="item in microApps" :key="item.activeRule" type="primary" @click="gotoPage(item)">{{ item.name }}</el-button> -->
+  <router-view />
 </template>
 
 <script setup name="App">
diff --git a/main/src/layouts/index.vue b/main/src/layouts/index.vue
index 890f824..918db55 100644
--- a/main/src/layouts/index.vue
+++ b/main/src/layouts/index.vue
@@ -81,7 +81,7 @@ const meuns = ref([
   },
   {
     label: '农事服务',
-    path: '/sub-admin/',
+    path: '/sub-admin/home',
   },
   {
     label: '涉农金融',
diff --git a/main/src/main.js b/main/src/main.js
index 9105699..7ac7581 100644
--- a/main/src/main.js
+++ b/main/src/main.js
@@ -5,11 +5,9 @@ import router from './router';
 import pinia from './store';
 import ElementPlus from 'element-plus';
 import 'element-plus/dist/index.css';
-import { registerGlobalMicroApps } from './micro';
 import { registerElIcons } from './plugins/icon';
 import './utils/permission';
 
 const app = createApp(App);
 app.use(pinia).use(router).use(ElementPlus).mount('#root');
 registerElIcons(app);
-registerGlobalMicroApps();
diff --git a/main/src/micro/app.js b/main/src/micro/app.js
index 6388c82..0a7bf91 100644
--- a/main/src/micro/app.js
+++ b/main/src/micro/app.js
@@ -69,7 +69,7 @@ export const microApps = [...leftApps, ...rightApps];
 const apps = microApps.map((item) => {
   return {
     ...item,
-    container: '#app',
+    container: '#sub-app',
     props: {
       routerBase: item.activeRule,
       getGlobalState: actions.getGlobalState,
diff --git a/main/src/router/index.js b/main/src/router/index.js
index bbf069c..33fbcf7 100644
--- a/main/src/router/index.js
+++ b/main/src/router/index.js
@@ -12,6 +12,12 @@ export const constantRoutes = [
       icon: 'Login',
     },
   },
+  {
+    path: '/platform',
+    component: () => import('@/views/index.vue'),
+    name: 'platform',
+    meta: { title: '平台入口', icon: 'House' },
+  },
   {
     path: '/',
     name: 'layout',
@@ -20,11 +26,18 @@ export const constantRoutes = [
     meta: { title: '平台入口', icon: 'House' },
     children: [
       {
-        path: '/platform',
-        component: () => import('@/views/index.vue'),
-        name: 'platform',
+        path: '/home',
+        component: () => import('@/views/home.vue'),
+        name: 'home',
         meta: { title: '平台入口', icon: 'House' },
       },
+      {
+        path: '/sub-admin/:pathMatch(.*)',
+        component: () => import('@/views/subApp.vue'),
+        name: 'sub-admin',
+        hidden: true,
+        meta: { title: '子应用入口', icon: 'House' },
+      },
     ],
   },
 ];
diff --git a/main/src/views/home.vue b/main/src/views/home.vue
new file mode 100644
index 0000000..312b8bb
--- /dev/null
+++ b/main/src/views/home.vue
@@ -0,0 +1,7 @@
+<template>
+  <div>home</div>
+</template>
+
+<script setup></script>
+
+<style></style>
diff --git a/main/src/views/subApp.vue b/main/src/views/subApp.vue
new file mode 100644
index 0000000..63153eb
--- /dev/null
+++ b/main/src/views/subApp.vue
@@ -0,0 +1,20 @@
+<template>
+  <div id="sub-app"></div>
+</template>
+
+<script>
+import { registerGlobalMicroApps } from '@/micro';
+export default {
+  mounted() {
+    if (!window.qiankunStarted) {
+      window.qiankunStarted = true;
+      registerGlobalMicroApps();
+    }
+  },
+};
+</script>
+<style>
+#app {
+  width: 100%;
+}
+</style>