direv/admin_new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

F006 W3.xC + W5.x.x+1/3/4/5 + W6 + W7 完整批次 (17 commits) #1

Merged
direv merged 24 commits from develop into main 2026-07-05 13:07:34 +08:00
Conversation 0 Commits 24 Files Changed 70 +11 -2
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6a0736d70c - Show all commits

BIN
src/assets/logo-jubian-light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

7
src/components/AppLayout/AppLayout.vue
View File

@ -11,6 +11,9 @@ import { computed, onMounted, ref } from 'vue'
import { useRouter, useRoute } from 'vue-router' import { useRouter, useRoute } from 'vue-router'
import ThemePicker from '@/components/ThemePicker/ThemePicker.vue' import ThemePicker from '@/components/ThemePicker/ThemePicker.vue'
import { useUserStore } from '@/stores/user' import { useUserStore } from '@/stores/user'
import { useThemeStore } from '@/stores/theme'
import logoUrl from '@/assets/logo-jubian.png'
import logoLightUrl from '@/assets/logo-jubian-light.png'
import { useMenuStore, type MenuItem } from '@/stores/menu' import { useMenuStore, type MenuItem } from '@/stores/menu'
import { import {
Odometer, Box, Document, ChatLineSquare, ChatDotRound, OfficeBuilding, Odometer, Box, Document, ChatLineSquare, ChatDotRound, OfficeBuilding,
@ -24,6 +27,8 @@ import {
const router = useRouter() const router = useRouter()
const route = useRoute() const route = useRoute()
const userStore = useUserStore() const userStore = useUserStore()
const themeStore = useThemeStore()
const logoSrc = computed(() => themeStore.current === 'dark' ? logoLightUrl : logoUrl)
const menuStore = useMenuStore() const menuStore = useMenuStore()
const collapsed = computed(() => menuStore.collapsed) const collapsed = computed(() => menuStore.collapsed)
@ -236,7 +241,7 @@ onMounted(loadBadges)
<aside class="rr-sidebar"> <aside class="rr-sidebar">
<!-- 品牌 + 搜索框(只在展开时显示) --> <!-- 品牌 + 搜索框(只在展开时显示) -->
<div class="rr-sidebar-brand" v-if="!collapsed"> <div class="rr-sidebar-brand" v-if="!collapsed">
<img class="rr-sidebar-logo" src="@/assets/logo-jubian.png" alt="巨变" /> <img class="rr-sidebar-logo" :src="logoSrc" alt="巨变" />
<span class="rr-sidebar-name">产业互联网平台运营后台</span> <span class="rr-sidebar-name">产业互联网平台运营后台</span>
</div> </div>

6
src/modules/auth/LoginView.vue
View File

@ -17,11 +17,15 @@ import qs from 'qs'
import axios from 'axios' import axios from 'axios'
import { useUserStore } from '@/stores/user' import { useUserStore } from '@/stores/user'
import { useThemeStore } from '@/stores/theme' import { useThemeStore } from '@/stores/theme'
import { computed } from 'vue'
import logoUrl from '@/assets/logo-jubian.png'
import logoLightUrl from '@/assets/logo-jubian-light.png'
const router = useRouter() const router = useRouter()
const route = useRoute() const route = useRoute()
const userStore = useUserStore() const userStore = useUserStore()
const themeStore = useThemeStore() const themeStore = useThemeStore()
const logoSrc = computed(() => themeStore.current === 'dark' ? logoLightUrl : logoUrl)
const form = reactive({ const form = reactive({
username: 'admin', username: 'admin',
@ -99,7 +103,7 @@ async function onLogin() {
<!-- 左 65%: 品牌区 --> <!-- 左 65%: 品牌区 -->
<div class="rr-login-left"> <div class="rr-login-left">
<div class="rr-login-brand"> <div class="rr-login-brand">
<img class="rr-login-logo" src="@/assets/logo-jubian.png" alt="巨变" /> <img class="rr-login-logo" :src="logoSrc" alt="巨变" />
<div class="rr-login-product-name">产业互联网平台运营后台</div> <div class="rr-login-product-name">产业互联网平台运营后台</div>
</div> </div>