diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue index 1eb4800..e245019 100644 --- a/src/renderer/src/App.vue +++ b/src/renderer/src/App.vue @@ -1,9 +1,31 @@ - + + + diff --git a/src/renderer/src/components/NavBar.vue b/src/renderer/src/components/NavBar.vue index a5f0461..57a8b20 100644 --- a/src/renderer/src/components/NavBar.vue +++ b/src/renderer/src/components/NavBar.vue @@ -19,6 +19,19 @@
+
+ ⬅ +
关于
@@ -31,19 +44,26 @@ import config from "config" import { PopupMenu } from "@/bridge/PopupMenu" const router = useRouter() +const route = useRoute() const isFullScreen = ref(false) onBeforeMount(async () => { isFullScreen.value = await api.call("BasicCommand.isFullscreen") }) + +const isHome = computed(() => { + if (route?.meta?.home) { + return true + } + return false +}) + +function back() { + router.back() +} + const onClickMenu = e => { const menu = new PopupMenu([ { - label: "返回", - async click() { - router.back() - }, - }, - { label: isFullScreen.value ? "取消全屏" : "全屏", async click() { isFullScreen.value = await api.call("BasicCommand.fullscreen") diff --git a/src/renderer/src/layouts/default.vue b/src/renderer/src/layouts/default.vue index 90d69a4..f8c6000 100644 --- a/src/renderer/src/layouts/default.vue +++ b/src/renderer/src/layouts/default.vue @@ -1,10 +1,9 @@ - + diff --git a/src/renderer/src/pages/_ui/Browser.vue b/src/renderer/src/pages/_ui/Browser.vue index aaa300a..f5136be 100644 --- a/src/renderer/src/pages/_ui/Browser.vue +++ b/src/renderer/src/pages/_ui/Browser.vue @@ -3,8 +3,9 @@ import { onBeforeMount, onBeforeUnmount, onMounted, ref, useTemplateRef, nextTic import { PopupMenu } from "@/bridge/PopupMenu" defineOptions({ - title: "替你关于", - bg: "bg" + title: "浏览器", + index: 2, + bg: "bg", }) // const PlaceHolderRef = useTemplateRef("PlaceHolder") diff --git a/src/renderer/src/pages/about/index.vue b/src/renderer/src/pages/about/index.vue index 0cd85c0..88bdcda 100644 --- a/src/renderer/src/pages/about/index.vue +++ b/src/renderer/src/pages/about/index.vue @@ -31,6 +31,7 @@ definePage({ diff --git a/src/renderer/src/pages/index copy.vue b/src/renderer/src/pages/index copy.vue new file mode 100644 index 0000000..c573878 --- /dev/null +++ b/src/renderer/src/pages/index copy.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/renderer/src/pages/index.vue b/src/renderer/src/pages/index.vue index 9e4fe7f..00c6a90 100644 --- a/src/renderer/src/pages/index.vue +++ b/src/renderer/src/pages/index.vue @@ -1,141 +1,13 @@ - - diff --git a/src/renderer/typed-router.d.ts b/src/renderer/typed-router.d.ts index e9701c5..6ed6a79 100644 --- a/src/renderer/typed-router.d.ts +++ b/src/renderer/typed-router.d.ts @@ -21,5 +21,6 @@ declare module 'vue-router/auto-routes' { '/': RouteRecordInfo<'/', '/', Record, Record>, '/[...all]': RouteRecordInfo<'/[...all]', '/:all(.*)', { all: ParamValue }, { all: ParamValue }>, 'about': RouteRecordInfo<'about', '/about', Record, Record>, + '/index copy': RouteRecordInfo<'/index copy', '/index copy', Record, Record>, } }