Compare commits

..

5 Commits

Author SHA1 Message Date
expdsn 68ab5c9a4e svae 2024-09-29 16:18:02 +08:00
expdsn 8610ae6f57 Merge commit 'ca3e3dec19a3500457d50011dbb4b71fdd3c33d5' into weather 2024-09-29 16:17:42 +08:00
expdsn 81284f6799 save 2024-09-29 16:16:53 +08:00
expdsn 5dddc19d76 save 2024-09-29 15:31:47 +08:00
expdsn 1eb9a6e0d6 Merge commit '5c3bd6b7b3d480bfaef1f5cc40995bb94a4388a5' into weather 2024-09-29 15:30:46 +08:00
4 changed files with 33 additions and 39 deletions

View File

@ -60,8 +60,8 @@ export default defineComponent(() => {
<div class="flex justify-between items-center py-4"> <div class="flex justify-between items-center py-4">
<Button type="primary" icon={<SwapOutlined />} <Button type="primary" icon={<SwapOutlined />}
onClick={()=> { onClick={()=> {
router.path = '' router.go ('')
router.path = 's2-background'
}}> }}>
</Button> </Button>

View File

@ -3,8 +3,8 @@ import { defineComponent } from "vue";
export default defineComponent({ export default defineComponent({
setup() { setup() {
return ( return (
<div> <div class={"w-full h-full bg-red-300"}>
background
</div> </div>
) )
} }

View File

@ -52,8 +52,6 @@ export default defineComponent(() => {
<Transition name="settings"> <Transition name="settings">
{show.value && ( {show.value && (
<div class="absolute left-6 bottom-20 w-[600px] h-[480px] rounded-lg overflow-hidden shadow-2xl flex"> <div class="absolute left-6 bottom-20 w-[600px] h-[480px] rounded-lg overflow-hidden shadow-2xl flex">
{router.path.startsWith('settings-') ? (
<>
<div class="w-[200px] p-4 h-full bg-white/60 backdrop-blur flex flex-col"> <div class="w-[200px] p-4 h-full bg-white/60 backdrop-blur flex flex-col">
<div <div
class={ class={
@ -79,14 +77,9 @@ export default defineComponent(() => {
<SettingsTab label="问题反馈" path="settings-fallback" /> <SettingsTab label="问题反馈" path="settings-fallback" />
</div> </div>
<Content /> <Content />
</>
) : router.path.startsWith('s2') ? (
<>
<div class="w-full h-full flex justify-center items-center bg-red-300"></div>
</>
) : (
''
)}
</div> </div>
)} )}
</Transition> </Transition>

View File

@ -1,7 +1,7 @@
import { defineStore } from 'pinia' import { defineStore } from 'pinia'
import { computed, ref, watch } from 'vue' import { computed, ref, watch } from 'vue'
export type GlobalStr = 'search' | 'block' | 'adder' | 'login' export type GlobalStr = 'search' | 'block' | 'adder' | 'login' | 'background'
export type SettingStr = export type SettingStr =
| 'user' | 'user'
| 'background' | 'background'
@ -13,6 +13,7 @@ export type SettingStr =
| 'dock' | 'dock'
| 'reset' | 'reset'
| 'fallback' | 'fallback'
export type CustomStr = 'background'
export type RouteStr = '' | `widget-${string}` | `global-${GlobalStr}` | `settings-${SettingStr}` export type RouteStr = '' | `widget-${string}` | `global-${GlobalStr}` | `settings-${SettingStr}`
export default defineStore('router', () => { export default defineStore('router', () => {