From 785c7495c11b76b60aa86545eecc3ec3b870d5a5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 十月 2022 09:43:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
ruoyi-ui/src/App.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/App.vue b/ruoyi-ui/src/App.vue
index 391d951..29de49f 100644
--- a/ruoyi-ui/src/App.vue
+++ b/ruoyi-ui/src/App.vue
@@ -1,12 +1,16 @@
<template>
<div id="app">
<router-view />
+ <theme-picker />
</div>
</template>
<script>
-export default {
- name: 'App',
+import ThemePicker from "@/components/ThemePicker";
+
+export default {
+ name: "App",
+ components: { ThemePicker },
metaInfo() {
return {
title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
@@ -15,5 +19,10 @@
}
}
}
-}
+};
</script>
+<style scoped>
+#app .theme-picker {
+ display: none;
+}
+</style>
--
Gitblit v1.9.3