Merge branch 'base' into tabbar

This commit is contained in:
菲鸽 2024-05-08 21:02:02 +08:00
commit 6d4bb21f52
3 changed files with 303 additions and 3 deletions

7
.gitignore vendored
View File

@ -23,9 +23,10 @@ dist
.stylelintcache
# unplugin-auto-import 生成的类型文件
auto-import.d.ts
# vite-plugin-uni-pages 生成的类型文件
# unplugin-auto-import 生成的类型文件,因为变化较小,还是加入版本管理吧
# auto-import.d.ts
# vite-plugin-uni-pages 生成的类型文件,每次切换分支都一堆不同的,所以直接 .gitignore
uni-pages.d.ts
# 插件生成的文件

298
src/types/auto-import.d.ts vendored Normal file
View File

@ -0,0 +1,298 @@
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
// noinspection JSUnusedGlobalSymbols
// Generated by unplugin-auto-import
export {}
declare global {
const EffectScope: (typeof import('vue'))['EffectScope']
const computed: (typeof import('vue'))['computed']
const createApp: (typeof import('vue'))['createApp']
const customRef: (typeof import('vue'))['customRef']
const defineAsyncComponent: (typeof import('vue'))['defineAsyncComponent']
const defineComponent: (typeof import('vue'))['defineComponent']
const effectScope: (typeof import('vue'))['effectScope']
const getCurrentInstance: (typeof import('vue'))['getCurrentInstance']
const getCurrentScope: (typeof import('vue'))['getCurrentScope']
const h: (typeof import('vue'))['h']
const inject: (typeof import('vue'))['inject']
const isProxy: (typeof import('vue'))['isProxy']
const isReactive: (typeof import('vue'))['isReactive']
const isReadonly: (typeof import('vue'))['isReadonly']
const isRef: (typeof import('vue'))['isRef']
const markRaw: (typeof import('vue'))['markRaw']
const nextTick: (typeof import('vue'))['nextTick']
const onActivated: (typeof import('vue'))['onActivated']
const onAddToFavorites: (typeof import('@dcloudio/uni-app'))['onAddToFavorites']
const onBackPress: (typeof import('@dcloudio/uni-app'))['onBackPress']
const onBeforeMount: (typeof import('vue'))['onBeforeMount']
const onBeforeUnmount: (typeof import('vue'))['onBeforeUnmount']
const onBeforeUpdate: (typeof import('vue'))['onBeforeUpdate']
const onDeactivated: (typeof import('vue'))['onDeactivated']
const onError: (typeof import('@dcloudio/uni-app'))['onError']
const onErrorCaptured: (typeof import('vue'))['onErrorCaptured']
const onHide: (typeof import('@dcloudio/uni-app'))['onHide']
const onLaunch: (typeof import('@dcloudio/uni-app'))['onLaunch']
const onLoad: (typeof import('@dcloudio/uni-app'))['onLoad']
const onMounted: (typeof import('vue'))['onMounted']
const onNavigationBarButtonTap: (typeof import('@dcloudio/uni-app'))['onNavigationBarButtonTap']
const onNavigationBarSearchInputChanged: (typeof import('@dcloudio/uni-app'))['onNavigationBarSearchInputChanged']
const onNavigationBarSearchInputClicked: (typeof import('@dcloudio/uni-app'))['onNavigationBarSearchInputClicked']
const onNavigationBarSearchInputConfirmed: (typeof import('@dcloudio/uni-app'))['onNavigationBarSearchInputConfirmed']
const onNavigationBarSearchInputFocusChanged: (typeof import('@dcloudio/uni-app'))['onNavigationBarSearchInputFocusChanged']
const onPageNotFound: (typeof import('@dcloudio/uni-app'))['onPageNotFound']
const onPageScroll: (typeof import('@dcloudio/uni-app'))['onPageScroll']
const onPullDownRefresh: (typeof import('@dcloudio/uni-app'))['onPullDownRefresh']
const onReachBottom: (typeof import('@dcloudio/uni-app'))['onReachBottom']
const onReady: (typeof import('@dcloudio/uni-app'))['onReady']
const onRenderTracked: (typeof import('vue'))['onRenderTracked']
const onRenderTriggered: (typeof import('vue'))['onRenderTriggered']
const onResize: (typeof import('@dcloudio/uni-app'))['onResize']
const onScopeDispose: (typeof import('vue'))['onScopeDispose']
const onServerPrefetch: (typeof import('vue'))['onServerPrefetch']
const onShareAppMessage: (typeof import('@dcloudio/uni-app'))['onShareAppMessage']
const onShareTimeline: (typeof import('@dcloudio/uni-app'))['onShareTimeline']
const onShow: (typeof import('@dcloudio/uni-app'))['onShow']
const onTabItemTap: (typeof import('@dcloudio/uni-app'))['onTabItemTap']
const onThemeChange: (typeof import('@dcloudio/uni-app'))['onThemeChange']
const onUnhandledRejection: (typeof import('@dcloudio/uni-app'))['onUnhandledRejection']
const onUnload: (typeof import('@dcloudio/uni-app'))['onUnload']
const onUnmounted: (typeof import('vue'))['onUnmounted']
const onUpdated: (typeof import('vue'))['onUpdated']
const provide: (typeof import('vue'))['provide']
const reactive: (typeof import('vue'))['reactive']
const readonly: (typeof import('vue'))['readonly']
const ref: (typeof import('vue'))['ref']
const resolveComponent: (typeof import('vue'))['resolveComponent']
const shallowReactive: (typeof import('vue'))['shallowReactive']
const shallowReadonly: (typeof import('vue'))['shallowReadonly']
const shallowRef: (typeof import('vue'))['shallowRef']
const toRaw: (typeof import('vue'))['toRaw']
const toRef: (typeof import('vue'))['toRef']
const toRefs: (typeof import('vue'))['toRefs']
const toValue: (typeof import('vue'))['toValue']
const triggerRef: (typeof import('vue'))['triggerRef']
const unref: (typeof import('vue'))['unref']
const useAttrs: (typeof import('vue'))['useAttrs']
const useCssModule: (typeof import('vue'))['useCssModule']
const useCssVars: (typeof import('vue'))['useCssVars']
const useNavbarWeixin: (typeof import('../hooks/useNavbarWeixin'))['default']
const useRequest: (typeof import('../hooks/useRequest'))['default']
const useSlots: (typeof import('vue'))['useSlots']
const useUpload: (typeof import('../hooks/useUpload'))['default']
const useUpload2: (typeof import('../hooks/useUpload2'))['default']
const watch: (typeof import('vue'))['watch']
const watchEffect: (typeof import('vue'))['watchEffect']
const watchPostEffect: (typeof import('vue'))['watchPostEffect']
const watchSyncEffect: (typeof import('vue'))['watchSyncEffect']
}
// for type re-export
declare global {
// @ts-ignore
export type {
Component,
ComponentPublicInstance,
ComputedRef,
ExtractDefaultPropTypes,
ExtractPropTypes,
ExtractPublicPropTypes,
InjectionKey,
PropType,
Ref,
VNode,
WritableComputedRef,
} from 'vue'
import('vue')
}
// for vue template auto import
import { UnwrapRef } from 'vue'
declare module 'vue' {
interface GlobalComponents {}
interface ComponentCustomProperties {
readonly EffectScope: UnwrapRef<(typeof import('vue'))['EffectScope']>
readonly computed: UnwrapRef<(typeof import('vue'))['computed']>
readonly createApp: UnwrapRef<(typeof import('vue'))['createApp']>
readonly customRef: UnwrapRef<(typeof import('vue'))['customRef']>
readonly defineAsyncComponent: UnwrapRef<(typeof import('vue'))['defineAsyncComponent']>
readonly defineComponent: UnwrapRef<(typeof import('vue'))['defineComponent']>
readonly effectScope: UnwrapRef<(typeof import('vue'))['effectScope']>
readonly getCurrentInstance: UnwrapRef<(typeof import('vue'))['getCurrentInstance']>
readonly getCurrentScope: UnwrapRef<(typeof import('vue'))['getCurrentScope']>
readonly h: UnwrapRef<(typeof import('vue'))['h']>
readonly inject: UnwrapRef<(typeof import('vue'))['inject']>
readonly isProxy: UnwrapRef<(typeof import('vue'))['isProxy']>
readonly isReactive: UnwrapRef<(typeof import('vue'))['isReactive']>
readonly isReadonly: UnwrapRef<(typeof import('vue'))['isReadonly']>
readonly isRef: UnwrapRef<(typeof import('vue'))['isRef']>
readonly markRaw: UnwrapRef<(typeof import('vue'))['markRaw']>
readonly nextTick: UnwrapRef<(typeof import('vue'))['nextTick']>
readonly onActivated: UnwrapRef<(typeof import('vue'))['onActivated']>
readonly onAddToFavorites: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onAddToFavorites']>
readonly onBackPress: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onBackPress']>
readonly onBeforeMount: UnwrapRef<(typeof import('vue'))['onBeforeMount']>
readonly onBeforeUnmount: UnwrapRef<(typeof import('vue'))['onBeforeUnmount']>
readonly onBeforeUpdate: UnwrapRef<(typeof import('vue'))['onBeforeUpdate']>
readonly onDeactivated: UnwrapRef<(typeof import('vue'))['onDeactivated']>
readonly onError: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onError']>
readonly onErrorCaptured: UnwrapRef<(typeof import('vue'))['onErrorCaptured']>
readonly onHide: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onHide']>
readonly onLaunch: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onLaunch']>
readonly onLoad: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onLoad']>
readonly onMounted: UnwrapRef<(typeof import('vue'))['onMounted']>
readonly onNavigationBarButtonTap: UnwrapRef<
(typeof import('@dcloudio/uni-app'))['onNavigationBarButtonTap']
>
readonly onNavigationBarSearchInputChanged: UnwrapRef<
(typeof import('@dcloudio/uni-app'))['onNavigationBarSearchInputChanged']
>
readonly onNavigationBarSearchInputClicked: UnwrapRef<
(typeof import('@dcloudio/uni-app'))['onNavigationBarSearchInputClicked']
>
readonly onNavigationBarSearchInputConfirmed: UnwrapRef<
(typeof import('@dcloudio/uni-app'))['onNavigationBarSearchInputConfirmed']
>
readonly onNavigationBarSearchInputFocusChanged: UnwrapRef<
(typeof import('@dcloudio/uni-app'))['onNavigationBarSearchInputFocusChanged']
>
readonly onPageNotFound: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onPageNotFound']>
readonly onPageScroll: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onPageScroll']>
readonly onPullDownRefresh: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onPullDownRefresh']>
readonly onReachBottom: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onReachBottom']>
readonly onReady: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onReady']>
readonly onRenderTracked: UnwrapRef<(typeof import('vue'))['onRenderTracked']>
readonly onRenderTriggered: UnwrapRef<(typeof import('vue'))['onRenderTriggered']>
readonly onResize: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onResize']>
readonly onScopeDispose: UnwrapRef<(typeof import('vue'))['onScopeDispose']>
readonly onServerPrefetch: UnwrapRef<(typeof import('vue'))['onServerPrefetch']>
readonly onShareAppMessage: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onShareAppMessage']>
readonly onShareTimeline: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onShareTimeline']>
readonly onShow: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onShow']>
readonly onTabItemTap: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onTabItemTap']>
readonly onThemeChange: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onThemeChange']>
readonly onUnhandledRejection: UnwrapRef<
(typeof import('@dcloudio/uni-app'))['onUnhandledRejection']
>
readonly onUnload: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onUnload']>
readonly onUnmounted: UnwrapRef<(typeof import('vue'))['onUnmounted']>
readonly onUpdated: UnwrapRef<(typeof import('vue'))['onUpdated']>
readonly provide: UnwrapRef<(typeof import('vue'))['provide']>
readonly reactive: UnwrapRef<(typeof import('vue'))['reactive']>
readonly readonly: UnwrapRef<(typeof import('vue'))['readonly']>
readonly ref: UnwrapRef<(typeof import('vue'))['ref']>
readonly resolveComponent: UnwrapRef<(typeof import('vue'))['resolveComponent']>
readonly shallowReactive: UnwrapRef<(typeof import('vue'))['shallowReactive']>
readonly shallowReadonly: UnwrapRef<(typeof import('vue'))['shallowReadonly']>
readonly shallowRef: UnwrapRef<(typeof import('vue'))['shallowRef']>
readonly toRaw: UnwrapRef<(typeof import('vue'))['toRaw']>
readonly toRef: UnwrapRef<(typeof import('vue'))['toRef']>
readonly toRefs: UnwrapRef<(typeof import('vue'))['toRefs']>
readonly toValue: UnwrapRef<(typeof import('vue'))['toValue']>
readonly triggerRef: UnwrapRef<(typeof import('vue'))['triggerRef']>
readonly unref: UnwrapRef<(typeof import('vue'))['unref']>
readonly useAttrs: UnwrapRef<(typeof import('vue'))['useAttrs']>
readonly useCssModule: UnwrapRef<(typeof import('vue'))['useCssModule']>
readonly useCssVars: UnwrapRef<(typeof import('vue'))['useCssVars']>
readonly useNavbarWeixin: UnwrapRef<(typeof import('../hooks/useNavbarWeixin'))['default']>
readonly useSlots: UnwrapRef<(typeof import('vue'))['useSlots']>
readonly useUpload: UnwrapRef<(typeof import('../hooks/useUpload'))['default']>
readonly watch: UnwrapRef<(typeof import('vue'))['watch']>
readonly watchEffect: UnwrapRef<(typeof import('vue'))['watchEffect']>
readonly watchPostEffect: UnwrapRef<(typeof import('vue'))['watchPostEffect']>
readonly watchSyncEffect: UnwrapRef<(typeof import('vue'))['watchSyncEffect']>
}
}
declare module '@vue/runtime-core' {
interface GlobalComponents {}
interface ComponentCustomProperties {
readonly EffectScope: UnwrapRef<(typeof import('vue'))['EffectScope']>
readonly computed: UnwrapRef<(typeof import('vue'))['computed']>
readonly createApp: UnwrapRef<(typeof import('vue'))['createApp']>
readonly customRef: UnwrapRef<(typeof import('vue'))['customRef']>
readonly defineAsyncComponent: UnwrapRef<(typeof import('vue'))['defineAsyncComponent']>
readonly defineComponent: UnwrapRef<(typeof import('vue'))['defineComponent']>
readonly effectScope: UnwrapRef<(typeof import('vue'))['effectScope']>
readonly getCurrentInstance: UnwrapRef<(typeof import('vue'))['getCurrentInstance']>
readonly getCurrentScope: UnwrapRef<(typeof import('vue'))['getCurrentScope']>
readonly h: UnwrapRef<(typeof import('vue'))['h']>
readonly inject: UnwrapRef<(typeof import('vue'))['inject']>
readonly isProxy: UnwrapRef<(typeof import('vue'))['isProxy']>
readonly isReactive: UnwrapRef<(typeof import('vue'))['isReactive']>
readonly isReadonly: UnwrapRef<(typeof import('vue'))['isReadonly']>
readonly isRef: UnwrapRef<(typeof import('vue'))['isRef']>
readonly markRaw: UnwrapRef<(typeof import('vue'))['markRaw']>
readonly nextTick: UnwrapRef<(typeof import('vue'))['nextTick']>
readonly onActivated: UnwrapRef<(typeof import('vue'))['onActivated']>
readonly onAddToFavorites: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onAddToFavorites']>
readonly onBackPress: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onBackPress']>
readonly onBeforeMount: UnwrapRef<(typeof import('vue'))['onBeforeMount']>
readonly onBeforeUnmount: UnwrapRef<(typeof import('vue'))['onBeforeUnmount']>
readonly onBeforeUpdate: UnwrapRef<(typeof import('vue'))['onBeforeUpdate']>
readonly onDeactivated: UnwrapRef<(typeof import('vue'))['onDeactivated']>
readonly onError: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onError']>
readonly onErrorCaptured: UnwrapRef<(typeof import('vue'))['onErrorCaptured']>
readonly onHide: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onHide']>
readonly onLaunch: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onLaunch']>
readonly onLoad: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onLoad']>
readonly onMounted: UnwrapRef<(typeof import('vue'))['onMounted']>
readonly onNavigationBarButtonTap: UnwrapRef<
(typeof import('@dcloudio/uni-app'))['onNavigationBarButtonTap']
>
readonly onNavigationBarSearchInputChanged: UnwrapRef<
(typeof import('@dcloudio/uni-app'))['onNavigationBarSearchInputChanged']
>
readonly onNavigationBarSearchInputClicked: UnwrapRef<
(typeof import('@dcloudio/uni-app'))['onNavigationBarSearchInputClicked']
>
readonly onNavigationBarSearchInputConfirmed: UnwrapRef<
(typeof import('@dcloudio/uni-app'))['onNavigationBarSearchInputConfirmed']
>
readonly onNavigationBarSearchInputFocusChanged: UnwrapRef<
(typeof import('@dcloudio/uni-app'))['onNavigationBarSearchInputFocusChanged']
>
readonly onPageNotFound: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onPageNotFound']>
readonly onPageScroll: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onPageScroll']>
readonly onPullDownRefresh: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onPullDownRefresh']>
readonly onReachBottom: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onReachBottom']>
readonly onReady: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onReady']>
readonly onRenderTracked: UnwrapRef<(typeof import('vue'))['onRenderTracked']>
readonly onRenderTriggered: UnwrapRef<(typeof import('vue'))['onRenderTriggered']>
readonly onResize: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onResize']>
readonly onScopeDispose: UnwrapRef<(typeof import('vue'))['onScopeDispose']>
readonly onServerPrefetch: UnwrapRef<(typeof import('vue'))['onServerPrefetch']>
readonly onShareAppMessage: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onShareAppMessage']>
readonly onShareTimeline: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onShareTimeline']>
readonly onShow: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onShow']>
readonly onTabItemTap: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onTabItemTap']>
readonly onThemeChange: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onThemeChange']>
readonly onUnhandledRejection: UnwrapRef<
(typeof import('@dcloudio/uni-app'))['onUnhandledRejection']
>
readonly onUnload: UnwrapRef<(typeof import('@dcloudio/uni-app'))['onUnload']>
readonly onUnmounted: UnwrapRef<(typeof import('vue'))['onUnmounted']>
readonly onUpdated: UnwrapRef<(typeof import('vue'))['onUpdated']>
readonly provide: UnwrapRef<(typeof import('vue'))['provide']>
readonly reactive: UnwrapRef<(typeof import('vue'))['reactive']>
readonly readonly: UnwrapRef<(typeof import('vue'))['readonly']>
readonly ref: UnwrapRef<(typeof import('vue'))['ref']>
readonly resolveComponent: UnwrapRef<(typeof import('vue'))['resolveComponent']>
readonly shallowReactive: UnwrapRef<(typeof import('vue'))['shallowReactive']>
readonly shallowReadonly: UnwrapRef<(typeof import('vue'))['shallowReadonly']>
readonly shallowRef: UnwrapRef<(typeof import('vue'))['shallowRef']>
readonly toRaw: UnwrapRef<(typeof import('vue'))['toRaw']>
readonly toRef: UnwrapRef<(typeof import('vue'))['toRef']>
readonly toRefs: UnwrapRef<(typeof import('vue'))['toRefs']>
readonly toValue: UnwrapRef<(typeof import('vue'))['toValue']>
readonly triggerRef: UnwrapRef<(typeof import('vue'))['triggerRef']>
readonly unref: UnwrapRef<(typeof import('vue'))['unref']>
readonly useAttrs: UnwrapRef<(typeof import('vue'))['useAttrs']>
readonly useCssModule: UnwrapRef<(typeof import('vue'))['useCssModule']>
readonly useCssVars: UnwrapRef<(typeof import('vue'))['useCssVars']>
readonly useNavbarWeixin: UnwrapRef<(typeof import('../hooks/useNavbarWeixin'))['default']>
readonly useSlots: UnwrapRef<(typeof import('vue'))['useSlots']>
readonly useUpload: UnwrapRef<(typeof import('../hooks/useUpload'))['default']>
readonly watch: UnwrapRef<(typeof import('vue'))['watch']>
readonly watchEffect: UnwrapRef<(typeof import('vue'))['watchEffect']>
readonly watchPostEffect: UnwrapRef<(typeof import('vue'))['watchPostEffect']>
readonly watchSyncEffect: UnwrapRef<(typeof import('vue'))['watchSyncEffect']>
}
}

View File

@ -1,3 +1,4 @@
// @ts-expect-error import json file
import { pages, subPackages, tabBar } from '@/pages.json'
/** 判断当前页面是否是tabbar页 */