From 51b1f5e0d6ecefe6b57ca46e9c41635d9ea7547f 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 16:32:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8layout=E4=B8=8B=E9=9D=A2=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=AD=90=E5=BA=94=E7=94=A8=E4=B8=8D=E8=83=BD=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8router-view=E7=9A=84=E6=8F=92=E6=A7=BD=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=A6=82=E6=9E=9C=E4=B8=BA=E5=AD=90=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8router-view?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=BB=E5=BA=94=E7=94=A8=E4=B8=8B=E7=9A=84=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E6=89=8D=E4=BD=BF=E7=94=A8=E6=8F=92=E6=A7=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/src/layouts/index.vue | 100 ++++++++++++++++++++-----------------
 main/src/micro/index.js    |   2 +-
 main/src/router/index.js   |   2 +-
 main/src/views/subApp.vue  |   2 +-
 4 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/main/src/layouts/index.vue b/main/src/layouts/index.vue
index 918db55..dbbecbe 100644
--- a/main/src/layouts/index.vue
+++ b/main/src/layouts/index.vue
@@ -6,57 +6,59 @@
  * @LastEditTime: 2025-01-17 16:36:25
 -->
 <template>
-  <router-view v-slot="{ Component, route }">
-    <transition name="fade-slide" mode="out-in" appear>
-      <keep-alive v-if="isReload" :include="cacheRoutes">
-        <div class="layout">
-          <div class="layout-header">
-            <div class="layout-header-top">
-              <div class="layout-header-top-left">
-                <span>您好，欢迎来到农业产业服务平台</span>
-                <el-tag>运营大屏</el-tag>
-                <el-tag>产业服务APP</el-tag>
-                <el-tag>产业运营管理</el-tag>
-              </div>
-              <div class="layout-header-top-right">
-                <span>商家中心</span>
-                <span>个人中心</span>
-                <span>返回首页</span>
-              </div>
+  <div class="layout">
+    <div class="layout-header">
+      <div class="layout-header-top">
+        <div class="layout-header-top-left">
+          <span>您好，欢迎来到农业产业服务平台</span>
+          <el-tag>运营大屏</el-tag>
+          <el-tag>产业服务APP</el-tag>
+          <el-tag>产业运营管理</el-tag>
+        </div>
+        <div class="layout-header-top-right">
+          <span>商家中心</span>
+          <span>个人中心</span>
+          <span>返回首页</span>
+        </div>
+      </div>
+      <div class="layout-header-bottom">
+        <div class="layout-header-bottom-left">
+          <div class="layout-header-bottom-search">
+            <div class="title">农业产业服务平台</div>
+            <el-input v-model="keyword" placeholder="请输入关键词进行搜索"></el-input>
+            <el-button type="primary" @click="Search">搜索</el-button>
+          </div>
+          <el-menu ellipsis class="layout-header-bottom-menu" mode="horizontal">
+            <app-link v-for="(item, index) in meuns" :key="index" :to="item.path">
+              <el-menu-item>{{ item.label }}</el-menu-item>
+            </app-link>
+          </el-menu>
+        </div>
+        <div class="layout-header-bottom-right">
+          <div class="layout-header-bottom-right-qr">
+            <div class="layout-header-bottom-right-qr-img">
+              <img :src="qrImg" alt="" />
+              <p>下载数农App</p>
             </div>
-            <div class="layout-header-bottom">
-              <div class="layout-header-bottom-left">
-                <div class="layout-header-bottom-search">
-                  <div class="title">农业产业服务平台</div>
-                  <el-input v-model="keyword" placeholder="请输入关键词进行搜索"></el-input>
-                  <el-button type="primary" @click="Search">搜索</el-button>
-                </div>
-                <el-menu ellipsis class="layout-header-bottom-menu" mode="horizontal">
-                  <app-link v-for="(item, index) in meuns" :key="index" :to="item.path">
-                    <el-menu-item>{{ item.label }}</el-menu-item>
-                  </app-link>
-                </el-menu>
-              </div>
-              <div class="layout-header-bottom-right">
-                <div class="layout-header-bottom-right-qr">
-                  <div class="layout-header-bottom-right-qr-img">
-                    <img :src="qrImg" alt="" />
-                    <p>下载数农App</p>
-                  </div>
-                  <div class="layout-header-bottom-right-qr-img">
-                    <img :src="qrImg" alt="" />
-                    <p>打开数农小程序</p>
-                  </div>
-                </div>
-                <p>使用数农手机服务，更方便</p>
-              </div>
+            <div class="layout-header-bottom-right-qr-img">
+              <img :src="qrImg" alt="" />
+              <p>打开数农小程序</p>
             </div>
           </div>
-          <component :is="useWrapComponents(Component, route)" :key="route.path" />
+          <p>使用数农手机服务，更方便</p>
         </div>
-      </keep-alive>
-    </transition>
-  </router-view>
+      </div>
+    </div>
+    <!-- 子应用不能使用router-view的插槽功能 -->
+    <router-view v-if="isSubApp" />
+    <router-view v-else v-slot="{ Component, route }">
+      <transition name="fade-slide" mode="out-in" appear>
+        <keep-alive v-if="isReload" :include="cacheRoutes">
+          <component :is="useWrapComponents(Component, route)" :key="route.path" />
+        </keep-alive>
+      </transition>
+    </router-view>
+  </div>
 </template>
 
 <script setup name="layout">
@@ -66,12 +68,16 @@ import { usePermissionStore } from '@/store/modules/permission';
 import { useWrapComponents } from '@/hooks/useWrapComponents';
 import { qrImg } from './base64img';
 import AppLink from './Link.vue';
+import { useRoute } from 'vue-router';
 
+const route = useRoute();
 const SettingStore = useSettingStore();
 const PermissionStore = usePermissionStore();
 const cacheRoutes = computed(() => PermissionStore.keepAliveRoutes);
 const isReload = computed(() => SettingStore.isReload);
 
+const isSubApp = computed(() => route.path.includes('sub'));
+
 const keyword = ref('');
 
 const meuns = ref([
diff --git a/main/src/micro/index.js b/main/src/micro/index.js
index 2e71ae1..4ac40ce 100644
--- a/main/src/micro/index.js
+++ b/main/src/micro/index.js
@@ -30,7 +30,7 @@ const registerGlobalMicroApps = () => {
   });
 
   start({
-    prefetch: false, // 取消预加载
+    prefetch: 'all', // 取消预加载
     sandbox: { experimentalStyleIsolation: true },
   });
 
diff --git a/main/src/router/index.js b/main/src/router/index.js
index 33fbcf7..323502d 100644
--- a/main/src/router/index.js
+++ b/main/src/router/index.js
@@ -32,7 +32,7 @@ export const constantRoutes = [
         meta: { title: '平台入口', icon: 'House' },
       },
       {
-        path: '/sub-admin/:pathMatch(.*)',
+        path: '/sub-admin/:pathMatch(.*)*',
         component: () => import('@/views/subApp.vue'),
         name: 'sub-admin',
         hidden: true,
diff --git a/main/src/views/subApp.vue b/main/src/views/subApp.vue
index 63153eb..04dd48d 100644
--- a/main/src/views/subApp.vue
+++ b/main/src/views/subApp.vue
@@ -14,7 +14,7 @@ export default {
 };
 </script>
 <style>
-#app {
+#sub-app {
   width: 100%;
 }
 </style>