Merge branch 'main' of github.com:lisongkun/unibest

package.json

@@ -1,8 +1,8 @@
 {
   "name": "unibest",
   "type": "module",
-  "version": "3.9.2",
-  "unibest-version": "3.9.2",
+  "version": "3.9.3",
+  "unibest-version": "3.9.3",
   "packageManager": "pnpm@10.10.0",
   "description": "unibest - 最好的 uniapp 开发模板",
   "generate-time": "用户创建项目时生成",
@@ -118,13 +118,13 @@
     "pinia": "2.0.36",
     "pinia-plugin-persistedstate": "3.2.1",
     "vue": "3.4.21",
-    "wot-design-uni": "^1.9.1",
+    "wot-design-uni": "^1.11.1",
     "z-paging": "2.8.7"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
-    "@dcloudio/types": "^3.4.16",
+    "@dcloudio/types": "^3.4.19",
     "@dcloudio/uni-automator": "3.0.0-4070520250711001",
     "@dcloudio/uni-cli-shared": "3.0.0-4070520250711001",
     "@dcloudio/uni-stacktracey": "3.0.0-4070520250711001",
@@ -145,7 +145,6 @@
     "@uni-helper/vite-plugin-uni-platform": "0.0.5",
     "@uni-ku/bundle-optimizer": "^1.3.3",
     "@unocss/eslint-plugin": "^66.2.3",
-    "@unocss/preset-legacy-compat": "^0.59.4",
     "@vue/runtime-core": "3.4.21",
     "@vue/tsconfig": "^0.1.3",
     "autoprefixer": "^10.4.20",
@@ -154,18 +153,18 @@
     "husky": "^9.1.7",
     "lint-staged": "^15.2.10",
     "miniprogram-api-typings": "^4.1.0",
-    "openapi-ts-request": "^1.1.2",
+    "openapi-ts-request": "^1.6.7",
     "postcss": "^8.4.49",
-    "postcss-html": "^1.7.0",
+    "postcss-html": "^1.8.0",
     "postcss-scss": "^4.0.9",
-    "rollup-plugin-visualizer": "^5.12.0",
+    "rollup-plugin-visualizer": "^6.0.3",
     "sass": "1.77.8",
-    "typescript": "^5.7.2",
+    "typescript": "~5.8.0",
     "unocss": "66.0.0",
-    "unplugin-auto-import": "^0.17.8",
+    "unplugin-auto-import": "^20.0.0",
     "vite": "5.2.8",
-    "vite-plugin-restart": "^0.4.2",
-    "vue-tsc": "^2.2.10"
+    "vite-plugin-restart": "^1.0.0",
+    "vue-tsc": "^3.0.6"
   },
   "resolutions": {
     "bin-wrapper": "npm:bin-wrapper-china"

src/store/user.ts

@@ -30,7 +30,6 @@ export const useUserStore = defineStore(
     // 定义用户信息
     const userInfo = ref<IUserInfoVo>({ ...userInfoState })
     const userToken = ref<IUserTokenVo>({ ...userTokenState })
-
     // 设置用户信息
     const setUserInfo = (val: IUserInfoVo) => {
       console.log('设置用户信息', val)

src/tabbar/config.ts

@@ -110,7 +110,7 @@ export const customTabbarEnable
  */
 export const needHideNativeTabbar = selectedTabbarStrategy === TABBAR_STRATEGY_MAP.CUSTOM_TABBAR_WITH_CACHE
 
-export const tabbarList = customTabbarEnable ? customTabbarList : nativeTabbarList
+export const tabbarList = customTabbarEnable ? customTabbarList.map(item => ({ text: item.text, pagePath: item.pagePath })) : nativeTabbarList
 
 const _tabbar: TabBar = {
   // 只有微信小程序支持 custom。App 和 H5 不生效

src/utils/index.ts

@@ -30,7 +30,7 @@ export function currRoute() {
   return getUrlObj(fullPath)
 }
 
-function ensureDecodeURIComponent(url: string) {
+export function ensureDecodeURIComponent(url: string) {
   if (url.startsWith('%')) {
     return ensureDecodeURIComponent(decodeURIComponent(url))
   }

uno.config.ts

@@ -10,12 +10,7 @@ import {
 
 export default defineConfig({
   presets: [
-    presetUni({
-      // attributify: {
-      //   // prefix: 'fg-', // 如果加前缀，则需要在代码里面使用 `fg-` 前缀，如：<div fg-border="1px solid #000"></div>
-      //   prefixedOnly: true,
-      // },
-    }),
+    presetUni(),
     presetIcons({
       scale: 1.2,
       warn: true,