Merge branch 'base'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "unibest",
   "type": "commonjs",
-  "version": "2.9.1",
+  "version": "2.9.3",
   "description": "unibest - 最好的 uniapp 开发模板",
   "author": {
     "name": "feige996",
@@ -108,9 +108,9 @@
     "pinia": "2.0.36",
     "pinia-plugin-persistedstate": "3.2.1",
     "qs": "6.5.3",
-    "vue": "3.4.21",
+    "vue": "^3.5.15",
     "vue-i18n": "9.1.9",
-    "wot-design-uni": "^1.4.0",
+    "wot-design-uni": "^1.9.1",
     "z-paging": "^2.8.4"
   },
   "devDependencies": {
@@ -149,7 +149,7 @@
     "typescript": "^5.7.2",
     "unocss": "^66.0.0",
     "unplugin-auto-import": "^0.17.8",
-    "vite": "5.2.8",
+    "vite": "6.3.5",
     "vite-plugin-restart": "^0.4.2",
     "vitepress": "^1.5.0",
     "vue-tsc": "^1.8.27"

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

@@ -1,16 +1,18 @@
 <script lang="ts" setup>
-withDefaults(defineProps<{
+withDefaults(
-  leftText?: string;
+  defineProps<{
-  rightText?: string;
+    leftText?: string
-  leftArrow?: boolean;
+    rightText?: string
-  bordered?: boolean;
+    leftArrow?: boolean
-  fixed?: boolean;
+    bordered?: boolean
-  placeholder?: boolean;
+    fixed?: boolean
-  zIndex?: number;
+    placeholder?: boolean
-  safeAreaInsetTop?: boolean;
+    zIndex?: number
-  leftDisabled?: boolean;
+    safeAreaInsetTop?: boolean
-  rightDisabled?: boolean;
+    leftDisabled?: boolean
-}>(), {
+    rightDisabled?: boolean
+  }>(),
+  {
     leftText: '返回',
     rightText: '',
     leftArrow: true,
@@ -21,24 +23,32 @@ withDefaults(defineProps<{
     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"
+    :left-text="leftText"
-    :bordered="bordered" :fixed="fixed" :placeholder="placeholder" :z-index="zIndex"
+    :right-text="rightText"
-    :safe-area-inset-top="safeAreaInsetTop" :left-disabled="leftDisabled" :right-disabled="rightDisabled"
+    :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>

src/pages/index/index.vue

@@ -41,7 +41,7 @@ defineOptions({
 const { safeAreaInsets } = uni.getSystemInfoSync()
 const author = ref('菲鸽')
 const description = ref(
-  'unibest 是一个集成了多种工具和技术的 uniapp 开发模板，由 uniapp + Vue3 + Ts + Vite4 + UnoCss + UniUI + VSCode 构建，模板具有代码提示、自动格式化、统一配置、代码片段等功能，并内置了许多常用的基本组件和基本功能，让你编写 uniapp 拥有 best 体验。',
+  'unibest 是一个集成了多种工具和技术的 uniapp 开发模板，由 uniapp + Vue3 + Ts + Vite6 + UnoCss + VSCode 构建，模板具有代码提示、自动格式化、统一配置、代码片段等功能，并内置了许多常用的基本组件和基本功能，让你编写 uniapp 拥有 best 体验。',
 )
 // 测试 uni API 自动引入
 onLoad(() => {