diff --git a/package.json b/package.json index 75121f7..6db1260 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "dayjs": "^1.11.13", "echarts": "^5.5.1", "gsap": "^3.12.5", + "js-base64": "^3.7.7", "localforage": "^1.10.0", "lodash": "^4.17.21", "lunar-typescript": "^1.7.5", diff --git a/src/layout/GlobalMenu.tsx b/src/layout/GlobalMenu.tsx index 9dfa9de..89a954f 100644 --- a/src/layout/GlobalMenu.tsx +++ b/src/layout/GlobalMenu.tsx @@ -352,7 +352,7 @@ export default defineComponent(() => { text: block.text, background: block.background, color: block.color, - type: block.color ? 1 : 0 + type: !block.icon ? 1 : 0 } router.go('global-adder') useAdderPageStore().type = 2 diff --git a/src/layout/adder/useAdderPageStore.tsx b/src/layout/adder/useAdderPageStore.tsx index 78a90b6..3ecc817 100644 --- a/src/layout/adder/useAdderPageStore.tsx +++ b/src/layout/adder/useAdderPageStore.tsx @@ -36,7 +36,7 @@ export default defineStore('adderPage', () => { const isSearch = ref(false) const widgetSearchWords = ref('') const gameSearch = ref('') - const editBlockItem = ref(null) + const editBlockItem = ref(null) request('GET', '/api/app/hotAppTypes').then((res) => { categoryList.value = res.map((el) => ({ id: el.id, @@ -64,9 +64,10 @@ export default defineStore('adderPage', () => { } const search = (keywords: string) => { - if (keywords === '') { + if (!keywords) { + if (isSearch.value) getApps(selectType.value) + isSearch.value = false - getApps(selectType.value) return } isSearch.value = true diff --git a/src/layout/background/BackgroundPage.tsx b/src/layout/background/BackgroundPage.tsx index 2a47b51..7c45d43 100644 --- a/src/layout/background/BackgroundPage.tsx +++ b/src/layout/background/BackgroundPage.tsx @@ -23,22 +23,7 @@ export default defineComponent(() => { const settings = useSettingsStore() return () => (
- {/*
所属模式
- }} - > -