From 5a1616f169d75ece07d2d12a8edac3e5f660a920 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 08 九月 2022 09:36:16 +0800
Subject: [PATCH] 合并
---
src/App.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index c738754..9227320 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,12 +7,11 @@
<!-- <router-view v-if="!$route.meta.iskeepAlive" v-slot="{ Component }">-->
<!-- <transition name="fade" mode="in-out">-->
<!-- <keep-alive :exclude="excludeList" :include="includeList">-->
- <!-- <component :is="Component" :key="$route.id"></component>-->
+ <!-- <components :is="Component" :key="$route.id"></components>-->
<!-- </keep-alive>-->
<!-- </transition>-->
<!-- </router-view>-->
<el-config-provider :size="getGlobalComponentSize" :locale="i18nLocale">
- <router-view v-show="themeConfig.lockScreenTime > 1" />
<router-view v-show="themeConfig.lockScreenTime > 1" />
<LockScreen v-if="themeConfig.isLockScreen" />
<Setings ref="setingsRef" v-show="themeConfig.lockScreenTime > 1" />
--
Gitblit v1.9.2