(requestOptions)
}
From d870dc1b856879264e22c1e7915f88b30e7bf164 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 11 Nov 2025 09:16:14 +0800
Subject: [PATCH 68/77] =?UTF-8?q?ci(workflow):=20=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=90=88=E5=B9=B6main=E5=88=B0=E5=85=B6?=
=?UTF-8?q?=E4=BB=96=E5=88=86=E6=94=AF=E7=9A=84=E5=B7=A5=E4=BD=9C=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/auto-merge.yml | 50 ++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
create mode 100644 .github/workflows/auto-merge.yml
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
new file mode 100644
index 0000000..f3086b5
--- /dev/null
+++ b/.github/workflows/auto-merge.yml
@@ -0,0 +1,50 @@
+name: Auto Merge Main to Other Branches
+
+on:
+ push:
+ branches:
+ - main
+ workflow_dispatch: # 手动触发
+
+jobs:
+ merge-to-base:
+ name: Merge main into base
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+ token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
+
+ - name: Merge main into base
+ run: |
+ git config user.name "GitHub Actions"
+ git config user.email "actions@github.com"
+ git checkout base
+ git merge main --no-ff -m "Auto merge main into base"
+ git push origin base
+
+ - name: Merge base into base-login
+ run: |
+ git config user.name "GitHub Actions"
+ git config user.email "actions@github.com"
+ git checkout base-login
+ git merge base --no-ff -m "Auto merge base into base-login"
+ git push origin base-login
+
+ - name: Merge base into base-i18n
+ run: |
+ git config user.name "GitHub Actions"
+ git config user.email "actions@github.com"
+ git checkout base-i18n
+ git merge base --no-ff -m "Auto merge base into base-i18n"
+ git push origin base-i18n
+
+ - name: Merge base into base-login-i18n
+ run: |
+ git config user.name "GitHub Actions"
+ git config user.email "actions@github.com"
+ git checkout base-login-i18n
+ git merge base --no-ff -m "Auto merge base into base-login-i18n"
+ git push origin base-login-i18n
From 8fd770732148087b0c05bd7f92114afff3d94c43 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 11 Nov 2025 09:21:10 +0800
Subject: [PATCH 69/77] =?UTF-8?q?feat:=20=E5=9C=A8presetLegacyCompat?=
=?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0legacyColorSpace=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
uno.config.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/uno.config.ts b/uno.config.ts
index 2c0c158..7a2f94c 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -54,6 +54,8 @@ export default defineConfig({
// `rgba(255 0 0 / 0.5)` -> `rgba(255, 0, 0, 0.5)`
presetLegacyCompat({
commaStyleColorFunction: true,
+ legacyColorSpace: true, // by QQ4群-量子蔷薇
+ // @菲鸽 unocss 配置中,建议在 presetLegacyCompat 中添加 legacyColorSpace: true,以去除生成的颜色样式中的 in oklch 关键字,现在发现有些渐变色生成不符合预期
}) as Preset,
],
transformers: [
From 3a301e6d674c05cd55849c345c5d9874b0b53203 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 11 Nov 2025 09:28:14 +0800
Subject: [PATCH 70/77] =?UTF-8?q?chore:=20=E5=88=A0=E9=99=A4=E4=B8=8D?=
=?UTF-8?q?=E5=86=8D=E9=9C=80=E8=A6=81=E7=9A=84docker=E7=9B=B8=E5=85=B3?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E5=92=8C=E5=8F=82=E8=80=83=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
codes/README.md | 3 -
codes/docker/.dockerignore | 31 --------
codes/docker/Dockerfile | 38 ----------
codes/docker/docker.md | 28 -------
codes/docker/nginx.conf | 145 -------------------------------------
5 files changed, 245 deletions(-)
delete mode 100644 codes/README.md
delete mode 100644 codes/docker/.dockerignore
delete mode 100644 codes/docker/Dockerfile
delete mode 100644 codes/docker/docker.md
delete mode 100644 codes/docker/nginx.conf
diff --git a/codes/README.md b/codes/README.md
deleted file mode 100644
index 38a29c3..0000000
--- a/codes/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# 参考代码
-
-部分代码片段,供参考。
\ No newline at end of file
diff --git a/codes/docker/.dockerignore b/codes/docker/.dockerignore
deleted file mode 100644
index e4f9eb8..0000000
--- a/codes/docker/.dockerignore
+++ /dev/null
@@ -1,31 +0,0 @@
-# 依赖目录
-node_modules
-
-# 版本控制
-.git
-.gitignore
-
-# 构建产物
-/dist
-
-# 开发工具配置
-.vscode/
-.idea/
-.trae/
-.cursor/
-
-# 其他配置文件
-.github/
-.husky/
-
-# 日志文件
-logs/
-
-# 缓存文件
-.cache/
-
-*.swp
-*.swo
-
-# 操作系统文件
-.DS_Store
diff --git a/codes/docker/Dockerfile b/codes/docker/Dockerfile
deleted file mode 100644
index d0d5a92..0000000
--- a/codes/docker/Dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# 使用 node:24-alpine 作为基础镜像,固定版本+减少体积
-FROM node:24-alpine AS builder
-
-# 在容器中创建目录
-WORKDIR /app
-
-# 安装pnpm(使用 npm 的 --global-style 可以减少依赖安装体积)
-RUN npm install -g pnpm@10.10.0 --global-style
-# 设置pnpm镜像源
-RUN pnpm config set registry https://registry.npmmirror.com
-# 复制依赖文件
-COPY package.json pnpm-lock.yaml ./
-# 先复制scripts目录,因为prepare脚本需要用到其中的文件
-COPY scripts ./scripts
-# 安装依赖,但跳过prepare脚本(这一步会缓存,只有 package.json 或 pnpm-lock.yaml 变化时才会重新运行)
-RUN pnpm install --ignore-scripts --frozen-lockfile
-# 手动执行我们需要的docker:prepare脚本
-RUN pnpm run docker:prepare
-# 复制其余源代码
-COPY . .
-# 构建项目
-RUN pnpm run build
-
-
-# 使用nginx作为服务
-FROM nginx:1.29.1-alpine3.22 AS production-stage
-
-# 将构建好的项目复制到nginx下
-COPY --from=builder /app/dist/build/h5 /usr/share/nginx/html
-
-COPY nginx.conf /etc/nginx/nginx.conf
-
-# 暴露端口
-EXPOSE 80
-EXPOSE 443
-
-# 启动nginx
-CMD ["nginx", "-g", "daemon off;"]
diff --git a/codes/docker/docker.md b/codes/docker/docker.md
deleted file mode 100644
index 833132e..0000000
--- a/codes/docker/docker.md
+++ /dev/null
@@ -1,28 +0,0 @@
-## Docker
-
-根据提供的 `Dockerfile`,可以通过以下步骤构建并运行镜像:
-
-### 1. 构建Docker镜像
-
-在项目根目录执行以下命令:
-
-- `-t unibest:v1-2025091701`:为镜像指定名称和标签,YYYYMMDD+编号
-- `.`:表示使用当前目录的Dockerfile
-
-```bash
-docker build -t unibest:v1-2025091701 .
-docker build -t unibest:v1-2025091702 .
-```
-### 2. 运行Docker容器
-使用以下命令运行容器:
-
-```bash
-docker run -d --name unibest-v1-2025091701 -p 80:80 unibest:v1-2025091701
-docker run -d --name unibest-v1-2025091702 -p 80:80 unibest:v1-2025091702
-```
-
-- `-d`:表示在后台运行容器
-- `-p 80:80`:将容器的80端口映射到主机的80端口
-- `--name unibest-v1-2025091701`:为容器指定一个名称
-
-
diff --git a/codes/docker/nginx.conf b/codes/docker/nginx.conf
deleted file mode 100644
index 1ad89fa..0000000
--- a/codes/docker/nginx.conf
+++ /dev/null
@@ -1,145 +0,0 @@
-# 配置工作进程数,通常设置为 CPU 核心数
-worker_processes auto;
-
-# 错误日志配置
-error_log /var/log/nginx/error.log warn;
-pid /var/run/nginx.pid;
-
-events {
- worker_connections 1024;
- # 开启多路复用
- use epoll;
-}
-
-# 文件描述符限制 - 移到这里,在http块之前
-worker_rlimit_nofile 65535;
-
-http {
- # 日志格式定义
- log_format main '$remote_addr - $remote_user [$time_local] "$request" '
- '$status $body_bytes_sent "$http_referer" '
- '"$http_user_agent" "$http_x_forwarded_for"';
-
- # 访问日志配置
- access_log /var/log/nginx/access.log main;
-
- # 高效文件传输设置
- sendfile on;
- tcp_nopush on;
- tcp_nodelay on;
-
- # 连接超时设置
- keepalive_timeout 65;
- keepalive_requests 100;
-
- # gzip 压缩优化
- gzip on;
- gzip_vary on;
- gzip_comp_level 6;
- gzip_min_length 1000;
- gzip_buffers 16 8k;
- gzip_http_version 1.1;
- # 增加更多文件类型
- gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript application/vnd.ms-fontobject application/x-font-ttf font/opentype image/svg+xml image/x-icon;
-
- # 全局设置
- # 合理限制请求体大小,根据实际需求调整
- client_max_body_size 10m;
- client_body_buffer_size 128k;
- client_header_timeout 60s;
- client_body_timeout 60s;
-
- server {
- listen 80;
- server_name _;
- gunzip on;
- gzip_static always;
- include /etc/nginx/mime.types;
- absolute_redirect off;
- root /usr/share/nginx/html;
-
- # 安全相关响应头
- add_header X-Frame-Options SAMEORIGIN;
- add_header X-XSS-Protection "1; mode=block";
- add_header X-Content-Type-Options nosniff;
- # 根据实际情况调整 CSP
- # add_header Content-Security-Policy "default-src 'self'";
-
- # 处理 SPA 应用路由
- location / {
- try_files $uri $uri/ /index.html;
- index index.html index.htm;
- }
-
- # HTML 和 JSON 文件 - 短缓存策略
- location ~ .*\.(html|json)$ {
- add_header Cache-Control "public, max-age=300, must-revalidate";
- }
-
- # 静态资源 - 长缓存策略
- location ~ .*\.(jpg|jpeg|png|gif|bmp|webp|svg|ico|ttf|woff|woff2|eot|mp4|mp3|swf)$ {
- add_header Cache-Control "public, max-age=31536000, immutable";
- expires 365d;
- access_log off;
- }
-
- # JS 和 CSS - 带版本号的长缓存
- location ~ .*\.(js|css)$ {
- add_header Cache-Control "public, max-age=31536000, immutable";
- expires 365d;
- access_log off;
- }
-
- # 接口转发 - 替换为实际后端地址
- # location ^~ /fg-api {
- # proxy_http_version 1.1;
- # proxy_set_header X-Real-IP $remote_addr;
- # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- # proxy_set_header X-Forwarded-Proto $scheme;
- # proxy_set_header Host $host;
-
- # # 后端是HTTPS时的必要配置
- # proxy_ssl_server_name on;
- # proxy_ssl_protocols TLSv1.2 TLSv1.3;
- # proxy_ssl_session_reuse on;
-
- # # 对于生产环境,应该尽量使用有效的证书而不是依赖``proxy_ssl_verify off;`` ,因为这会带来安全风险
- # proxy_ssl_verify off;
-
- # # TODO:替换为实际后端服务地址
- # # 注意在URL末尾添加了斜杠,这样Nginx会去掉 /fg-api 前缀
- # # 前端请求 http://your-domain.com/fg-api/users 转发到 https://ukw0y1.laf.run/users
- # proxy_pass https://ukw0y1.laf.run/;
-
- # # 上面一行的效果与下面2行一样的效果,都是为了去掉 /fg-api 前缀
- # # 显式移除/fg-api前缀
- # # rewrite ^/fg-api(.*)$ $1 break;
- # # 域名末尾不需要斜杠了
- # # proxy_pass https://ukw0y1.laf.run;
-
- # proxy_connect_timeout 60s;
- # proxy_send_timeout 60s;
- # proxy_read_timeout 60s;
-
- # proxy_buffers 8 32k;
- # proxy_buffer_size 64k;
- # proxy_busy_buffers_size 128k;
-
- # proxy_next_upstream error timeout http_500 http_502 http_503 http_504;
- # }
-
- # 错误页面配置
- error_page 404 /index.html;
- error_page 500 502 503 504 /50x.html;
- location = /50x.html {
- root /usr/share/nginx/html;
- }
-
- # 禁止访问隐藏文件
- location ~ /\. {
- deny all;
- access_log off;
- log_not_found off;
- }
- }
-}
From 72cf5f97ee4f0a4469d5d4808448307331652f91 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Tue, 11 Nov 2025 09:28:34 +0800
Subject: [PATCH 71/77] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E5=8F=B7=E8=87=B34.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index f0b26a2..b99dc18 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
{
"name": "unibest",
"type": "module",
- "version": "4.0.0",
- "unibest-version": "4.0.0",
+ "version": "4.1.0",
+ "unibest-version": "4.1.0",
"unibest-update-time": "2025-11-07",
"packageManager": "pnpm@10.10.0",
"description": "unibest - 最好的 uniapp 开发模板",
From 472f43e6ce8c53875b77158fbf7a0f63048791e7 Mon Sep 17 00:00:00 2001
From: ljt990218 <2511590093@qq.com>
Date: Tue, 11 Nov 2025 22:58:26 +0800
Subject: [PATCH 72/77] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0DEMO=E5=9C=B0?=
=?UTF-8?q?=E5=9D=80=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 75c060b..7752e70 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@
📖 文档地址(new)
|
- 📱 DEMO 地址
+ 📱 DEMO 地址
---
From d24baa104ba8f4a156f9c2d1d74397df6950b619 Mon Sep 17 00:00:00 2001
From: ljt990218 <2511590093@qq.com>
Date: Fri, 14 Nov 2025 19:07:32 +0800
Subject: [PATCH 73/77] =?UTF-8?q?feat(router):=20=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E5=AF=B9=E6=8F=92=E4=BB=B6=E9=A1=B5=E9=9D=A2=E8=B7=AF=E5=BE=84?=
=?UTF-8?q?=E7=9A=84=E8=B7=AF=E7=94=B1=E6=8B=A6=E6=88=AA=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/interceptor.ts | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/router/interceptor.ts b/src/router/interceptor.ts
index e5b6046..b4092d5 100644
--- a/src/router/interceptor.ts
+++ b/src/router/interceptor.ts
@@ -38,6 +38,12 @@ export const navigateToInterceptor = {
return false // 明确表示阻止原路由继续执行
}
+ // 插件页面
+ if (url.startsWith('plugin://')) {
+ FG_LOG_ENABLE && console.log('路由拦截器 4: plugin:// 路径 ==>', url)
+ path = url
+ }
+
// 处理直接进入路由非首页时,tabbarIndex 不正确的问题
tabbarStore.setAutoCurIdx(path)
},
From 44b7d0e010a15c60b339a4e942392d9338dab1a1 Mon Sep 17 00:00:00 2001
From: Utopia
Date: Tue, 2 Dec 2025 09:17:39 +0800
Subject: [PATCH 74/77] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20vite-plugin?=
=?UTF-8?q?-uni-manifest,=20=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0=20manifes?=
=?UTF-8?q?t.config.ts=20=E5=90=8E=EF=BC=8C=E4=B8=8D=E4=BC=9A=E7=83=AD?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B0=20manifest.config.json=20=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=20(#362)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
pnpm-lock.yaml | 29 +++++++++++++++++++++++------
2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/package.json b/package.json
index b99dc18..5f83b88 100644
--- a/package.json
+++ b/package.json
@@ -147,7 +147,7 @@
"@uni-helper/unocss-preset-uni": "0.2.11",
"@uni-helper/vite-plugin-uni-components": "0.2.3",
"@uni-helper/vite-plugin-uni-layouts": "0.1.11",
- "@uni-helper/vite-plugin-uni-manifest": "0.2.8",
+ "@uni-helper/vite-plugin-uni-manifest": "0.2.11",
"@uni-helper/vite-plugin-uni-pages": "0.3.19",
"@uni-helper/vite-plugin-uni-platform": "0.0.5",
"@uni-ku/bundle-optimizer": "v1.3.15-beta.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 503c42e..491276b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -87,6 +87,9 @@ importers:
vue:
specifier: ^3.4.21
version: 3.4.21(typescript@5.8.3)
+ vue-i18n:
+ specifier: 9.1.9
+ version: 9.1.9(vue@3.4.21(typescript@5.8.3))
vue-router:
specifier: 4.5.1
version: 4.5.1(vue@3.4.21(typescript@5.8.3))
@@ -155,8 +158,8 @@ importers:
specifier: 0.1.11
version: 0.1.11(rollup@4.50.0)
'@uni-helper/vite-plugin-uni-manifest':
- specifier: 0.2.8
- version: 0.2.8(vite@5.2.8(@types/node@20.19.11)(sass@1.77.8)(terser@5.43.1))
+ specifier: 0.2.11
+ version: 0.2.11(vite@5.2.8(@types/node@20.19.11)(sass@1.77.8)(terser@5.43.1))
'@uni-helper/vite-plugin-uni-pages':
specifier: 0.3.19
version: 0.3.19(vite@5.2.8(@types/node@20.19.11)(sass@1.77.8)(terser@5.43.1))
@@ -2223,8 +2226,8 @@ packages:
'@uni-helper/vite-plugin-uni-layouts@0.1.11':
resolution: {integrity: sha512-FXdFATBFsHAl7xY9q3KO0EexMRGua/7txIiQTm2rQi1/bXcft4CUXldtuHl9Upq0V6CT47aanmfzcOF5CpHK7Q==}
- '@uni-helper/vite-plugin-uni-manifest@0.2.8':
- resolution: {integrity: sha512-6QtUcCTkvpR5GAPUxyKlEtm+KYxOk1RSVfdrxlWYW2q7Iws0D7UeNirA4GMuc/SaayEjURlU7cUrS7NceoPCfQ==}
+ '@uni-helper/vite-plugin-uni-manifest@0.2.11':
+ resolution: {integrity: sha512-0qc+XexlyngeC+TukIM4ogjTj8S9FwU1Ab607EgUIuuhaqbhxhPdEIb406VcAF1klRRwKIxBzZWfNoW9fv+AwQ==}
peerDependencies:
vite: ^4.0.0 || ^5.0.0 || ^6.0.0
@@ -6074,6 +6077,12 @@ packages:
peerDependencies:
vue: ^3.4.37
+ vue-i18n@9.1.9:
+ resolution: {integrity: sha512-JeRdNVxS2OGp1E+pye5XB6+M6BBkHwAv9C80Q7+kzoMdUDGRna06tjC0vCB/jDX9aWrl5swxOMFcyAr7or8XTA==}
+ engines: {node: '>= 10'}
+ peerDependencies:
+ vue: ^3.0.0
+
vue-router@4.5.1:
resolution: {integrity: sha512-ogAF3P97NPm8fJsE4by9dwSYtDwXIY1nFY9T6DyQnGHd1E2Da94w9JIolpe42LJGIl0DwOHBi8TcRPlPGwbTtw==}
peerDependencies:
@@ -9227,7 +9236,7 @@ snapshots:
- magicast
- rollup
- '@uni-helper/vite-plugin-uni-manifest@0.2.8(vite@5.2.8(@types/node@20.19.11)(sass@1.77.8)(terser@5.43.1))':
+ '@uni-helper/vite-plugin-uni-manifest@0.2.11(vite@5.2.8(@types/node@20.19.11)(sass@1.77.8)(terser@5.43.1))':
dependencies:
c12: 2.0.4
vite: 5.2.8(@types/node@20.19.11)(sass@1.77.8)(terser@5.43.1)
@@ -10045,7 +10054,7 @@ snapshots:
defu: 6.1.4
dotenv: 16.6.1
giget: 1.2.5
- jiti: 2.5.1
+ jiti: 2.6.1
mlly: 1.8.0
ohash: 2.0.11
pathe: 2.0.3
@@ -13801,6 +13810,14 @@ snapshots:
dependencies:
vue: 3.4.21(typescript@5.8.3)
+ vue-i18n@9.1.9(vue@3.4.21(typescript@5.8.3)):
+ dependencies:
+ '@intlify/core-base': 9.1.9
+ '@intlify/shared': 9.1.9
+ '@intlify/vue-devtools': 9.1.9
+ '@vue/devtools-api': 6.6.4
+ vue: 3.4.21(typescript@5.8.3)
+
vue-router@4.5.1(vue@3.4.21(typescript@5.8.3)):
dependencies:
'@vue/devtools-api': 6.6.4
From 5ba54c70970b8dce2861de857d216d6a6c75e5d2 Mon Sep 17 00:00:00 2001
From: Utopia
Date: Tue, 2 Dec 2025 09:18:39 +0800
Subject: [PATCH 75/77] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=97=B6=EF=BC=8Cvscode=20=E6=8F=90=E7=A4=BA?=
=?UTF-8?q?=E2=80=9C=E6=9C=AA=E6=8C=87=E5=AE=9A=E6=9C=89=E6=95=88=E7=9A=84?=
=?UTF-8?q?=20tsserver=20=E5=AE=89=E8=A3=85=E2=80=9D=20(#361)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* chore: 修复项目启动时,vscode 提示“未指定有效的 tsserver 安装”
* chore: 删除未使用的依赖 js-cookie
---
.vscode/settings.json | 2 +-
package.json | 1 -
pnpm-lock.yaml | 9 ---------
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1c88538..b484267 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -10,7 +10,7 @@
"scss.validate": false, // 禁用 SCSS 内置验证
"less.validate": false, // 禁用 LESS 内置验证
- "typescript.tsdk": "node_modules\\typescript\\lib",
+ "typescript.tsdk": "node_modules/typescript/lib",
"explorer.fileNesting.enabled": true,
"explorer.fileNesting.expand": false,
"explorer.fileNesting.patterns": {
diff --git a/package.json b/package.json
index 5f83b88..04e74fd 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,6 @@
"abortcontroller-polyfill": "^1.7.8",
"alova": "^3.3.3",
"dayjs": "1.11.10",
- "js-cookie": "^3.0.5",
"pinia": "2.0.36",
"pinia-plugin-persistedstate": "3.2.1",
"vue": "^3.4.21",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 491276b..9c5e12d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -75,9 +75,6 @@ importers:
dayjs:
specifier: 1.11.10
version: 1.11.10
- js-cookie:
- specifier: ^3.0.5
- version: 3.0.5
pinia:
specifier: 2.0.36
version: 2.0.36(typescript@5.8.3)(vue@3.4.21(typescript@5.8.3))
@@ -4291,10 +4288,6 @@ packages:
jpeg-js@0.3.7:
resolution: {integrity: sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==}
- js-cookie@3.0.5:
- resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==}
- engines: {node: '>=14'}
-
js-tokens@4.0.0:
resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
@@ -11818,8 +11811,6 @@ snapshots:
jpeg-js@0.3.7: {}
- js-cookie@3.0.5: {}
-
js-tokens@4.0.0: {}
js-tokens@9.0.1: {}
From ca80a6fab8c427d1926cdf576cd103e18afa1934 Mon Sep 17 00:00:00 2001
From: Utopia
Date: Tue, 2 Dec 2025 09:19:06 +0800
Subject: [PATCH 76/77] =?UTF-8?q?fix:=20wot-design-uni=20=E5=9F=BA?=
=?UTF-8?q?=E4=BA=8E=20vite=20=E9=85=8D=E7=BD=AE=E8=87=AA=E5=8A=A8?=
=?UTF-8?q?=E5=BC=95=E5=85=A5=E7=BB=84=E4=BB=B6=E6=97=B6=EF=BC=8C=E6=97=A0?=
=?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=BC=95=E5=85=A5=20(#360)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
vite.config.ts | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/vite.config.ts b/vite.config.ts
index 7a8a2a9..5581195 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -91,6 +91,13 @@ export default defineConfig(({ command, mode }) => {
UniKuRoot({
excludePages: ['**/components/**/**.*'],
}),
+ // Components 需要在 Uni 之前引入
+ Components({
+ extensions: ['vue'],
+ deep: true, // 是否递归扫描子目录,
+ directoryAsNamespace: false, // 是否把目录名作为命名空间前缀,true 时组件名为 目录名+组件名,
+ dts: 'src/types/components.d.ts', // 自动生成的组件类型声明文件路径(用于 TypeScript 支持)
+ }),
Uni(),
{
// 临时解决 dcloudio 官方的 @dcloudio/uni-mp-compiler 出现的编译 BUG
@@ -139,12 +146,6 @@ export default defineConfig(({ command, mode }) => {
},
),
syncManifestPlugin(),
- Components({
- extensions: ['vue'],
- deep: true, // 是否递归扫描子目录,
- directoryAsNamespace: false, // 是否把目录名作为命名空间前缀,true 时组件名为 目录名+组件名,
- dts: 'src/types/components.d.ts', // 自动生成的组件类型声明文件路径(用于 TypeScript 支持)
- }),
// 自动打开开发者工具插件 (必须修改 .env 文件中的 VITE_WX_APPID)
openDevTools(),
],
From a7b11bfe1d36568b783b4d076dc4e111be1f45ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C9=AAx=E1=B4=9Cs?=
Date: Tue, 2 Dec 2025 13:40:36 +0800
Subject: [PATCH 77/77] Add z-index to tabbar for proper stacking context
(#364)
---
src/tabbar/index.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/tabbar/index.vue b/src/tabbar/index.vue
index e66de29..20f2f10 100644
--- a/src/tabbar/index.vue
+++ b/src/tabbar/index.vue
@@ -145,7 +145,8 @@ function getImageByIndex(index: number, item: CustomTabBarItem) {
bottom: 0;
left: 0;
right: 0;
-
+ z-index: 1000;
+
border-top: 1px solid #eee;
box-sizing: border-box;
}