Merge branch 'base' into tabbar

src/components/fg-navbar/fg-navbar.vue

@@ -0,0 +1,48 @@
+<script lang="ts" setup>
+withDefaults(defineProps<{
+  leftText?: string;
+  rightText?: string;
+  leftArrow?: boolean;
+  bordered?: boolean;
+  fixed?: boolean;
+  placeholder?: boolean;
+  zIndex?: number;
+  safeAreaInsetTop?: boolean;
+  leftDisabled?: boolean;
+  rightDisabled?: boolean;
+}>(), {
+  leftText: '返回',
+  rightText: '',
+  leftArrow: true,
+  bordered: true,
+  fixed: false,
+  placeholder: true,
+  zIndex: 1,
+  safeAreaInsetTop: true,
+  leftDisabled: false,
+  rightDisabled: false,
+});
+
+function handleClickLeft() {
+  uni.navigateBack({
+    fail() {
+      uni.reLaunch({
+        url: '/pages/index/index',
+      });
+    },
+  });
+}
+</script>
+
+<template>
+  <wd-navbar
+    :left-text="leftText" :right-text="rightText" :left-arrow="leftArrow"
+    :bordered="bordered" :fixed="fixed" :placeholder="placeholder" :z-index="zIndex"
+    :safe-area-inset-top="safeAreaInsetTop" :left-disabled="leftDisabled" :right-disabled="rightDisabled"
+    @click-left="handleClickLeft"
+  >
+    <template #title>
+      <slot />
+    </template>
+  </wd-navbar>
+</template>

src/main.ts

@@ -1,6 +1,6 @@
 import '@/style/index.scss'
 import { VueQueryPlugin } from '@tanstack/vue-query'
-import 'virtual:uno.css'
+import 'uno.css'
 import { createSSRApp } from 'vue'
 
 import App from './App.vue'

src/pages.json

@@ -9,6 +9,7 @@
   "easycom": {
     "autoscan": true,
     "custom": {
+      "^fg-(.*)": "@/components/fg-$1/fg-$1.vue",
       "^wd-(.*)": "wot-design-uni/components/wd-$1/wd-$1.vue",
       "^(?!z-paging-refresh|z-paging-load-more)z-paging(.*)": "z-paging/components/z-paging$1/z-paging$1.vue"
     }
@@ -59,7 +60,8 @@
       "type": "page",
       "layout": "tabbar",
       "style": {
-        "navigationBarTitleText": "关于"
+        "navigationBarTitleText": "关于",
+        "navigationStyle": "custom"
       }
     },
     {

src/pages/about/about.vue

@@ -3,22 +3,26 @@
   layout: 'tabbar',
   style: {
     navigationBarTitleText: '关于',
+    navigationStyle: 'custom', // 开启自定义导航栏
   },
 }
 </route>
 
 <template>
-  <view
-    class="bg-white overflow-hidden pt-2 px-4"
-    :style="{ marginTop: safeAreaInsets?.top + 'px' }"
-  >
-    <view class="text-center text-3xl mt-8">
-      鸽友们好，我是
-      <text class="text-red-500">菲鸽</text>
+  <view>
+    <fg-navbar>关于</fg-navbar>
+    <view
+      class="bg-white overflow-hidden pt-2 px-4"
+      :style="{ marginTop: safeAreaInsets?.top + 'px' }"
+    >
+      <view class="text-center text-3xl mt-8">
+        鸽友们好，我是
+        <text class="text-red-500">菲鸽</text>
+      </view>
+      <view class="test-css">测试 scss 样式</view>
+      <RequestComp />
+      <UploadComp />
     </view>
-    <view class="test-css">测试 scss 样式</view>
-    <RequestComp />
-    <UploadComp />
   </view>
 </template>
 

src/types/async-component.d.ts

@@ -0,0 +1,8 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by @uni-ku/bundle-optimizer
+declare module '*?async' {
+  const component: any
+  export = component
+}

src/types/async-import.d.ts

@@ -0,0 +1,13 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by @uni-ku/bundle-optimizer
+export {}
+
+interface ModuleMap {
+  [path: string]: any
+}
+
+declare global {
+  function AsyncImport<T extends keyof ModuleMap>(arg: T): Promise<ModuleMap[T]>
+}

src/types/components.d.ts

@@ -0,0 +1,12 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by vite-plugin-uni-components
+// Read more: https://github.com/vuejs/core/pull/3399
+export {}
+
+declare module 'vue' {
+  export interface GlobalComponents {
+    FgNavbar: typeof import('./../components/fg-navbar/fg-navbar.vue')['default']
+  }
+}