Compare commits

...

247 Commits

Author SHA1 Message Date
feige996
0dd0cab15d chore: 更新 package.json 中的版本号至 3.1.0 2025-06-22 16:58:18 +08:00
feige996
02d8fb1268 feat(utils): 添加查询字符串序列化工具函数替代qs库
实现一个轻量级的查询字符串序列化工具,支持基本类型和数组,用于替代第三方qs库以减少打包体积
2025-06-22 16:55:57 +08:00
feige996
ee8fc19a47 feat(env): 添加 VITE_APP_PROXY 和 UNI_PLATFORM 类型声明 2025-06-22 14:22:08 +08:00
feige996
dd11e45d5f refactor: 将类型定义文件移动到src/types目录下并添加登录相关类型
将types目录移动到src下以保持项目结构一致性
新增登录相关的类型定义文件,包含用户信息、登录返回数据等接口
2025-06-22 14:04:49 +08:00
feige996
8455f09e8c chore: 调整 vscode 文件嵌套配置 2025-06-22 13:12:42 +08:00
feige996
edefc99702 refactor(api): 将登录相关类型定义移动到types目录下 2025-06-22 13:02:10 +08:00
feige996
946ad7c976 feat(首页): 添加作者和官网信息并调整顶部间距
在首页添加作者和官网信息展示,同时将顶部图片间距从mt-12调整为mt-10以优化布局
2025-06-22 12:06:39 +08:00
feige996
cfe5634c91 ci(workflow): 添加 base-uv-ui 和 base-uview-plus 的自动合并工作流
添加两个新的工作流用于将 main 分支自动合并到 base-uv-ui 和 base-uview-plus 分支
2025-06-22 11:59:30 +08:00
feige996
2000eda414 chore: 禁用prettier并启用eslint作为默认格式化工具 2025-06-22 10:07:22 +08:00
feige996
69b7429909 style: 修改页面配置和代码片段格式
- 将首页图标类型从 'wot' 改为 'uiLib'
- 调整 Vue3 代码片段中 template 和 script 的顺序
- 格式化代码片段的缩进和换行
2025-06-22 10:04:44 +08:00
feige996
926d700b60 docs: tabbarList 2025-06-21 22:51:51 +08:00
feige996
f0cd8ee943 docs: tabbar.md 2025-06-21 22:46:42 +08:00
feige996
67f76415e1 build: auto merge to base-sard-ui 2025-06-21 19:44:24 +08:00
feige996
e67da2203c feat: uiLib 匹配 2025-06-21 19:36:04 +08:00
feige996
cb033104ee chore: // @ts-expect-error 预知的判断 2025-06-21 19:35:26 +08:00
feige996
28e59cd599 chore: 更新项目版本号至3.0.0,分支合并和eslint等重大变更 2025-06-21 17:40:14 +08:00
feige996
1af7213e96 chore: 移除oxlint及相关配置
清理不再使用的oxlint依赖及其配置文件
更新vscode设置以反映lint工具变更
2025-06-21 17:32:13 +08:00
feige996
d5c14ac3ae build: 将 ESLint 配置从 @antfu 迁移到 @uni-helper
统一使用 uni-app 生态的 ESLint 配置,保持工具链一致性
2025-06-21 17:29:42 +08:00
feige996
27d4441ca6 chore: 更新版本号至2.16.0, 使用 antfu/eslint-config 2025-06-21 17:23:51 +08:00
feige996
ea50a639ed Merge branch 'eslint' 2025-06-21 17:22:34 +08:00
feige996
e171c29d28 chore: 将 lint 工具从 oxlint 切换为 eslint 并启用多语言支持
更新 package.json 中的 lint 脚本,使用 eslint 替代 oxlint
在 .vscode/settings.json 中启用 eslint 对所有支持语言的校验
2025-06-21 17:22:06 +08:00
feige996
ae515cd85e chore: 将eslint替换为oxlint并更新vscode配置
更新package.json中的lint脚本,从eslint改为oxlint
调整.vscode/settings.json中的格式化配置,启用prettier并优化保存时的自动修复行为
2025-06-21 17:18:35 +08:00
feige996
e1654359fd style: 总算处理好所有的 eslint 报错 2025-06-21 17:11:17 +08:00
feige996
32cf872405 refactor: 在多个文件中添加process导入并调整tsconfig顺序
统一添加node:process导入以提高代码一致性
调整tsconfig.json中配置项的顺序以提升可读性
2025-06-21 17:03:45 +08:00
feige996
c355f6e8f1 chore(eslint): 更新eslint配置,禁用部分规则并添加忽略目录
添加markdown支持为false,并配置忽略目录src/uni_modules/和dist
禁用no-console等规则以提升开发体验
2025-06-21 16:59:01 +08:00
feige996
227f19a93c style: 统一代码格式和类型定义,测试eslint --fix, 还是有报错 2025-06-21 16:56:24 +08:00
feige996
9cf0c212bf build: 将 lint 工具从 oxlint 替换为 eslint
统一使用 eslint 作为代码检查工具,简化 lint-staged 配置
2025-06-21 16:53:10 +08:00
feige996
79c333e647 feat: 添加 ESLint 配置并集成到 VSCode
pnpm dlx @antfu/eslint-config@latest
2025-06-21 16:50:31 +08:00
feige996
9c074652e1 chore: 简化 commitlint 配置 2025-06-21 16:28:17 +08:00
feige996
6402f8825f docs: 修正描述中Vite的版本号从6改为5 2025-06-21 15:56:51 +08:00
feige996
4fc50a6bb5 Revert "chore: 更新.gitignore并删除未使用的配置文件"
This reverts commit 28d8000ad82b20e749f50dc1848f1e24ed588220.
2025-06-21 15:53:24 +08:00
feige996
28d8000ad8 chore: 更新.gitignore并删除未使用的配置文件
移除src/pages.json和src/manifest.json配置文件
更新.gitignore以忽略src/types目录和删除的配置文件
2025-06-21 15:50:13 +08:00
feige996
144dec8881 chore: 更新版本号至2.15.0 2025-06-21 15:33:19 +08:00
feige996
e2c319079a refactor(about): 移除未使用的导航代码并简化页面结构 2025-06-21 15:30:53 +08:00
feige996
1efb68cb9b docs: 将模板分支从tabbar更新为base 2025-06-21 15:29:36 +08:00
feige996
ba7252c332 ci(workflow): 移除不再需要的自动合并工作流
删除针对 tabbar 和 spa 分支的自动合并工作流配置,仅保留 i18n 分支的配置
2025-06-21 15:11:43 +08:00
feige996
548b0515f6 docs(pages.config): 添加关于 tabbar 配置位置的注释 2025-06-21 15:04:54 +08:00
feige996
b03f7ee310 docs: 更新README中微信平台的命令名称
将微信平台开发和生产环境的命令从`dev:mp-weixin`和`build:mp-weixin`统一简化为`dev:mp`和`build:mp`,保持命令一致性
2025-06-21 14:59:00 +08:00
feige996
e2eda79403 docs(fg-tabbar): 完善 tabbar 策略的注释说明
添加更详细的注释说明 tabbar 策略选项及其使用注意事项
提醒代码更改后需要重新运行以更新 pages.json
2025-06-21 14:55:06 +08:00
feige996
2a97bf0aaa chore(fg-tabbar): 将selectedTabbarStrategy默认值改为0 2025-06-21 14:46:50 +08:00
feige996
f8641457ad refactor(fg-tabbar): 更新tabbar策略并添加safelist配置
将selectedTabbarStrategy从0改为1以切换tabbar策略
在uno.config.ts中添加空的safelist配置
移除注释掉的i-carbon-code导入
2025-06-21 14:36:30 +08:00
feige996
407bc849ec Revert "chore: pnpm-lock.yaml"
This reverts commit 21234cdbe2bd40104cbb4abf1da2d62b44c0227e.
2025-06-21 14:31:00 +08:00
feige996
38328280c4 chore: 回退esbuild版本至0.20.2 解决ios模拟器报错 2025-06-21 14:24:30 +08:00
feige996
d2f7b5e1ec docs(layouts): 添加tabbar组件使用说明文档 2025-06-21 14:17:23 +08:00
feige996
7b3e757301 refactor(utils): 移除未使用的 tabBar 相关代码并简化导入
清理不再使用的 tabBar 相关函数和变量,简化 pages.json 的导入方式
2025-06-21 13:37:17 +08:00
feige996
2a71d02ab8 refactor(tabbar): 将 tabbar 组件从 components 移动到 layouts 目录
重构 tabbar 组件结构,将其从 components 目录迁移至 layouts 目录以更符合项目结构规范
移除未使用的 midButton 配置
2025-06-21 13:35:29 +08:00
feige996
4b77ca6c13 chore: midButton 2025-06-21 13:30:41 +08:00
feige996
21234cdbe2 chore: pnpm-lock.yaml 2025-06-21 13:30:26 +08:00
feige996
5250fac0a1 refactor(tabbar): 重构自定义tabbar逻辑并添加图标路径
移除冗余注释并整理tabbar相关配置
添加自定义tabbar的图标路径配置
优化tabbar显示逻辑,根据CUSTOM_TABBAR_ENABLE决定显示方式
2025-06-21 13:09:14 +08:00
feige996
91faa0f301 refactor(tabbar): 重构底部导航栏配置及逻辑
将底部导航栏配置从 pages.config.ts 移动到单独的文件中
添加 CUSTOM_TABBAR_ENABLE 开关控制自定义导航栏行为
优化导航栏切换逻辑,根据开关选择不同跳转方式
2025-06-21 12:54:52 +08:00
GitHub Actions
13ebc5aacc Auto merge main into tabbar 2025-06-21 02:53:22 +00:00
feige996
d86bfa719d ci: 将自动合并工作流中的基础分支从base改为main 2025-06-21 10:52:02 +08:00
GitHub Actions
72c261ef67 Auto merge base into tabbar 2025-06-21 02:38:08 +00:00
feige996
a7671ce4a9 docs(pages.config.ts): 更新tabBar配置的注释说明 2025-06-21 10:36:22 +08:00
GitHub Actions
de32f4515f Auto merge base into tabbar 2025-06-21 02:35:28 +00:00
feige996
74e52f000a docs(useUpload): 更新注释以明确不同平台的返回值差异
补充说明H5和App平台返回的File对象字段差异,并调整注释顺序使其更清晰
2025-06-21 10:33:22 +08:00
feige996
7bd338e07c fix(useUpload): 修复文件路径和大小获取逻辑错误
调整条件编译逻辑,确保在非微信小程序环境下也能正确获取文件路径和大小
2025-06-21 10:29:55 +08:00
feige996
119edac05a refactor(页面布局): 移除自定义导航栏相关代码并简化样式
移除about页面的自定义导航栏代码及相关配置,统一使用默认导航栏样式
优化index页面布局,移除多余的overflow-hidden样式
修复upload组件图片显示条件判断
2025-06-21 10:27:59 +08:00
GitHub Actions
f93ed08cb2 Auto merge base into tabbar 2025-06-21 02:14:34 +00:00
feige996
393c37bd56 chore: 更新版本号至2.14.0 2025-06-21 10:14:20 +08:00
GitHub Actions
7a1ae5b0f3 Auto merge base into tabbar 2025-06-21 02:12:02 +00:00
feige996
c47564e51a build: 添加对@dcloudio/uni-h5的补丁支持
添加pnpm-workspace.yaml配置文件并创建补丁文件,修复uni-h5组件中tabBar高度可能为undefined的问题
2025-06-21 10:11:39 +08:00
feige996
7a2e870641 chore: 在.prettierignore中添加node_modules目录 2025-06-21 10:08:35 +08:00
GitHub Actions
3b7688a20b Auto merge base into tabbar 2025-06-21 01:26:18 +00:00
feige996
e2c0ac4721 refactor(layout): 移除隐私弹窗组件 2025-06-21 09:20:04 +08:00
GitHub Actions
11c6f158d0 Auto merge base into tabbar 2025-06-21 01:19:12 +00:00
feige996
9ef3b7d7d4 build: 将 uno.css 替换为 virtual:uno.css 2025-06-20 23:16:20 +08:00
feige996
4f67168494 feat(tabbar): 添加中间按钮并移除自定义tabbar配置
添加发布按钮作为tabbar中间按钮,同时移除不再需要的custom配置
2025-06-20 21:40:52 +08:00
feige996
bf61c3d1f0 chore: 在页面中添加调试日志
添加console.log语句用于调试index和about页面
2025-06-20 19:35:31 +08:00
feige996
9a34868fb7 refactor(tabbar): 将tabbar配置抽离为单独模块以提高可维护性
将pages.config.ts中的tabbar配置抽离到单独的tabbarList.ts文件
移除pages.json中无用的__esModule字段
2025-06-20 19:32:34 +08:00
GitHub Actions
fe751745e5 Auto merge base into tabbar 2025-06-20 02:45:43 +00:00
GitHub Actions
ba8c0a2e7f Auto merge base into tabbar 2025-06-20 02:43:41 +00:00
GitHub Actions
6a7ece9b3f Auto merge base into tabbar 2025-06-17 14:57:59 +00:00
feige996
11b7880810 refactor: 移除未使用的"我的"页面及相关路由配置 2025-06-17 22:39:31 +08:00
feige996
c1b12eab84 Merge branch 'base' into tabbar 2025-06-17 22:39:11 +08:00
GitHub Actions
3eb06627c2 Auto merge base into tabbar 2025-06-17 10:15:28 +00:00
GitHub Actions
09e048ba85 Auto merge base into tabbar 2025-06-17 10:14:14 +00:00
GitHub Actions
ea2f3a6990 Auto merge base into tabbar 2025-06-17 10:10:22 +00:00
GitHub Actions
23cd9a522e Auto merge base into tabbar 2025-06-16 01:53:25 +00:00
GitHub Actions
61a2fd8a27 Auto merge base into tabbar 2025-06-15 14:28:46 +00:00
GitHub Actions
61bb8363cd Auto merge base into tabbar 2025-06-15 09:04:45 +00:00
GitHub Actions
a4d366c01e Auto merge base into tabbar 2025-06-15 08:46:51 +00:00
GitHub Actions
3a2b4febd2 Auto merge base into tabbar 2025-06-14 04:36:21 +00:00
GitHub Actions
95dbb93256 Auto merge base into tabbar 2025-06-14 04:00:41 +00:00
GitHub Actions
cc886bd326 Auto merge base into tabbar 2025-06-14 03:13:50 +00:00
GitHub Actions
26d49ac5bc Auto merge base into tabbar 2025-06-14 02:46:12 +00:00
GitHub Actions
25fb9705cc Auto merge base into tabbar 2025-06-13 10:34:52 +00:00
GitHub Actions
4efb14cbff Auto merge base into tabbar 2025-06-13 10:33:46 +00:00
GitHub Actions
0723fb178b Auto merge base into tabbar 2025-06-13 09:01:21 +00:00
GitHub Actions
6866c17184 Auto merge base into tabbar 2025-06-13 09:00:53 +00:00
GitHub Actions
1558430435 Auto merge base into tabbar 2025-06-13 08:47:40 +00:00
GitHub Actions
6da7d46913 Auto merge base into tabbar 2025-06-13 08:38:56 +00:00
GitHub Actions
5f97a3ff8a Auto merge base into tabbar 2025-06-11 15:39:50 +00:00
GitHub Actions
12b9384df6 Auto merge base into tabbar 2025-06-10 09:14:21 +00:00
GitHub Actions
1f3749d08d Auto merge base into tabbar 2025-06-06 15:46:16 +00:00
GitHub Actions
2c566253f3 Auto merge base into tabbar 2025-06-06 14:59:38 +00:00
GitHub Actions
28fad4a480 Auto merge base into tabbar 2025-06-06 14:42:50 +00:00
GitHub Actions
8233556683 Auto merge base into tabbar 2025-06-06 04:45:21 +00:00
GitHub Actions
8464a040ab Auto merge base into tabbar 2025-06-06 04:41:25 +00:00
GitHub Actions
0d42825314 Auto merge base into tabbar 2025-06-05 14:56:49 +00:00
GitHub Actions
8a434fa761 Auto merge base into tabbar 2025-06-04 14:44:02 +00:00
GitHub Actions
b286d07623 Auto merge base into tabbar 2025-06-04 09:41:11 +00:00
GitHub Actions
9dcea8189e Auto merge base into tabbar 2025-06-04 07:20:27 +00:00
GitHub Actions
d5a3772b3a Auto merge base into tabbar 2025-06-04 01:03:41 +00:00
GitHub Actions
3bf7fcb844 Auto merge base into tabbar 2025-06-04 01:03:12 +00:00
GitHub Actions
7b61242611 Auto merge base into tabbar 2025-06-04 01:00:58 +00:00
GitHub Actions
51d399f38b Auto merge base into tabbar 2025-06-03 12:04:11 +00:00
GitHub Actions
e79ae9a17f Auto merge base into tabbar 2025-06-03 11:51:51 +00:00
GitHub Actions
3f08e45e06 Auto merge base into tabbar 2025-06-03 11:50:30 +00:00
GitHub Actions
a0a2106fe7 Auto merge base into tabbar 2025-06-03 11:43:14 +00:00
GitHub Actions
291be04925 Auto merge base into tabbar 2025-06-03 10:12:13 +00:00
GitHub Actions
81a1e8e42d Auto merge base into tabbar 2025-06-03 09:48:13 +00:00
GitHub Actions
3e604e3c7f Auto merge base into tabbar 2025-06-03 09:26:52 +00:00
GitHub Actions
bb0a57bd1f Auto merge base into tabbar 2025-06-03 06:49:14 +00:00
GitHub Actions
22ce0f481d Auto merge base into tabbar 2025-06-03 04:55:35 +00:00
feige996
d76a5baad9 Merge branch 'tabbar' of github.com:feige996/unibest into tabbar 2025-06-03 12:42:18 +08:00
GitHub Actions
667e0647c4 Auto merge base into tabbar 2025-06-03 04:40:02 +00:00
feige996
0042afe215 refactor(fg-tabbar): 使用工具函数中的tabBarList替代直接导入
从直接导入pages.json中的tabBar改为使用utils中封装的_tabBarList,提高代码复用性和维护性
2025-06-03 12:38:13 +08:00
GitHub Actions
b857669c0c Auto merge base into tabbar 2025-06-03 02:20:33 +00:00
GitHub Actions
b454473591 Auto merge base into tabbar 2025-06-03 02:14:09 +00:00
GitHub Actions
91d66fda51 Auto merge base into tabbar 2025-06-03 01:28:54 +00:00
GitHub Actions
6777d20d41 Auto merge base into tabbar 2025-06-03 01:17:55 +00:00
GitHub Actions
1905a3f8bb Auto merge base into tabbar 2025-05-30 03:17:55 +00:00
GitHub Actions
54105b9968 Auto merge base into tabbar 2025-05-28 08:18:01 +00:00
GitHub Actions
d980dbb97a Auto merge base into tabbar 2025-05-28 07:21:17 +00:00
GitHub Actions
c594222abd Auto merge base into tabbar 2025-05-28 07:15:45 +00:00
GitHub Actions
53d68c10a0 Auto merge base into tabbar 2025-05-28 03:40:44 +00:00
feige996
b5cd1319c0 Merge branch 'base' into tabbar 2025-05-28 11:35:54 +08:00
feige996
b6fbf54c1c Merge branch 'base' into tabbar 2025-05-28 00:59:32 +08:00
feige996
d35fabd893 feat(tabbar): 调整 2025-05-28 00:51:49 +08:00
feige996
6673c2e269 Merge branch 'base' into tabbar 2025-05-28 00:46:30 +08:00
GitHub Actions
a57d4c08b3 Auto merge base into tabbar 2025-05-27 08:55:54 +00:00
GitHub Actions
cb33ed7a00 Auto merge base into tabbar 2025-05-26 16:32:23 +00:00
feige996
efe570c8c9 Merge branch 'base' into tabbar 2025-05-26 23:30:37 +08:00
GitHub Actions
3c398ab101 Auto merge base into tabbar 2025-05-22 12:02:38 +00:00
GitHub Actions
aed4b934ed Auto merge base into tabbar 2025-05-21 02:17:02 +00:00
GitHub Actions
56bfdfaf70 Auto merge base into tabbar 2025-05-19 07:12:12 +00:00
feige996
2959974f86 Merge branch 'base' into tabbar 2025-05-19 14:54:48 +08:00
GitHub Actions
085a1d73a2 Auto merge base into tabbar 2025-04-22 06:47:50 +00:00
GitHub Actions
7f80ded4c2 Auto merge base into tabbar 2025-04-12 06:09:19 +00:00
GitHub Actions
639c2a0e75 Auto merge base into tabbar 2025-03-07 11:43:14 +00:00
GitHub Actions
3c7701d21b Auto merge base into tabbar 2025-02-25 03:51:55 +00:00
GitHub Actions
5952515ac7 Auto merge base into tabbar 2025-01-23 15:50:34 +00:00
GitHub Actions
13c3e78cc6 Auto merge base into tabbar 2025-01-14 13:59:27 +00:00
GitHub Actions
e5103ddb7a Auto merge base into tabbar 2025-01-14 11:30:02 +00:00
Burt
ac2128bb76 Merge branch 'base' into tabbar 2025-01-14 19:26:40 +08:00
Burt
5b55e01089 Merge branch 'base' into tabbar 2025-01-06 23:27:20 +08:00
Burt
e57853fda0 Merge branch 'base' into tabbar 2025-01-06 14:00:47 +08:00
Burt
16c27345ed Merge branch 'base' into tabbar 2025-01-05 12:38:34 +08:00
Burt
c214a15bb7 Merge branch 'base' into tabbar 2025-01-01 18:09:03 +08:00
Burt
24b43088a9 Merge branch 'base' into tabbar 2024-12-31 12:21:03 +08:00
Burt
1ee3d06ed8 Merge branch 'base' into tabbar 2024-12-26 12:33:51 +08:00
Burt
5144ceabd1 Merge branch 'base' into tabbar 2024-12-10 21:45:05 +08:00
Burt
7eb4c23116 Merge branch 'base' into tabbar 2024-12-06 14:49:33 +08:00
Burt
53ebadf0a2 Merge branch 'base' into tabbar 2024-12-04 09:42:36 +08:00
Burt
8c1dda51ed Merge branch 'base' into tabbar 2024-12-02 21:02:12 +08:00
Burt
637ca983cf build: 降级uni版本,确保样式正确 2024-12-02 20:57:33 +08:00
Burt
1b61a262da Merge branch 'base' into tabbar 2024-12-02 20:54:08 +08:00
Burt
6fe2b888e4 Merge branch 'base' into tabbar 2024-12-02 16:25:40 +08:00
Burt
003e8685a4 build: update version 2024-12-02 16:20:50 +08:00
菲鸽
7eab089118
Merge pull request #20 from gladtoeatu/base
修复支付宝小程序无法build、onReachBottom支持组件直接调用
2024-11-27 22:17:47 +08:00
Burt
cd130de1cf Merge branch 'base' into tabbar 2024-11-15 16:47:22 +08:00
Burt
988cf6aa53 Merge branch 'base' into tabbar 2024-11-10 22:59:55 +08:00
Burt
7afa74d381 Merge branch base into tabbar 2024-11-10 22:52:08 +08:00
Burt
1bec786aaa Merge branch 'base' into tabbar 2024-11-10 22:48:37 +08:00
Burt
46ae55c73c Merge branch 'base' into tabbar 2024-09-11 20:50:58 +08:00
Burt
0865a33ad4 Merge branch 'base' into tabbar 2024-09-05 20:57:43 +08:00
Burt
f01b98693e Merge branch 'base' 2024-09-05 20:51:47 +08:00
菲鸽
8b357ab8c5 Merge branch 'base' into tabbar 2024-07-16 21:09:37 +08:00
菲鸽
7f41078fa0 Merge branch 'base' into tabbar 2024-06-28 13:08:08 +08:00
菲鸽
e4571097c8 Merge branch 'base' into tabbar 2024-06-25 21:59:57 +08:00
菲鸽
dec635a59d Merge branch 'base' into tabbar 2024-06-25 17:48:07 +08:00
菲鸽
5823f89e5f Merge branch 'base' into tabbar 2024-06-19 14:11:45 +08:00
菲鸽
d20f359769 Merge branch 'base' into tabbar 2024-06-17 17:24:21 +08:00
菲鸽
18d52a8e48 Merge branch 'base' into tabbar 2024-06-17 17:23:20 +08:00
菲鸽
3b2395da26 Merge branch 'base' into tabbar 2024-06-17 16:25:52 +08:00
菲鸽
12aae659fe Merge branch 'base' into tabbar 2024-06-16 16:47:37 +08:00
菲鸽
45744d412e Merge branch 'base' into tabbar 2024-06-16 16:39:14 +08:00
菲鸽
4b7a28fe97 Merge branch 'base' into tabbar 2024-06-07 10:48:09 +08:00
菲鸽
c1ed654ff3 Merge branch 'base' into tabbar 2024-06-04 18:03:36 +08:00
菲鸽
bb30afe1b6 Merge branch 'base' into tabbar 2024-06-03 12:33:53 +08:00
菲鸽
4ebc32dd3b Merge branch 'base' into tabbar 2024-06-01 21:53:56 +08:00
菲鸽
b1bfd0d336 Merge branch 'base' into tabbar 2024-06-01 21:48:43 +08:00
菲鸽
208f2395a6 build: pnpm-lock.yaml 2024-06-01 21:46:39 +08:00
菲鸽
a616867641 Merge branch 'base' into tabbar 2024-06-01 21:45:48 +08:00
菲鸽
bde0332183 refine: my 2024-05-28 11:36:23 +08:00
菲鸽
588c3a446f chore: 注意tabbar路由需要使用 layout:tabbar 布局 2024-05-28 11:34:30 +08:00
菲鸽
a9d3eccad5 feat: 优化tabbar,精简tabbar 2024-05-28 11:33:15 +08:00
菲鸽
01679809b8 fix: tabBar 我的 icon 不见了 2024-05-28 10:15:50 +08:00
菲鸽
a4fd81d2a8 Merge branch 'base' into tabbar 2024-05-26 09:52:31 +08:00
菲鸽
7ab753ee8d Merge branch 'base' into tabbar 2024-05-25 19:28:18 +08:00
菲鸽
e20b84c8d5 Merge branch 'base' into tabbar 2024-05-19 18:48:46 +08:00
菲鸽
77020a13a0 Merge branch 'base' into tabbar 2024-05-18 18:01:12 +08:00
菲鸽
79bbc09850 feat: 优化btn宽度 2024-05-18 17:58:02 +08:00
菲鸽
556f9052d1 Merge branch 'base' into tabbar 2024-05-18 17:46:50 +08:00
菲鸽
3e2cc7be81 chore: 运行 2024-05-18 17:43:34 +08:00
菲鸽
5871cb5fd8 Merge branch 'base' into tabbar 2024-05-12 19:53:51 +08:00
菲鸽
3a088be68b build: pnpm upgrade wot-design-uni 2024-05-12 17:46:37 +08:00
菲鸽
eab3de02fd build(manifest): ignoreVersion: true 2024-05-12 17:43:25 +08:00
菲鸽
7e26a71db8 chore: json 2024-05-12 17:24:47 +08:00
菲鸽
8bf7145752 Merge branch 'base' into tabbar 2024-05-12 17:24:11 +08:00
菲鸽
fd1102b425 Merge branch 'base' into tabbar 2024-05-12 17:19:28 +08:00
菲鸽
005d2406ab Merge branch 'base' into tabbar 2024-05-12 17:06:16 +08:00
菲鸽
fbd6343b2b Merge branch 'base' into tabbar 2024-05-12 16:47:28 +08:00
菲鸽
b11b17ec40 feat: tabbar 支持4种图标 2024-05-12 16:37:25 +08:00
菲鸽
9736931bfd Merge branch 'base' into tabbar 2024-05-12 16:25:53 +08:00
菲鸽
85c34bc922 build: uni-pages.d.ts 2024-05-12 11:54:50 +08:00
菲鸽
70801959ea Merge branch 'base' into tabbar 2024-05-12 11:54:22 +08:00
菲鸽
aa758845f6 build: 运行出自己的pages.json 2024-05-12 10:28:53 +08:00
菲鸽
c6eccbfa19 Merge branch 'base' into tabbar 2024-05-12 10:28:19 +08:00
菲鸽
3ae09fc804 refine: unocss icon 生效提示 2024-05-11 21:27:46 +08:00
菲鸽
695486e41f feat: 三种方式的图标,tabbar都支持 2024-05-11 21:26:56 +08:00
菲鸽
7cf16d608c feat: 续上,H5 也需要隐藏 2024-05-11 20:11:54 +08:00
菲鸽
0d948a0691 feat: app 里面才需要 hideTabBar 2024-05-11 20:10:26 +08:00
菲鸽
50cb3419c2 refine: store key 2024-05-11 11:36:44 +08:00
菲鸽
7271f3c618 fix: tabbar 2个BUG 2024-05-11 11:32:34 +08:00
菲鸽
d6c6022a18 fix: app 未隐藏原生tabbar 2024-05-11 11:26:04 +08:00
菲鸽
84d4607b2a fix: isUnocssIcon 没有了 2024-05-11 09:43:58 +08:00
菲鸽
4f6d271c28 feat: 使用 tabbar layout + wot icon 2024-05-11 09:41:33 +08:00
菲鸽
ee52ae132d refactor: 自定义tabbar 2024-05-11 09:36:26 +08:00
菲鸽
de8df540c2 Merge branch 'base' into tabbar 2024-05-09 08:49:40 +08:00
菲鸽
6d4bb21f52 Merge branch 'base' into tabbar 2024-05-08 21:02:02 +08:00
菲鸽
ffa5c68e66 Merge branch 'base' into tabbar 2024-05-08 20:27:06 +08:00
菲鸽
5eadda62de Merge branch 'base' into tabbar 2024-05-03 20:01:03 +08:00
菲鸽
041403f5d8 Merge branch 'base' into tabbar 2024-05-02 16:55:26 +08:00
菲鸽
137fa5846b Merge branch 'base' into tabbar 2024-04-30 15:00:40 +08:00
菲鸽
ffc37d9030 build: 写成 easycom 规范可以不用显式custom 规则 2024-04-20 11:08:54 +08:00
菲鸽
7e3ab3ca19 fix: tabbar 引入 2024-04-20 11:02:20 +08:00
菲鸽
cdae57adce Merge branch 'base' into tabbar 2024-04-20 10:53:07 +08:00
菲鸽
39007ec045 Merge branch 'base' into tabbar 2024-04-12 15:12:47 +08:00
菲鸽
d4935d1186 Merge branch 'base' into tabbar 2024-04-11 18:40:25 +08:00
菲鸽
12acce4575 Merge branch 'base' into tabbar 2024-04-11 09:25:03 +08:00
菲鸽
3f15da98de Merge branch 'base' into tabbar 2024-04-09 14:27:21 +08:00
菲鸽
fb4a6e7bec Merge branch 'base' into tabbar 2024-04-07 17:23:25 +08:00
菲鸽
6cdb56bb12 Merge branch 'base' into tabbar 2024-04-07 09:02:55 +08:00
菲鸽
e7d0a685d4 Merge branch 'base' into tabbar 2024-04-06 22:22:06 +08:00
菲鸽
c3debbb636 fix: code-snippets 2024-04-05 15:00:03 +08:00
菲鸽
a7c3dbaea2 Merge branch 'base' into tabbar 2024-04-05 14:20:06 +08:00
菲鸽
c032fe5a1e build(tsconfig.json): add components.d.ts ,自定义组件就有提示了 2024-04-04 16:55:26 +08:00
菲鸽
6a018d89be fix: 自动导入的函数,在模板报错 2024-04-04 16:17:29 +08:00
菲鸽
cc716a1e0c build: remove @uni-helper/uni-app-types 才有提示 2024-04-03 16:34:16 +08:00
菲鸽
be35efd530 Merge branch 'base' into tabbar 2024-04-02 21:32:38 +08:00
菲鸽
37b52d1243 refine: 显示模板分支 2024-04-02 21:05:29 +08:00
菲鸽
4770817fdc fix: ts 报错 2024-04-02 20:51:53 +08:00
菲鸽
3a12eb35eb refine: about 页面 2024-04-02 20:46:44 +08:00
菲鸽
01916970e8
!7 自定义tabbar
Merge pull request !7 from summer/custom-tabbar
2024-04-02 12:37:42 +00:00
summer
ee43df4fa6 feat: 新增自定义tabbar分支 2024-04-02 17:31:39 +08:00
58 changed files with 2979 additions and 789 deletions

View File

@ -1,106 +1,3 @@
const fs = require('fs')
const path = require('path')
const { execSync } = require('child_process')
const scopes = fs
.readdirSync(path.resolve(__dirname, 'src'), { withFileTypes: true })
.filter((dirent) => dirent.isDirectory())
.map((dirent) => dirent.name.replace(/s$/, ''))
// precomputed scope
const scopeComplete = execSync('git status --porcelain || true')
.toString()
.trim()
.split('\n')
.find((r) => ~r.indexOf('M src'))
?.replace(/(\/)/g, '%%')
?.match(/src%%((\w|-)*)/)?.[1]
?.replace(/s$/, '')
module.exports = { module.exports = {
ignores: [(commit) => commit.includes('init')],
extends: ['@commitlint/config-conventional'], extends: ['@commitlint/config-conventional'],
rules: {
'body-leading-blank': [2, 'always'],
'footer-leading-blank': [1, 'always'],
'header-max-length': [2, 'always', 108],
'subject-empty': [2, 'never'],
'type-empty': [2, 'never'],
'subject-case': [0],
'type-enum': [
2,
'always',
[
'feat',
'fix',
'perf',
'style',
'docs',
'test',
'refactor',
'build',
'ci',
'chore',
'revert',
'wip',
'workflow',
'types',
'release',
],
],
},
prompt: {
/** @use `pnpm commit :f` */
alias: {
f: 'docs: fix typos',
r: 'docs: update README',
s: 'style: update code format',
b: 'build: bump dependencies',
c: 'chore: update config',
},
customScopesAlign: !scopeComplete ? 'top' : 'bottom',
defaultScope: scopeComplete,
scopes: [...scopes, 'mock'],
allowEmptyIssuePrefixs: false,
allowCustomIssuePrefixs: false,
// English
typesAppend: [
{ value: 'wip', name: 'wip: work in process' },
{ value: 'workflow', name: 'workflow: workflow improvements' },
{ value: 'types', name: 'types: type definition file changes' },
],
// 中英文对照版
// messages: {
// type: '选择你要提交的类型 :',
// scope: '选择一个提交范围 (可选):',
// customScope: '请输入自定义的提交范围 :',
// subject: '填写简短精炼的变更描述 :\n',
// body: '填写更加详细的变更描述 (可选)。使用 "|" 换行 :\n',
// breaking: '列举非兼容性重大的变更 (可选)。使用 "|" 换行 :\n',
// footerPrefixsSelect: '选择关联issue前缀 (可选):',
// customFooterPrefixs: '输入自定义issue前缀 :',
// footer: '列举关联issue (可选) 例如: #31, #I3244 :\n',
// confirmCommit: '是否提交或修改commit ?',
// },
// types: [
// { value: 'feat', name: 'feat: 新增功能' },
// { value: 'fix', name: 'fix: 修复缺陷' },
// { value: 'docs', name: 'docs: 文档变更' },
// { value: 'style', name: 'style: 代码格式' },
// { value: 'refactor', name: 'refactor: 代码重构' },
// { value: 'perf', name: 'perf: 性能优化' },
// { value: 'test', name: 'test: 添加疏漏测试或已有测试改动' },
// { value: 'build', name: 'build: 构建流程、外部依赖变更 (如升级 npm 包、修改打包配置等)' },
// { value: 'ci', name: 'ci: 修改 CI 配置、脚本' },
// { value: 'revert', name: 'revert: 回滚 commit' },
// { value: 'chore', name: 'chore: 对构建过程或辅助工具和库的更改 (不影响源文件、测试用例)' },
// { value: 'wip', name: 'wip: 正在开发中' },
// { value: 'workflow', name: 'workflow: 工作流程改进' },
// { value: 'types', name: 'types: 类型定义文件修改' },
// ],
// emptyScopesAlias: 'empty: 不填写',
// customScopesAlias: 'custom: 自定义',
},
} }

60
.github/release.yml vendored
View File

@ -1,31 +1,31 @@
categories: categories:
- title: '🚀 新功能' - title: 🚀 新功能
labels: ['feat', 'feature'] labels: [feat, feature]
- title: '🛠️ 修复' - title: 🛠️ 修复
labels: ['fix', 'bugfix'] labels: [fix, bugfix]
- title: '💅 样式' - title: 💅 样式
labels: ['style'] labels: [style]
- title: '📄 文档' - title: 📄 文档
labels: ['docs'] labels: [docs]
- title: '⚡️ 性能' - title: ⚡️ 性能
labels: ['perf'] labels: [perf]
- title: '🧪 测试' - title: 🧪 测试
labels: ['test'] labels: [test]
- title: '♻️ 重构' - title: ♻️ 重构
labels: ['refactor'] labels: [refactor]
- title: '📦 构建' - title: 📦 构建
labels: ['build'] labels: [build]
- title: '🚨 补丁' - title: 🚨 补丁
labels: ['patch', 'hotfix'] labels: [patch, hotfix]
- title: '🌐 发布' - title: 🌐 发布
labels: ['release', 'publish'] labels: [release, publish]
- title: '🔧 流程' - title: 🔧 流程
labels: ['ci', 'cd', 'workflow'] labels: [ci, cd, workflow]
- title: '⚙️ 配置' - title: ⚙️ 配置
labels: ['config', 'chore'] labels: [config, chore]
- title: '📁 文件' - title: 📁 文件
labels: ['file'] labels: [file]
- title: '🎨 格式化' - title: 🎨 格式化
labels: ['format'] labels: [format]
- title: '🔀 其他' - title: 🔀 其他
labels: ['other', 'misc'] labels: [other, misc]

View File

@ -1,14 +1,14 @@
name: Auto Merge Base to Other Branches name: Auto Merge Main to Other Branches
on: on:
push: push:
branches: branches:
- base - main
workflow_dispatch: # 手动触发 workflow_dispatch: # 手动触发
jobs: jobs:
merge-to-i18n: merge-to-i18n:
name: Merge base into i18n name: Merge main into i18n
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
@ -17,16 +17,16 @@ jobs:
fetch-depth: 0 fetch-depth: 0
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
- name: Merge base into i18n - name: Merge main into i18n
run: | run: |
git config user.name "GitHub Actions" git config user.name "GitHub Actions"
git config user.email "actions@github.com" git config user.email "actions@github.com"
git checkout i18n git checkout i18n
git merge base --no-ff -m "Auto merge base into i18n" git merge main --no-ff -m "Auto merge main into i18n"
git push origin i18n git push origin i18n
merge-to-tabbar: merge-to-base-sard-ui:
name: Merge base into tabbar name: Merge main into base-sard-ui
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
@ -35,16 +35,16 @@ jobs:
fetch-depth: 0 fetch-depth: 0
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
- name: Merge base into tabbar - name: Merge main into base-sard-ui
run: | run: |
git config user.name "GitHub Actions" git config user.name "GitHub Actions"
git config user.email "actions@github.com" git config user.email "actions@github.com"
git checkout tabbar git checkout base-sard-ui
git merge base --no-ff -m "Auto merge base into tabbar" git merge main --no-ff -m "Auto merge main into base-sard-ui"
git push origin tabbar git push origin base-sard-ui
merge-to-spa: merge-to-base-uv-ui:
name: Merge base into spa name: Merge main into base-uv-ui
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository
@ -53,10 +53,28 @@ jobs:
fetch-depth: 0 fetch-depth: 0
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
- name: Merge base into spa - name: Merge main into base-uv-ui
run: | run: |
git config user.name "GitHub Actions" git config user.name "GitHub Actions"
git config user.email "actions@github.com" git config user.email "actions@github.com"
git checkout spa git checkout base-uv-ui
git merge base --no-ff -m "Auto merge base into spa" git merge main --no-ff -m "Auto merge main into base-uv-ui"
git push origin spa git push origin base-uv-ui
merge-to-base-uview-plus:
name: Merge main into base-uview-plus
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-uview-plus
run: |
git config user.name "GitHub Actions"
git config user.email "actions@github.com"
git checkout base-uview-plus
git merge main --no-ff -m "Auto merge main into base-uview-plus"
git push origin base-uview-plus

2
.gitignore vendored
View File

@ -27,7 +27,7 @@ dist
docs/.vitepress/dist docs/.vitepress/dist
docs/.vitepress/cache docs/.vitepress/cache
types src/types
# lock 文件还是不要了,我主要的版本写死就好了 # lock 文件还是不要了,我主要的版本写死就好了
# pnpm-lock.yaml # pnpm-lock.yaml

View File

@ -1,34 +0,0 @@
{
"$schema": "./node_modules/oxlint/configuration_schema.json",
"extends": ["config:recommended"],
"plugins": ["import", "typescript", "unicorn"],
"rules": {
"no-console": "off",
"no-unused-vars": "off"
},
"env": {
"es6": true
},
"globals": {
"foo": "readonly"
},
"ignorePatterns": [
"node_modules",
"dist",
"src/static/**",
"src/uni_modules/**",
"vite.config.ts",
"uno.config.ts",
"pages.config.ts",
"manifest.config.ts"
],
"settings": {},
"overrides": [
{
"files": ["*.test.ts", "*.spec.ts"],
"rules": {
"@typescript-eslint/no-explicit-any": "off"
}
}
]
}

View File

@ -1,3 +1,5 @@
node_modules
# unplugin-auto-import 生成的类型文件,每次提交都改变,所以加入这里吧,与 .gitignore 配合使用 # unplugin-auto-import 生成的类型文件,每次提交都改变,所以加入这里吧,与 .gitignore 配合使用
auto-import.d.ts auto-import.d.ts

76
.vscode/settings.json vendored
View File

@ -1,14 +1,7 @@
{ {
// prettier // prettier
"editor.defaultFormatter": "esbenp.prettier-vscode", "editor.defaultFormatter": "esbenp.prettier-vscode",
//
"editor.formatOnSave": true,
//
"editor.codeActionsOnSave": {
"source.fixAll": "explicit",
"source.fixAll.eslint": "explicit",
"source.fixAll.stylelint": "explicit"
},
// stylelint // stylelint
"stylelint.validate": ["css", "scss", "vue", "html"], // package.jsonscripts "stylelint.validate": ["css", "scss", "vue", "html"], // package.jsonscripts
"stylelint.enable": true, "stylelint.enable": true,
@ -48,6 +41,7 @@
"tabbar", "tabbar",
"Toutiao", "Toutiao",
"unibest", "unibest",
"uview",
"uvui", "uvui",
"Wechat", "Wechat",
"WechatMiniprogram", "WechatMiniprogram",
@ -59,7 +53,67 @@
"explorer.fileNesting.patterns": { "explorer.fileNesting.patterns": {
"README.md": "index.html,favicon.ico,robots.txt,CHANGELOG.md", "README.md": "index.html,favicon.ico,robots.txt,CHANGELOG.md",
"pages.config.ts": "manifest.config.ts,openapi-ts-request.config.ts", "pages.config.ts": "manifest.config.ts,openapi-ts-request.config.ts",
"package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,.npmrc,.browserslistrc", "package.json": "tsconfig.json,pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,.npmrc,.browserslistrc",
".oxlintrc.json": "tsconfig.json,.commitlintrc.*,.prettier*,.editorconfig,.commitlint.cjs,.eslint*" "eslint.config.mjs": ".commitlintrc.*,.prettier*,.editorconfig,.commitlint.cjs,.eslint*"
} },
// //
// "prettier.enable": true,
// "editor.formatOnSave": true,
// //
// "editor.codeActionsOnSave": {
// "source.fixAll": "explicit",
// "source.fixAll.eslint": "explicit",
// "source.fixAll.stylelint": "explicit"
// },
// Disable the default formatter, use eslint instead
"prettier.enable": false,
"editor.formatOnSave": false,
// Auto fix
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit",
"source.organizeImports": "never"
},
// Silent the stylistic rules in you IDE, but still auto fix them
"eslint.rules.customizations": [
{ "rule": "style/*", "severity": "off", "fixable": true },
{ "rule": "format/*", "severity": "off", "fixable": true },
{ "rule": "*-indent", "severity": "off", "fixable": true },
{ "rule": "*-spacing", "severity": "off", "fixable": true },
{ "rule": "*-spaces", "severity": "off", "fixable": true },
{ "rule": "*-order", "severity": "off", "fixable": true },
{ "rule": "*-dangle", "severity": "off", "fixable": true },
{ "rule": "*-newline", "severity": "off", "fixable": true },
{ "rule": "*quotes", "severity": "off", "fixable": true },
{ "rule": "*semi", "severity": "off", "fixable": true }
],
// Enable eslint for all supported languages
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact",
"vue",
"html",
"markdown",
"json",
"json5",
"jsonc",
"yaml",
"toml",
"xml",
"gql",
"graphql",
"astro",
"svelte",
"css",
"less",
"scss",
"pcss",
"postcss"
]
} }

View File

@ -27,12 +27,12 @@
" },", " },",
"}", "}",
"</route>\n", "</route>\n",
"<template>",
" <view class=\"\">$2</view>",
"</template>\n",
"<script lang=\"ts\" setup>", "<script lang=\"ts\" setup>",
"//$3", "//$3",
"</script>\n", "</script>\n",
"<template>",
" <view class=\"\">$2</view>",
"</template>\n",
"<style lang=\"scss\" scoped>", "<style lang=\"scss\" scoped>",
"//$4", "//$4",
"</style>\n", "</style>\n",
@ -41,16 +41,28 @@
"Print unibest style": { "Print unibest style": {
"scope": "vue", "scope": "vue",
"prefix": "st", "prefix": "st",
"body": ["<style lang=\"scss\" scoped>", "//", "</style>\n"], "body": [
"<style lang=\"scss\" scoped>",
"//",
"</style>\n"
],
}, },
"Print unibest script": { "Print unibest script": {
"scope": "vue", "scope": "vue",
"prefix": "sc", "prefix": "sc",
"body": ["<script lang=\"ts\" setup>", "//$3", "</script>\n"], "body": [
"<script lang=\"ts\" setup>",
"//$3",
"</script>\n"
],
}, },
"Print unibest template": { "Print unibest template": {
"scope": "vue", "scope": "vue",
"prefix": "te", "prefix": "te",
"body": ["<template>", " <view class=\"\">$1</view>", "</template>\n"], "body": [
"<template>",
" <view class=\"\">$1</view>",
"</template>\n"
],
}, },
} }

View File

@ -70,13 +70,13 @@
## 📦 运行(支持热更新) ## 📦 运行(支持热更新)
- web平台 `pnpm dev:h5`, 然后打开 [http://localhost:9000/](http://localhost:9000/)。 - web平台 `pnpm dev:h5`, 然后打开 [http://localhost:9000/](http://localhost:9000/)。
- weixin平台`pnpm dev:mp-weixin` 然后打开微信开发者工具,导入本地文件夹,选择本项目的`dist/dev/mp-weixin` 文件。 - weixin平台`pnpm dev:mp` 然后打开微信开发者工具,导入本地文件夹,选择本项目的`dist/dev/mp-weixin` 文件。
- APP平台`pnpm dev:app`, 然后打开 `HBuilderX`,导入刚刚生成的`dist/dev/app` 文件夹,选择运行到模拟器(开发时优先使用),或者运行的安卓/ios基座。 - APP平台`pnpm dev:app`, 然后打开 `HBuilderX`,导入刚刚生成的`dist/dev/app` 文件夹,选择运行到模拟器(开发时优先使用),或者运行的安卓/ios基座。
## 🔗 发布 ## 🔗 发布
- web平台 `pnpm build:h5`,打包后的文件在 `dist/build/h5`可以放到web服务器如nginx运行。如果最终不是放在根目录可以在 `manifest.config.ts` 文件的 `h5.router.base` 属性进行修改。 - web平台 `pnpm build:h5`,打包后的文件在 `dist/build/h5`可以放到web服务器如nginx运行。如果最终不是放在根目录可以在 `manifest.config.ts` 文件的 `h5.router.base` 属性进行修改。
- weixin平台`pnpm build:mp-weixin`, 打包后的文件在 `dist/build/mp-weixin`,然后通过微信开发者工具导入,并点击右上角的“上传”按钮进行上传。 - weixin平台`pnpm build:mp`, 打包后的文件在 `dist/build/mp-weixin`,然后通过微信开发者工具导入,并点击右上角的“上传”按钮进行上传。
- APP平台`pnpm build:app`, 然后打开 `HBuilderX`,导入刚刚生成的`dist/build/app` 文件夹,选择发行 - APP云打包。 - APP平台`pnpm build:app`, 然后打开 `HBuilderX`,导入刚刚生成的`dist/build/app` 文件夹,选择发行 - APP云打包。
## 📄 License ## 📄 License

22
eslint.config.mjs Normal file
View File

@ -0,0 +1,22 @@
import uniHelper from '@uni-helper/eslint-config'
export default uniHelper({
unocss: true,
vue: true,
markdown: false,
ignores: [
'src/uni_modules/',
'dist',
],
rules: {
'no-console': 'off',
'no-unused-vars': 'off',
'vue/no-unused-refs': 'off',
'unused-imports/no-unused-vars': 'off',
'eslint-comments/no-unlimited-disable': 'off',
'jsdoc/check-param-names': 'off',
'jsdoc/require-returns-description': 'off',
'ts/no-empty-object-type': 'off',
'no-extend-native': 'off',
},
})

View File

@ -1,6 +1,7 @@
import path from 'node:path'
import process from 'node:process'
// manifest.config.ts // manifest.config.ts
import { defineManifestConfig } from '@uni-helper/vite-plugin-uni-manifest' import { defineManifestConfig } from '@uni-helper/vite-plugin-uni-manifest'
import path from 'node:path'
import { loadEnv } from 'vite' import { loadEnv } from 'vite'
// 获取环境变量的范例 // 获取环境变量的范例
@ -14,14 +15,14 @@ const {
} = env } = env
export default defineManifestConfig({ export default defineManifestConfig({
name: VITE_APP_TITLE, 'name': VITE_APP_TITLE,
appid: VITE_UNI_APPID, 'appid': VITE_UNI_APPID,
description: '', 'description': '',
versionName: '1.0.0', 'versionName': '1.0.0',
versionCode: '100', 'versionCode': '100',
transformPx: false, 'transformPx': false,
locale: VITE_FALLBACK_LOCALE, // 'zh-Hans' 'locale': VITE_FALLBACK_LOCALE, // 'zh-Hans'
h5: { 'h5': {
router: { router: {
base: VITE_APP_PUBLIC_BASE, base: VITE_APP_PUBLIC_BASE,
}, },
@ -82,14 +83,14 @@ export default defineManifestConfig({
ios: { ios: {
appstore: 'static/app/icons/1024x1024.png', appstore: 'static/app/icons/1024x1024.png',
ipad: { ipad: {
app: 'static/app/icons/76x76.png', 'app': 'static/app/icons/76x76.png',
'app@2x': 'static/app/icons/152x152.png', 'app@2x': 'static/app/icons/152x152.png',
notification: 'static/app/icons/20x20.png', 'notification': 'static/app/icons/20x20.png',
'notification@2x': 'static/app/icons/40x40.png', 'notification@2x': 'static/app/icons/40x40.png',
'proapp@2x': 'static/app/icons/167x167.png', 'proapp@2x': 'static/app/icons/167x167.png',
settings: 'static/app/icons/29x29.png', 'settings': 'static/app/icons/29x29.png',
'settings@2x': 'static/app/icons/58x58.png', 'settings@2x': 'static/app/icons/58x58.png',
spotlight: 'static/app/icons/40x40.png', 'spotlight': 'static/app/icons/40x40.png',
'spotlight@2x': 'static/app/icons/80x80.png', 'spotlight@2x': 'static/app/icons/80x80.png',
}, },
iphone: { iphone: {
@ -107,7 +108,7 @@ export default defineManifestConfig({
}, },
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
quickapp: {}, 'quickapp': {},
/* 小程序特有相关 */ /* 小程序特有相关 */
'mp-weixin': { 'mp-weixin': {
appid: VITE_WX_APPID, appid: VITE_WX_APPID,
@ -130,8 +131,8 @@ export default defineManifestConfig({
'mp-toutiao': { 'mp-toutiao': {
usingComponents: true, usingComponents: true,
}, },
uniStatistics: { 'uniStatistics': {
enable: false, enable: false,
}, },
vueVersion: '3', 'vueVersion': '3',
}) })

View File

@ -1,9 +1,9 @@
{ {
"name": "unibest", "name": "unibest",
"type": "commonjs", "type": "commonjs",
"version": "2.13.1", "version": "3.1.0",
"description": "unibest - 最好的 uniapp 开发模板", "description": "unibest - 最好的 uniapp 开发模板",
"update-time": "2025-06-17", "update-time": "2025-06-21",
"author": { "author": {
"name": "feige996", "name": "feige996",
"zhName": "菲鸽", "zhName": "菲鸽",
@ -11,8 +11,8 @@
"github": "https://github.com/feige996", "github": "https://github.com/feige996",
"gitee": "https://gitee.com/feige996" "gitee": "https://gitee.com/feige996"
}, },
"homepage": "https://unibest.tech",
"license": "MIT", "license": "MIT",
"homepage": "https://unibest.tech",
"repository": "https://github.com/feige996/unibest", "repository": "https://github.com/feige996/unibest",
"repository-gitee": "https://gitee.com/feige996/unibest", "repository-gitee": "https://gitee.com/feige996/unibest",
"repository-old": "https://github.com/codercup/unibest", "repository-old": "https://github.com/codercup/unibest",
@ -72,21 +72,8 @@
"type-check": "vue-tsc --noEmit", "type-check": "vue-tsc --noEmit",
"openapi-ts-request": "openapi-ts", "openapi-ts-request": "openapi-ts",
"prepare": "git init && husky", "prepare": "git init && husky",
"lint": "oxlint", "lint": "eslint",
"lint-fix": "oxlint --fix" "lint:fix": "eslint --fix"
},
"lint-staged": {
"**/*.{html,cjs,json,md,scss,css,txt}": [
"prettier --write --cache"
],
"**/*.{js,jsx,ts,tsx,vue,mjs,cjs,mts,cts}": [
"oxlint --fix",
"prettier --write --cache"
],
"!**/{node_modules,dist}/**": []
},
"resolutions": {
"bin-wrapper": "npm:bin-wrapper-china"
}, },
"dependencies": { "dependencies": {
"@dcloudio/uni-app": "3.0.0-4060620250520001", "@dcloudio/uni-app": "3.0.0-4060620250520001",
@ -111,12 +98,12 @@
"js-cookie": "^3.0.5", "js-cookie": "^3.0.5",
"pinia": "2.0.36", "pinia": "2.0.36",
"pinia-plugin-persistedstate": "3.2.1", "pinia-plugin-persistedstate": "3.2.1",
"qs": "6.5.3",
"vue": "^3.4.21", "vue": "^3.4.21",
"wot-design-uni": "^1.9.1", "wot-design-uni": "^1.9.1",
"z-paging": "2.8.7" "z-paging": "2.8.7"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^4.15.0",
"@commitlint/cli": "^19.8.1", "@commitlint/cli": "^19.8.1",
"@commitlint/config-conventional": "^19.8.1", "@commitlint/config-conventional": "^19.8.1",
"@dcloudio/types": "^3.4.8", "@dcloudio/types": "^3.4.8",
@ -124,12 +111,13 @@
"@dcloudio/uni-cli-shared": "3.0.0-4060620250520001", "@dcloudio/uni-cli-shared": "3.0.0-4060620250520001",
"@dcloudio/uni-stacktracey": "3.0.0-4060620250520001", "@dcloudio/uni-stacktracey": "3.0.0-4060620250520001",
"@dcloudio/vite-plugin-uni": "3.0.0-4060620250520001", "@dcloudio/vite-plugin-uni": "3.0.0-4060620250520001",
"@esbuild/darwin-arm64": "0.25.5", "@esbuild/darwin-arm64": "0.20.2",
"@esbuild/darwin-x64": "0.25.5", "@esbuild/darwin-x64": "0.20.2",
"@iconify-json/carbon": "^1.2.4", "@iconify-json/carbon": "^1.2.4",
"@rollup/rollup-darwin-x64": "^4.28.0", "@rollup/rollup-darwin-x64": "^4.28.0",
"@types/node": "^20.17.9", "@types/node": "^20.17.9",
"@types/wechat-miniprogram": "^3.4.8", "@types/wechat-miniprogram": "^3.4.8",
"@uni-helper/eslint-config": "^0.4.0",
"@uni-helper/uni-types": "1.0.0-alpha.3", "@uni-helper/uni-types": "1.0.0-alpha.3",
"@uni-helper/unocss-preset-uni": "^0.2.11", "@uni-helper/unocss-preset-uni": "^0.2.11",
"@uni-helper/vite-plugin-uni-components": "0.2.0", "@uni-helper/vite-plugin-uni-components": "0.2.0",
@ -138,14 +126,15 @@
"@uni-helper/vite-plugin-uni-pages": "0.2.28", "@uni-helper/vite-plugin-uni-pages": "0.2.28",
"@uni-helper/vite-plugin-uni-platform": "0.0.4", "@uni-helper/vite-plugin-uni-platform": "0.0.4",
"@uni-ku/bundle-optimizer": "^1.3.3", "@uni-ku/bundle-optimizer": "^1.3.3",
"@unocss/eslint-plugin": "^66.2.3",
"@unocss/preset-legacy-compat": "^0.59.4", "@unocss/preset-legacy-compat": "^0.59.4",
"@vue/runtime-core": "^3.4.21", "@vue/runtime-core": "^3.4.21",
"@vue/tsconfig": "^0.1.3", "@vue/tsconfig": "^0.1.3",
"autoprefixer": "^10.4.20", "autoprefixer": "^10.4.20",
"eslint": "^9.29.0",
"husky": "^9.1.7", "husky": "^9.1.7",
"lint-staged": "^15.2.10", "lint-staged": "^15.2.10",
"openapi-ts-request": "^1.1.2", "openapi-ts-request": "^1.1.2",
"oxlint": "1.0.0",
"postcss": "^8.4.49", "postcss": "^8.4.49",
"postcss-html": "^1.7.0", "postcss-html": "^1.7.0",
"postcss-scss": "^4.0.9", "postcss-scss": "^4.0.9",
@ -159,5 +148,11 @@
"vite": "5.2.8", "vite": "5.2.8",
"vite-plugin-restart": "^0.4.2", "vite-plugin-restart": "^0.4.2",
"vue-tsc": "^2.2.10" "vue-tsc": "^2.2.10"
},
"resolutions": {
"bin-wrapper": "npm:bin-wrapper-china"
},
"lint-staged": {
"*": "eslint --fix"
} }
} }

View File

@ -1,4 +1,5 @@
import { defineUniPages } from '@uni-helper/vite-plugin-uni-pages' import { defineUniPages } from '@uni-helper/vite-plugin-uni-pages'
import { tabBar } from './src/layouts/fg-tabbar/tabbarList'
export default defineUniPages({ export default defineUniPages({
globalStyle: { globalStyle: {
@ -17,29 +18,6 @@ export default defineUniPages({
'z-paging/components/z-paging$1/z-paging$1.vue', 'z-paging/components/z-paging$1/z-paging$1.vue',
}, },
}, },
// 如果不需要tabBar推荐使用 spa 模板。pnpm create xxx -t spa // tabbar 的配置统一在 “./src/layouts/fg-tabbar/tabbarList.ts” 文件中
tabBar: { tabBar: tabBar as any,
color: '#999999',
selectedColor: '#018d71',
backgroundColor: '#F8F8F8',
borderStyle: 'black',
height: '50px',
fontSize: '10px',
iconWidth: '24px',
spacing: '3px',
list: [
{
iconPath: 'static/tabbar/home.png',
selectedIconPath: 'static/tabbar/homeHL.png',
pagePath: 'pages/index/index',
text: '首页',
},
{
iconPath: 'static/tabbar/example.png',
selectedIconPath: 'static/tabbar/exampleHL.png',
pagePath: 'pages/about/about',
text: '关于',
},
],
},
}) })

View File

@ -0,0 +1,13 @@
diff --git a/dist/uni-h5.es.js b/dist/uni-h5.es.js
index 7421bad97d94ad34a3d4d94292a9ee9071430662..19c6071ee4036ceb8d1cfa09030e471c002d2cda 100644
--- a/dist/uni-h5.es.js
+++ b/dist/uni-h5.es.js
@@ -23410,7 +23410,7 @@ function useShowTabBar(emit2) {
const tabBar2 = useTabBar();
const showTabBar2 = computed(() => route.meta.isTabBar && tabBar2.shown);
updateCssVar({
- "--tab-bar-height": tabBar2.height
+ "--tab-bar-height": tabBar2?.height || 0
});
return showTabBar2;
}

2265
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

2
pnpm-workspace.yaml Normal file
View File

@ -0,0 +1,2 @@
patchedDependencies:
'@dcloudio/uni-h5': patches/@dcloudio__uni-h5.patch

View File

@ -2,8 +2,7 @@
// # 在升级完后,会自动添加很多无用依赖,这需要删除以减小依赖包体积 // # 在升级完后,会自动添加很多无用依赖,这需要删除以减小依赖包体积
// # 只需要执行下面的命令即可 // # 只需要执行下面的命令即可
// eslint-disable-next-line @typescript-eslint/no-var-requires const { exec } = require('node:child_process')
const { exec } = require('child_process')
// 定义要执行的命令 // 定义要执行的命令
const dependencies = [ const dependencies = [

View File

@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { onLaunch, onShow, onHide } from '@dcloudio/uni-app' import { onHide, onLaunch, onShow } from '@dcloudio/uni-app'
import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only'
import { usePageAuth } from '@/hooks/usePageAuth' import { usePageAuth } from '@/hooks/usePageAuth'
import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only'
usePageAuth() usePageAuth()

View File

@ -1,4 +1,4 @@
import { ICaptcha, IUpdateInfo, IUpdatePassword, IUserInfoVo, IUserLogin } from './login.typings' import type { ICaptcha, IUpdateInfo, IUpdatePassword, IUserInfoVo, IUserLogin } from './types/login'
import { http } from '@/utils/http' import { http } from '@/utils/http'
/** /**
@ -15,7 +15,7 @@ export interface ILoginForm {
* *
* @returns ICaptcha * @returns ICaptcha
*/ */
export const getCode = () => { export function getCode() {
return http.get<ICaptcha>('/user/getCode') return http.get<ICaptcha>('/user/getCode')
} }
@ -23,35 +23,35 @@ export const getCode = () => {
* *
* @param loginForm * @param loginForm
*/ */
export const login = (loginForm: ILoginForm) => { export function login(loginForm: ILoginForm) {
return http.post<IUserLogin>('/user/login', loginForm) return http.post<IUserLogin>('/user/login', loginForm)
} }
/** /**
* *
*/ */
export const getUserInfo = () => { export function getUserInfo() {
return http.get<IUserInfoVo>('/user/info') return http.get<IUserInfoVo>('/user/info')
} }
/** /**
* 退 * 退
*/ */
export const logout = () => { export function logout() {
return http.get<void>('/user/logout') return http.get<void>('/user/logout')
} }
/** /**
* *
*/ */
export const updateInfo = (data: IUpdateInfo) => { export function updateInfo(data: IUpdateInfo) {
return http.post('/user/updateInfo', data) return http.post('/user/updateInfo', data)
} }
/** /**
* *
*/ */
export const updateUserPassword = (data: IUpdatePassword) => { export function updateUserPassword(data: IUpdatePassword) {
return http.post('/user/updatePassword', data) return http.post('/user/updatePassword', data)
} }
@ -59,12 +59,12 @@ export const updateUserPassword = (data: IUpdatePassword) => {
* *
* @returns Promise (code) * @returns Promise (code)
*/ */
export const getWxCode = () => { export function getWxCode() {
return new Promise<UniApp.LoginRes>((resolve, reject) => { return new Promise<UniApp.LoginRes>((resolve, reject) => {
uni.login({ uni.login({
provider: 'weixin', provider: 'weixin',
success: (res) => resolve(res), success: res => resolve(res),
fail: (err) => reject(new Error(err)), fail: err => reject(new Error(err)),
}) })
}) })
} }
@ -78,6 +78,6 @@ export const getWxCode = () => {
* @param params code * @param params code
* @returns Promise * @returns Promise
*/ */
export const wxLogin = (data: { code: string }) => { export function wxLogin(data: { code: string }) {
return http.post<IUserLogin>('/user/wxLogin', data) return http.post<IUserLogin>('/user/wxLogin', data)
} }

View File

@ -1,7 +1,7 @@
/** /**
* *
*/ */
export type IUserInfoVo = { export interface IUserInfoVo {
id: number id: number
username: string username: string
avatar: string avatar: string
@ -11,7 +11,7 @@ export type IUserInfoVo = {
/** /**
* *
*/ */
export type IUserLogin = { export interface IUserLogin {
id: string id: string
username: string username: string
token: string token: string
@ -20,7 +20,7 @@ export type IUserLogin = {
/** /**
* *
*/ */
export type ICaptcha = { export interface ICaptcha {
captchaEnabled: boolean captchaEnabled: boolean
uuid: string uuid: string
image: string image: string
@ -28,7 +28,7 @@ export type ICaptcha = {
/** /**
* *
*/ */
export type IUploadSuccessInfo = { export interface IUploadSuccessInfo {
fileId: number fileId: number
originalName: string originalName: string
fileName: string fileName: string
@ -41,7 +41,7 @@ export type IUploadSuccessInfo = {
/** /**
* *
*/ */
export type IUpdateInfo = { export interface IUpdateInfo {
id: number id: number
name: string name: string
sex: string sex: string
@ -49,7 +49,7 @@ export type IUpdateInfo = {
/** /**
* *
*/ */
export type IUpdatePassword = { export interface IUpdatePassword {
id: number id: number
oldPassword: string oldPassword: string
newPassword: string newPassword: string

7
src/env.d.ts vendored
View File

@ -2,8 +2,8 @@
/// <reference types="vite-svg-loader" /> /// <reference types="vite-svg-loader" />
declare module '*.vue' { declare module '*.vue' {
import { DefineComponent } from 'vue' import type { DefineComponent } from 'vue'
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
const component: DefineComponent<{}, {}, any> const component: DefineComponent<{}, {}, any>
export default component export default component
} }
@ -29,3 +29,6 @@ interface ImportMetaEnv {
interface ImportMeta { interface ImportMeta {
readonly env: ImportMetaEnv readonly env: ImportMetaEnv
} }
declare const __VITE_APP_PROXY__: 'true' | 'false'
declare const __UNI_PLATFORM__: 'app' | 'h5' | 'mp-alipay' | 'mp-baidu' | 'mp-kuaishou' | 'mp-lark' | 'mp-qq' | 'mp-tiktok' | 'mp-weixin' | 'mp-xiaochengxu'

View File

@ -1,10 +1,10 @@
import { onLoad } from '@dcloudio/uni-app' import { onLoad } from '@dcloudio/uni-app'
import { needLoginPages as _needLoginPages, getNeedLoginPages } from '@/utils'
import { useUserStore } from '@/store' import { useUserStore } from '@/store'
import { needLoginPages as _needLoginPages, getNeedLoginPages } from '@/utils'
const loginRoute = import.meta.env.VITE_LOGIN_URL const loginRoute = import.meta.env.VITE_LOGIN_URL
const isDev = import.meta.env.DEV const isDev = import.meta.env.DEV
const isLogined = () => { function isLogined() {
const userStore = useUserStore() const userStore = useUserStore()
return !!userStore.userInfo.username return !!userStore.userInfo.username
} }
@ -20,7 +20,8 @@ export function usePageAuth() {
let needLoginPages: string[] = [] let needLoginPages: string[] = []
if (isDev) { if (isDev) {
needLoginPages = getNeedLoginPages() needLoginPages = getNeedLoginPages()
} else { }
else {
needLoginPages = _needLoginPages needLoginPages = _needLoginPages
} }

View File

@ -1,6 +1,6 @@
import { UnwrapRef } from 'vue' import type { UnwrapRef } from 'vue'
type IUseRequestOptions<T> = { interface IUseRequestOptions<T> {
/** 是否立即执行 */ /** 是否立即执行 */
immediate?: boolean immediate?: boolean
/** 初始化数据 */ /** 初始化数据 */

View File

@ -7,7 +7,7 @@ type TfileType = 'image' | 'file'
type TImage = 'png' | 'jpg' | 'jpeg' | 'webp' | '*' type TImage = 'png' | 'jpg' | 'jpeg' | 'webp' | '*'
type TFile = 'doc' | 'docx' | 'ppt' | 'zip' | 'xls' | 'xlsx' | 'txt' | TImage type TFile = 'doc' | 'docx' | 'ppt' | 'zip' | 'xls' | 'xlsx' | 'txt' | TImage
type TOptions<T extends TfileType> = { interface TOptions<T extends TfileType> {
formData?: Record<string, any> formData?: Record<string, any>
maxSize?: number maxSize?: number
accept?: T extends 'image' ? TImage[] : TFile[] accept?: T extends 'image' ? TImage[] : TFile[]
@ -30,6 +30,46 @@ export default function useUpload<T extends TfileType>(options: TOptions<T> = {}
const error = ref<Error | null>(null) const error = ref<Error | null>(null)
const data = ref<any>(null) const data = ref<any>(null)
const handleFileChoose = ({ tempFilePath, size }: { tempFilePath: string, size: number }) => {
if (size > maxSize) {
uni.showToast({
title: `文件大小不能超过 ${maxSize / 1024 / 1024}MB`,
icon: 'none',
})
return
}
// const fileExtension = file?.tempFiles?.name?.split('.').pop()?.toLowerCase()
// const isTypeValid = accept.some((type) => type === '*' || type.toLowerCase() === fileExtension)
// if (!isTypeValid) {
// uni.showToast({
// title: `仅支持 ${accept.join(', ')} 格式的文件`,
// icon: 'none',
// })
// return
// }
loading.value = true
uploadFile({
tempFilePath,
formData,
onSuccess: (res) => {
const { data: _data } = JSON.parse(res)
data.value = _data
// console.log('上传成功', res)
success?.(_data)
},
onError: (err) => {
error.value = err
onError?.(err)
},
onComplete: () => {
loading.value = false
},
})
}
const run = () => { const run = () => {
// 微信小程序从基础库 2.21.0 开始, wx.chooseImage 停止维护,请使用 uni.chooseMedia 代替。 // 微信小程序从基础库 2.21.0 开始, wx.chooseImage 停止维护,请使用 uni.chooseMedia 代替。
// 微信小程序在2023年10月17日之后使用本API需要配置隐私协议 // 微信小程序在2023年10月17日之后使用本API需要配置隐私协议
@ -37,19 +77,21 @@ export default function useUpload<T extends TfileType>(options: TOptions<T> = {}
count: 1, count: 1,
success: (res: any) => { success: (res: any) => {
console.log('File selected successfully:', res) console.log('File selected successfully:', res)
// h5中res:{errMsg: "chooseImage:ok", tempFilePaths: "blob:http://localhost:9000/f74ab6b8-a14d-4cb6-a10d-fcf4511a0de5", tempFiles: [File]}
// h5的File有一下字段{name: "girl.jpeg", size: 48976, type: "image/jpeg"}
// 小程序中res:{errMsg: "chooseImage:ok", tempFiles: [{fileType: "image", size: 48976, tempFilePath: "http://tmp/5iG1WpIxTaJf3ece38692a337dc06df7eb69ecb49c6b.jpeg"}]} // 小程序中res:{errMsg: "chooseImage:ok", tempFiles: [{fileType: "image", size: 48976, tempFilePath: "http://tmp/5iG1WpIxTaJf3ece38692a337dc06df7eb69ecb49c6b.jpeg"}]}
// h5中res:{errMsg: "chooseImage:ok", tempFilePaths: "blob:http://localhost:9000/f74ab6b8-a14d-4cb6-a10d-fcf4511a0de5", tempFiles: [File]}
// h5的File有以下字段{name: "girl.jpeg", size: 48976, type: "image/jpeg"}
// App中res:{errMsg: "chooseImage:ok", tempFilePaths: "file:///Users/feige/xxx/gallery/1522437259-compressed-IMG_0006.jpg", tempFiles: [File]}
// App的File有以下字段{path: "file:///Users/feige/xxx/gallery/1522437259-compressed-IMG_0006.jpg", size: 48976}
let tempFilePath = '' let tempFilePath = ''
let size = 0 let size = 0
// #ifdef H5
tempFilePath = res.tempFilePaths[0]
size = res.tempFiles[0].size
// #endif
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
tempFilePath = res.tempFiles[0].tempFilePath tempFilePath = res.tempFiles[0].tempFilePath
size = res.tempFiles[0].size size = res.tempFiles[0].size
// #endif // #endif
// #ifndef MP-WEIXIN
tempFilePath = res.tempFilePaths[0]
size = res.tempFiles[0].size
// #endif
handleFileChoose({ tempFilePath, size }) handleFileChoose({ tempFilePath, size })
}, },
fail: (err: any) => { fail: (err: any) => {
@ -70,7 +112,8 @@ export default function useUpload<T extends TfileType>(options: TOptions<T> = {}
// #ifndef MP-WEIXIN // #ifndef MP-WEIXIN
uni.chooseImage(chooseFileOptions) uni.chooseImage(chooseFileOptions)
// #endif // #endif
} else { }
else {
uni.chooseFile({ uni.chooseFile({
...chooseFileOptions, ...chooseFileOptions,
type: 'all', type: 'all',
@ -78,46 +121,6 @@ export default function useUpload<T extends TfileType>(options: TOptions<T> = {}
} }
} }
const handleFileChoose = ({ tempFilePath, size }: { tempFilePath: string; size: number }) => {
if (size > maxSize) {
uni.showToast({
title: `文件大小不能超过 ${maxSize / 1024 / 1024}MB`,
icon: 'none',
})
return
}
// const fileExtension = file?.tempFiles?.name?.split('.').pop()?.toLowerCase()
// const isTypeValid = accept.some((type) => type === '*' || type.toLowerCase() === fileExtension)
// if (!isTypeValid) {
// uni.showToast({
// title: `仅支持 ${accept.join(', ')} 格式的文件`,
// icon: 'none',
// })
// return
// }
loading.value = true
uploadFile({
tempFilePath: tempFilePath,
formData,
onSuccess: (res) => {
const { data: _data } = JSON.parse(res)
data.value = _data
// console.log('上传成功', res)
success?.(_data)
},
onError: (err) => {
error.value = err
onError?.(err)
},
onComplete: () => {
loading.value = false
},
})
}
return { loading, error, data, run } return { loading, error, data, run }
} }
@ -143,7 +146,8 @@ async function uploadFile({
try { try {
const data = uploadFileRes.data const data = uploadFileRes.data
onSuccess(data) onSuccess(data)
} catch (err) { }
catch (err) {
onError(err) onError(err)
} }
}, },

View File

@ -1,3 +1,3 @@
export { routeInterceptor } from './route'
export { requestInterceptor } from './request'
export { prototypeInterceptor } from './prototype' export { prototypeInterceptor } from './prototype'
export { requestInterceptor } from './request'
export { routeInterceptor } from './route'

View File

@ -2,10 +2,11 @@ export const prototypeInterceptor = {
install() { install() {
// 解决低版本手机不识别 array.at() 导致运行报错的问题 // 解决低版本手机不识别 array.at() 导致运行报错的问题
if (typeof Array.prototype.at !== 'function') { if (typeof Array.prototype.at !== 'function') {
// eslint-disable-next-line no-extend-native
Array.prototype.at = function (index: number) { Array.prototype.at = function (index: number) {
if (index < 0) return this[this.length + index] if (index < 0)
if (index >= this.length) return undefined return this[this.length + index]
if (index >= this.length)
return undefined
return this[index] return this[index]
} }
} }

View File

@ -1,8 +1,7 @@
/* eslint-disable no-param-reassign */
import qs from 'qs'
import { useUserStore } from '@/store' import { useUserStore } from '@/store'
import { platform } from '@/utils/platform'
import { getEnvBaseUrl } from '@/utils' import { getEnvBaseUrl } from '@/utils'
import { platform } from '@/utils/platform'
import { stringifyQuery } from '@/utils/queryString'
export type CustomRequestOptions = UniApp.RequestOptions & { export type CustomRequestOptions = UniApp.RequestOptions & {
query?: Record<string, any> query?: Record<string, any>
@ -19,10 +18,11 @@ const httpInterceptor = {
invoke(options: CustomRequestOptions) { invoke(options: CustomRequestOptions) {
// 接口请求支持通过 query 参数配置 queryString // 接口请求支持通过 query 参数配置 queryString
if (options.query) { if (options.query) {
const queryStr = qs.stringify(options.query) const queryStr = stringifyQuery(options.query)
if (options.url.includes('?')) { if (options.url.includes('?')) {
options.url += `&${queryStr}` options.url += `&${queryStr}`
} else { }
else {
options.url += `?${queryStr}` options.url += `?${queryStr}`
} }
} }
@ -33,7 +33,8 @@ const httpInterceptor = {
if (JSON.parse(__VITE_APP_PROXY__)) { if (JSON.parse(__VITE_APP_PROXY__)) {
// 自动拼接代理前缀 // 自动拼接代理前缀
options.url = import.meta.env.VITE_APP_PROXY_PREFIX + options.url options.url = import.meta.env.VITE_APP_PROXY_PREFIX + options.url
} else { }
else {
options.url = baseUrl + options.url options.url = baseUrl + options.url
} }
// #endif // #endif

View File

@ -5,12 +5,12 @@
* 便使 * 便使
*/ */
import { useUserStore } from '@/store' import { useUserStore } from '@/store'
import { needLoginPages as _needLoginPages, getNeedLoginPages, getLastPage } from '@/utils' import { needLoginPages as _needLoginPages, getLastPage, getNeedLoginPages } from '@/utils'
// TODO Check // TODO Check
const loginRoute = import.meta.env.VITE_LOGIN_URL const loginRoute = import.meta.env.VITE_LOGIN_URL
const isLogined = () => { function isLogined() {
const userStore = useUserStore() const userStore = useUserStore()
return !!userStore.userInfo.username return !!userStore.userInfo.username
} }
@ -37,7 +37,8 @@ const navigateToInterceptor = {
// 为了防止开发时出现BUG这里每次都获取一下。生产环境可以移到函数外性能更好 // 为了防止开发时出现BUG这里每次都获取一下。生产环境可以移到函数外性能更好
if (isDev) { if (isDev) {
needLoginPages = getNeedLoginPages() needLoginPages = getNeedLoginPages()
} else { }
else {
needLoginPages = _needLoginPages needLoginPages = _needLoginPages
} }
const isNeedLogin = needLoginPages.includes(path) const isNeedLogin = needLoginPages.includes(path)

View File

@ -1,12 +1,3 @@
<template>
<wd-config-provider :themeVars="themeVars">
<slot />
<wd-toast />
<wd-message-box />
<privacy-popup />
</wd-config-provider>
</template>
<script lang="ts" setup> <script lang="ts" setup>
import type { ConfigProviderThemeVars } from 'wot-design-uni' import type { ConfigProviderThemeVars } from 'wot-design-uni'
@ -16,3 +7,11 @@ const themeVars: ConfigProviderThemeVars = {
// buttonPrimaryColor: '#07c160', // buttonPrimaryColor: '#07c160',
} }
</script> </script>
<template>
<wd-config-provider :theme-vars="themeVars">
<slot />
<wd-toast />
<wd-message-box />
</wd-config-provider>
</template>

View File

@ -1,11 +1,3 @@
<template>
<wd-config-provider :themeVars="themeVars">
<slot />
<wd-toast />
<wd-message-box />
</wd-config-provider>
</template>
<script lang="ts" setup> <script lang="ts" setup>
import type { ConfigProviderThemeVars } from 'wot-design-uni' import type { ConfigProviderThemeVars } from 'wot-design-uni'
@ -15,3 +7,11 @@ const themeVars: ConfigProviderThemeVars = {
// buttonPrimaryColor: '#07c160', // buttonPrimaryColor: '#07c160',
} }
</script> </script>
<template>
<wd-config-provider :theme-vars="themeVars">
<slot />
<wd-toast />
<wd-message-box />
</wd-config-provider>
</template>

View File

@ -0,0 +1,67 @@
<script setup lang="ts">
import { tabbarStore } from './tabbar'
// 'i-carbon-code',
import { tabbarList as _tabBarList, cacheTabbarEnable, selectedTabbarStrategy } from './tabbarList'
// @ts-expect-error
const customTabbarEnable = selectedTabbarStrategy === 1 || selectedTabbarStrategy === 2
/** tabbarList 里面的 path 从 pages.config.ts 得到 */
const tabbarList = _tabBarList.map(item => ({ ...item, path: `/${item.pagePath}` }))
function selectTabBar({ value: index }: { value: number }) {
const url = tabbarList[index].path
tabbarStore.setCurIdx(index)
if (cacheTabbarEnable) {
uni.switchTab({ url })
}
else {
uni.navigateTo({ url })
}
}
onLoad(() => {
// tabBar 2 tabBar
// @ts-expect-error
const hideRedundantTabbarEnable = selectedTabbarStrategy === 1
hideRedundantTabbarEnable
&& uni.hideTabBar({
fail(err) {
console.log('hideTabBar fail: ', err)
},
success(res) {
console.log('hideTabBar success: ', res)
},
})
})
</script>
<template>
<wd-tabbar
v-if="customTabbarEnable"
v-model="tabbarStore.curIdx"
bordered
safeareainsetbottom
placeholder
fixed
@change="selectTabBar"
>
<block v-for="(item, idx) in tabbarList" :key="item.path">
<wd-tabbar-item v-if="item.iconType === 'uiLib'" :title="item.text" :icon="item.icon" />
<wd-tabbar-item
v-else-if="item.iconType === 'unocss' || item.iconType === 'iconfont'"
:title="item.text"
>
<template #icon>
<view
h-40rpx
w-40rpx
:class="[item.icon, idx === tabbarStore.curIdx ? 'is-active' : 'is-inactive']"
/>
</template>
</wd-tabbar-item>
<wd-tabbar-item v-else-if="item.iconType === 'local'" :title="item.text">
<template #icon>
<image :src="item.icon" h-40rpx w-40rpx />
</template>
</wd-tabbar-item>
</block>
</wd-tabbar>
</template>

View File

@ -0,0 +1,16 @@
# tabbar 说明
`tabbar` 分为 `4 种` 情况:
- `完全原生 tabbar`,使用 `switchTab` 切换 tabbar`tabbar` 页面有缓存。
- 优势:原生自带的 tabbar最先渲染有缓存。
- 劣势:只能使用 2 组图片来切换选中和非选中状态,修改颜色只能重新换图片(或者用 iconfont
- `半自定义 tabbar`,使用 `switchTab` 切换 tabbar`tabbar` 页面有缓存。使用了第三方 UI 库的 `tabbar` 组件,并隐藏了原生 `tabbar` 的显示。
- 优势:可以随意配置自己想要的 `svg icon`,切换字体颜色方便。有缓存。可以实现各种花里胡哨的动效等。
- 劣势:首次点击 tababr 会闪烁。
- `全自定义 tabbar`,使用 `navigateTo` 切换 `tabbar``tabbar` 页面无缓存。使用了第三方 UI 库的 `tabbar` 组件。
- 优势:可以随意配置自己想要的 svg icon切换字体颜色方便。可以实现各种花里胡哨的动效等。
- 劣势:首次点击 `tababr` 会闪烁,无缓存。
- `无 tabbar`,只有一个页面入口,底部无 `tabbar` 显示;常用语临时活动页。
> 注意:花里胡哨的效果需要自己实现,本模版不提供。

View File

@ -0,0 +1,11 @@
/**
* tabbar storageSync tabbar
* 使reactive简单状态 pinia
*/
export const tabbarStore = reactive({
curIdx: uni.getStorageSync('app-tabbar-index') || 0,
setCurIdx(idx: number) {
this.curIdx = idx
uni.setStorageSync('app-tabbar-index', idx)
},
})

View File

@ -0,0 +1,65 @@
/**
* tabbar tabbar.md
* 0: 'NATIVE_TABBAR' `完全原生 tabbar`
* 2: 'FULL_CUSTOM_TABBAR' `全自定义 tabbar`
* 1: 'HALF_CUSTOM_TABBAR' `半自定义 tabbar`
* 3: 'NO_TABBAR' `无 tabbar`
*
* pages.json
*/
// TODO通过这里切换使用tabbar的策略
export const selectedTabbarStrategy = 0
// 0 和 1 时需要tabbar缓存
export const cacheTabbarEnable = selectedTabbarStrategy < 2
// selectedTabbarStrategy==0 时,需要填 iconPath 和 selectedIconPath
// selectedTabbarStrategy==1 or 2 时,需要填 icon 和 iconType
// selectedTabbarStrategy==3 时tabbarList 不生效
export const tabbarList = [
{
iconPath: 'static/tabbar/home.png',
selectedIconPath: 'static/tabbar/homeHL.png',
pagePath: 'pages/index/index',
text: '首页',
icon: 'home',
iconType: 'uiLib',
},
{
iconPath: 'static/tabbar/example.png',
selectedIconPath: 'static/tabbar/exampleHL.png',
pagePath: 'pages/about/about',
text: '关于',
icon: 'i-carbon-code',
// 注意 unocss 的图标需要在 页面上引入一下,或者配置到 unocss.config.ts 的 safelist 中
iconType: 'unocss',
},
// {
// pagePath: 'pages/my/index',
// text: '我的',
// icon: '/static/logo.svg',
// iconType: 'local',
// },
// {
// pagePath: 'pages/mine/index',
// text: '我的',
// icon: 'iconfont icon-my',
// iconType: 'iconfont',
// },
]
const _tabbar = {
color: '#999999',
selectedColor: '#018d71',
backgroundColor: '#F8F8F8',
borderStyle: 'black',
height: '50px',
fontSize: '10px',
iconWidth: '24px',
spacing: '3px',
list: tabbarList,
}
// 0和1 需要显示底部的tabbar的各种配置以利用缓存
export const tabBar = cacheTabbarEnable ? _tabbar : undefined

19
src/layouts/tabbar.vue Normal file
View File

@ -0,0 +1,19 @@
<script lang="ts" setup>
import type { ConfigProviderThemeVars } from 'wot-design-uni'
import FgTabbar from './fg-tabbar/fg-tabbar.vue'
const themeVars: ConfigProviderThemeVars = {
// colorTheme: 'red',
// buttonPrimaryBgColor: '#07c160',
// buttonPrimaryColor: '#07c160',
}
</script>
<template>
<wd-config-provider :theme-vars="themeVars">
<slot />
<FgTabbar />
<wd-toast />
<wd-message-box />
</wd-config-provider>
</template>

View File

@ -1,11 +1,11 @@
import '@/style/index.scss'
import { VueQueryPlugin } from '@tanstack/vue-query' import { VueQueryPlugin } from '@tanstack/vue-query'
import 'uno.css'
import { createSSRApp } from 'vue' import { createSSRApp } from 'vue'
import App from './App.vue' import App from './App.vue'
import { prototypeInterceptor, requestInterceptor, routeInterceptor } from './interceptors' import { prototypeInterceptor, requestInterceptor, routeInterceptor } from './interceptors'
import store from './store' import store from './store'
import '@/style/index.scss'
import 'virtual:uno.css'
export function createApp() { export function createApp() {
const app = createSSRApp(App) const app = createSSRApp(App)

View File

@ -7,17 +7,21 @@
} }
</route> </route>
<template>
<view class="text-center">
<view class="m-8">http://localhost:9000/#/pages-sub/demo/index</view>
<view class="text-green-500">分包页面demo</view>
</view>
</template>
<script lang="ts" setup> <script lang="ts" setup>
// code here // code here
</script> </script>
<template>
<view class="text-center">
<view class="m-8">
http://localhost:9000/#/pages-sub/demo/index
</view>
<view class="text-green-500">
分包页面demo
</view>
</view>
</template>
<style lang="scss" scoped> <style lang="scss" scoped>
// //
</style> </style>

View File

@ -28,21 +28,25 @@
"iconPath": "static/tabbar/home.png", "iconPath": "static/tabbar/home.png",
"selectedIconPath": "static/tabbar/homeHL.png", "selectedIconPath": "static/tabbar/homeHL.png",
"pagePath": "pages/index/index", "pagePath": "pages/index/index",
"text": "首页" "text": "首页",
"icon": "home",
"iconType": "uiLib"
}, },
{ {
"iconPath": "static/tabbar/example.png", "iconPath": "static/tabbar/example.png",
"selectedIconPath": "static/tabbar/exampleHL.png", "selectedIconPath": "static/tabbar/exampleHL.png",
"pagePath": "pages/about/about", "pagePath": "pages/about/about",
"text": "关于" "text": "关于",
"icon": "i-carbon-code",
"iconType": "unocss"
} }
] ]
}, },
"__esModule": true,
"pages": [ "pages": [
{ {
"path": "pages/index/index", "path": "pages/index/index",
"type": "home", "type": "home",
"layout": "tabbar",
"style": { "style": {
"navigationStyle": "custom", "navigationStyle": "custom",
"navigationBarTitleText": "首页" "navigationBarTitleText": "首页"
@ -51,9 +55,9 @@
{ {
"path": "pages/about/about", "path": "pages/about/about",
"type": "page", "type": "page",
"layout": "tabbar",
"style": { "style": {
"navigationBarTitleText": "关于", "navigationBarTitleText": "关于"
"navigationStyle": "custom"
} }
} }
], ],

View File

@ -1,50 +1,40 @@
<route lang="json5"> <route lang="json5">
{ {
layout: 'tabbar',
style: { style: {
navigationBarTitleText: '关于', navigationBarTitleText: '关于',
navigationStyle: 'custom', //
}, },
} }
</route> </route>
<template>
<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>
<!-- <button @click="toSubPage()">去分包</button> -->
<view class="test-css">测试 scss 样式</view>
<RequestComp />
<UploadComp />
</view>
</view>
</template>
<script lang="ts" setup> <script lang="ts" setup>
import RequestComp from './components/request.vue' import RequestComp from './components/request.vue'
import UploadComp from './components/upload.vue' import UploadComp from './components/upload.vue'
// //
const { safeAreaInsets } = uni.getSystemInfoSync() const { safeAreaInsets } = uni.getSystemInfoSync()
const toSubPage = () => {
uni.navigateTo({
url: '/pages-sub/demo/index',
})
}
// vue .ts // vue .ts
// const testOxlint = (name: string) => { // const testOxlint = (name: string) => {
// console.log('oxlint') // console.log('oxlint')
// } // }
// testOxlint('oxlint') // testOxlint('oxlint')
console.log('about')
</script> </script>
<template>
<view>
<view class="mt-8 text-center text-3xl">
鸽友们好我是
<text class="text-red-500">
菲鸽
</text>
</view>
<RequestComp />
<UploadComp />
</view>
</template>
<style lang="scss" scoped> <style lang="scss" scoped>
.test-css { .test-css {
// 16rpx=>0.5rem // 16rpx=>0.5rem

View File

@ -7,36 +7,9 @@
} }
</route> </route>
<template>
<view class="p-6 text-center">
<view class="my-2">使用的是 laf 云后台</view>
<view class="text-green-400">我的推荐码可以获得佣金</view>
<!-- #ifdef H5 -->
<view class="my-2">
<a class="my-2" :href="recommendUrl" target="_blank">{{ recommendUrl }}</a>
</view>
<!-- #endif -->
<!-- #ifndef H5 -->
<view class="my-2 text-left text-sm">{{ recommendUrl }}</view>
<!-- #endif -->
<!-- http://localhost:9000/#/pages/index/request -->
<wd-button @click="run" class="my-6">发送请求</wd-button>
<view class="h-16">
<view v-if="loading">loading...</view>
<block v-else>
<view class="text-xl">请求数据如下</view>
<view class="text-green leading-8">{{ JSON.stringify(data) }}</view>
</block>
</view>
<wd-button type="error" @click="reset" class="my-6" :disabled="!data">重置数据</wd-button>
</view>
</template>
<script lang="ts" setup> <script lang="ts" setup>
import { getFooAPI, postFooAPI, IFooItem } from '@/service/index/foo' import type { IFooItem } from '@/service/index/foo'
import { getFooAPI } from '@/service/index/foo'
// import { findPetsByStatusQueryOptions } from '@/service/app' // import { findPetsByStatusQueryOptions } from '@/service/app'
// import { useQuery } from '@tanstack/vue-query' // import { useQuery } from '@tanstack/vue-query'
@ -61,7 +34,51 @@ const { loading, error, data, run } = useRequest<IFooItem>(() => getFooAPI('菲
// refetch, // refetch,
// } = useQuery(findPetsByStatusQueryOptions({ params: { status: ['available'] } })) // } = useQuery(findPetsByStatusQueryOptions({ params: { status: ['available'] } }))
const reset = () => { function reset() {
data.value = initialData data.value = initialData
} }
</script> </script>
<template>
<view class="p-6 text-center">
<view class="my-2">
使用的是 laf 云后台
</view>
<view class="text-green-400">
我的推荐码可以获得佣金
</view>
<!-- #ifdef H5 -->
<view class="my-2">
<a class="my-2" :href="recommendUrl" target="_blank">{{ recommendUrl }}</a>
</view>
<!-- #endif -->
<!-- #ifndef H5 -->
<view class="my-2 text-left text-sm">
{{ recommendUrl }}
</view>
<!-- #endif -->
<!-- http://localhost:9000/#/pages/index/request -->
<wd-button class="my-6" @click="run">
发送请求
</wd-button>
<view class="h-16">
<view v-if="loading">
loading...
</view>
<block v-else>
<view class="text-xl">
请求数据如下
</view>
<view class="text-green leading-8">
{{ JSON.stringify(data) }}
</view>
</block>
</view>
<wd-button type="error" class="my-6" :disabled="!data" @click="reset">
重置数据
</wd-button>
</view>
</template>

View File

@ -7,24 +7,32 @@
} }
</route> </route>
<template>
<view class="p-4 text-center">
<wd-button @click="run">选择图片并上传</wd-button>
<view v-if="loading" class="text-blue h-10">上传...</view>
<template v-else>
<view class="m-2">上传后返回的接口数据</view>
<view class="m-2">{{ data }}</view>
<view class="h-80 w-full">
<image v-if="data" :src="data.url" mode="scaleToFill" />
</view>
</template>
</view>
</template>
<script lang="ts" setup> <script lang="ts" setup>
const { loading, data, run } = useUpload() const { loading, data, run } = useUpload()
</script> </script>
<template>
<view class="p-4 text-center">
<wd-button @click="run">
选择图片并上传
</wd-button>
<view v-if="loading" class="h-10 text-blue">
上传...
</view>
<template v-else>
<view class="m-2">
上传后返回的接口数据
</view>
<view class="m-2">
{{ data }}
</view>
<view v-if="data" class="h-80 w-full">
<image :src="data.url" mode="scaleToFill" />
</view>
</template>
</view>
</template>
<style lang="scss" scoped> <style lang="scss" scoped>
// //
</style> </style>

View File

@ -1,34 +1,14 @@
<!-- 使用 type="home" 属性设置首页其他页面不需要设置默认为page推荐使用json5更强大且允许注释 --> <!-- 使用 type="home" 属性设置首页其他页面不需要设置默认为page推荐使用json5更强大且允许注释 -->
<route lang="json5" type="home"> <route lang="json5" type="home">
{ {
layout: 'tabbar',
style: { style: {
// 'custom' 'default'
navigationStyle: 'custom', navigationStyle: 'custom',
navigationBarTitleText: '首页', navigationBarTitleText: '首页',
}, },
} }
</route> </route>
<template>
<view
class="bg-white overflow-hidden pt-2 px-4"
:style="{ marginTop: safeAreaInsets?.top + 'px' }"
>
<view class="mt-12">
<image src="/static/logo.svg" alt="" class="w-28 h-28 block mx-auto" />
</view>
<view class="text-center text-4xl text-[#d14328] mt-4">unibest</view>
<view class="text-center text-2xl mt-2 mb-8">最好用的 uniapp 开发模板</view>
<view class="text-justify max-w-100 m-auto text-4 indent mb-2">{{ description }}</view>
<view class="text-center mt-8">
当前平台是
<text class="text-green-500">{{ PLATFORM.platform }}</text>
</view>
<view class="text-center mt-4">
模板分支是
<text class="text-green-500">base</text>
</view>
</view>
</template>
<script lang="ts" setup> <script lang="ts" setup>
import PLATFORM from '@/utils/platform' import PLATFORM from '@/utils/platform'
@ -61,10 +41,55 @@ safeAreaInsets = systemInfo.safeAreaInsets
// #endif // #endif
const author = ref('菲鸽') const author = ref('菲鸽')
const description = ref( const description = ref(
'unibest 是一个集成了多种工具和技术的 uniapp 开发模板,由 uniapp + Vue3 + Ts + Vite6 + UnoCss + VSCode 构建,模板具有代码提示、自动格式化、统一配置、代码片段等功能,并内置了许多常用的基本组件和基本功能,让你编写 uniapp 拥有 best 体验。', 'unibest 是一个集成了多种工具和技术的 uniapp 开发模板,由 uniapp + Vue3 + Ts + Vite5 + UnoCss + VSCode 构建,模板具有代码提示、自动格式化、统一配置、代码片段等功能,并内置了许多常用的基本组件和基本功能,让你编写 uniapp 拥有 best 体验。',
) )
// uni API // uni API
onLoad(() => { onLoad(() => {
console.log('项目作者:', author.value) console.log('项目作者:', author.value)
}) })
console.log('index')
</script> </script>
<template>
<view class="bg-white px-4 pt-2" :style="{ marginTop: `${safeAreaInsets?.top}px` }">
<view class="mt-10">
<image src="/static/logo.svg" alt="" class="mx-auto block h-28 w-28" />
</view>
<view class="mt-4 text-center text-4xl text-[#d14328]">
unibest
</view>
<view class="mb-8 mt-2 text-center text-2xl">
最好用的 uniapp 开发模板
</view>
<view class="m-auto mb-2 max-w-100 text-justify indent text-4">
{{ description }}
</view>
<view class="mt-4 text-center">
作者
<text class="text-green-500">
菲鸽
</text>
</view>
<view class="mt-4 text-center">
官网地址
<text class="text-green-500">
https://unibest.tech
</text>
</view>
<view class="mt-6 h-1px bg-#eee" />
<view class="mt-8 text-center">
当前平台是
<text class="text-green-500">
{{ PLATFORM.platform }}
</text>
</view>
<view class="mt-4 text-center">
模板分支是
<text class="text-green-500">
base
</text>
</view>
</view>
</template>

View File

@ -1,27 +1,28 @@
import { http } from '@/utils/http' import { http } from '@/utils/http'
export interface IFooItem { export interface IFooItem {
id: string id: string
name: string name: string
} }
/** GET 请求 */ /** GET 请求 */
export const getFooAPI = (name: string) => { export function getFooAPI(name: string) {
return http.get<IFooItem>('/foo', { name }) return http.get<IFooItem>('/foo', { name })
} }
/** GET 请求;支持 传递 header 的范例 */ /** GET 请求;支持 传递 header 的范例 */
export const getFooAPI2 = (name: string) => { export function getFooAPI2(name: string) {
return http.get<IFooItem>('/foo', { name }, { 'Content-Type-100': '100' }) return http.get<IFooItem>('/foo', { name }, { 'Content-Type-100': '100' })
} }
/** POST 请求 */ /** POST 请求 */
export const postFooAPI = (name: string) => { export function postFooAPI(name: string) {
return http.post<IFooItem>('/foo', { name }) return http.post<IFooItem>('/foo', { name })
} }
/** POST 请求;需要传递 query 参数的范例微信小程序经常有同时需要query参数和body参数的场景 */ /** POST 请求;需要传递 query 参数的范例微信小程序经常有同时需要query参数和body参数的场景 */
export const postFooAPI2 = (name: string) => { export function postFooAPI2(name: string) {
return http.post<IFooItem>('/foo', { name }) return http.post<IFooItem>('/foo', { name })
} }
/** POST 请求;支持 传递 header 的范例 */ /** POST 请求;支持 传递 header 的范例 */
export const postFooAPI3 = (name: string) => { export function postFooAPI3(name: string) {
return http.post<IFooItem>('/foo', { name }, { name }, { 'Content-Type-100': '100' }) return http.post<IFooItem>('/foo', { name }, { name }, { 'Content-Type-100': '100' })
} }

View File

@ -1,14 +1,14 @@
import { import type { IUserInfoVo } from '@/api/types/login'
login as _login,
getUserInfo as _getUserInfo,
wxLogin as _wxLogin,
logout as _logout,
getWxCode,
} from '@/api/login'
import { defineStore } from 'pinia' import { defineStore } from 'pinia'
import { ref } from 'vue' import { ref } from 'vue'
import {
getUserInfo as _getUserInfo,
login as _login,
logout as _logout,
wxLogin as _wxLogin,
getWxCode,
} from '@/api/login'
import { toast } from '@/utils/toast' import { toast } from '@/utils/toast'
import { IUserInfoVo } from '@/api/login.typings'
// 初始化状态 // 初始化状态
const userInfoState: IUserInfoVo = { const userInfoState: IUserInfoVo = {
@ -29,7 +29,8 @@ export const useUserStore = defineStore(
// 若头像为空 则使用默认头像 // 若头像为空 则使用默认头像
if (!val.avatar) { if (!val.avatar) {
val.avatar = userInfoState.avatar val.avatar = userInfoState.avatar
} else { }
else {
val.avatar = 'https://oss.laf.run/ukw0y1-site/avatar.jpg?feige' val.avatar = 'https://oss.laf.run/ukw0y1-site/avatar.jpg?feige'
} }
userInfo.value = val userInfo.value = val
@ -45,6 +46,18 @@ export const useUserStore = defineStore(
uni.removeStorageSync('userInfo') uni.removeStorageSync('userInfo')
uni.removeStorageSync('token') uni.removeStorageSync('token')
} }
/**
*
*/
const getUserInfo = async () => {
const res = await _getUserInfo()
const userInfo = res.data
setUserInfo(userInfo)
uni.setStorageSync('userInfo', userInfo)
uni.setStorageSync('token', userInfo.token)
// TODO 这里可以增加获取用户路由的方法 根据用户的角色动态生成路由
return res
}
/** /**
* *
* @param credentials * @param credentials
@ -62,18 +75,7 @@ export const useUserStore = defineStore(
await getUserInfo() await getUserInfo()
return res return res
} }
/**
*
*/
const getUserInfo = async () => {
const res = await _getUserInfo()
const userInfo = res.data
setUserInfo(userInfo)
uni.setStorageSync('userInfo', userInfo)
uni.setStorageSync('token', userInfo.token)
// TODO 这里可以增加获取用户路由的方法 根据用户的角色动态生成路由
return res
}
/** /**
* 退 * 退
*/ */

View File

@ -1,4 +1,4 @@
// @import './iconfont.css'; @import './iconfont.css';
.test { .test {
// 可以通过 @apply 多个样式封装整体样式 // 可以通过 @apply 多个样式封装整体样式

6
src/typings.d.ts vendored
View File

@ -1,14 +1,14 @@
// 全局要用的类型放到这里 // 全局要用的类型放到这里
declare global { declare global {
type IResData<T> = { interface IResData<T> {
code: number code: number
msg: string msg: string
data: T data: T
} }
// uni.uploadFile文件上传参数 // uni.uploadFile文件上传参数
type IUniUploadFileOptions = { interface IUniUploadFileOptions {
file?: File file?: File
files?: UniApp.UploadFileOptionFiles[] files?: UniApp.UploadFileOptionFiles[]
filePath?: string filePath?: string
@ -16,7 +16,7 @@ declare global {
formData?: any formData?: any
} }
type IUserInfo = { interface IUserInfo {
nickname?: string nickname?: string
avatar?: string avatar?: string
/** 微信的 openid非微信没有这个字段 */ /** 微信的 openid非微信没有这个字段 */

View File

@ -6,7 +6,7 @@ export enum TestEnum {
} }
// uni.uploadFile文件上传参数 // uni.uploadFile文件上传参数
export type IUniUploadFileOptions = { export interface IUniUploadFileOptions {
file?: File file?: File
files?: UniApp.UploadFileOptionFiles[] files?: UniApp.UploadFileOptionFiles[]
filePath?: string filePath?: string

View File

@ -1,6 +1,6 @@
import { CustomRequestOptions } from '@/interceptors/request' import type { CustomRequestOptions } from '@/interceptors/request'
export const http = <T>(options: CustomRequestOptions) => { export function http<T>(options: CustomRequestOptions) {
// 1. 返回 Promise 对象 // 1. 返回 Promise 对象
return new Promise<IResData<T>>((resolve, reject) => { return new Promise<IResData<T>>((resolve, reject) => {
uni.request({ uni.request({
@ -15,15 +15,17 @@ export const http = <T>(options: CustomRequestOptions) => {
if (res.statusCode >= 200 && res.statusCode < 300) { if (res.statusCode >= 200 && res.statusCode < 300) {
// 2.1 提取核心数据 res.data // 2.1 提取核心数据 res.data
resolve(res.data as IResData<T>) resolve(res.data as IResData<T>)
} else if (res.statusCode === 401) { }
else if (res.statusCode === 401) {
// 401错误 -> 清理用户信息,跳转到登录页 // 401错误 -> 清理用户信息,跳转到登录页
// userStore.clearUserInfo() // userStore.clearUserInfo()
// uni.navigateTo({ url: '/pages/login/login' }) // uni.navigateTo({ url: '/pages/login/login' })
reject(res) reject(res)
} else { }
else {
// 其他错误 -> 根据后端错误信息轻提示 // 其他错误 -> 根据后端错误信息轻提示
!options.hideErrorToast && !options.hideErrorToast
uni.showToast({ && uni.showToast({
icon: 'none', icon: 'none',
title: (res.data as IResData<T>).msg || '请求错误', title: (res.data as IResData<T>).msg || '请求错误',
}) })
@ -49,12 +51,7 @@ export const http = <T>(options: CustomRequestOptions) => {
* @param header json格式 * @param header json格式
* @returns * @returns
*/ */
export const httpGet = <T>( export function httpGet<T>(url: string, query?: Record<string, any>, header?: Record<string, any>, options?: Partial<CustomRequestOptions>) {
url: string,
query?: Record<string, any>,
header?: Record<string, any>,
options?: Partial<CustomRequestOptions>,
) => {
return http<T>({ return http<T>({
url, url,
query, query,
@ -72,13 +69,7 @@ export const httpGet = <T>(
* @param header json格式 * @param header json格式
* @returns * @returns
*/ */
export const httpPost = <T>( export function httpPost<T>(url: string, data?: Record<string, any>, query?: Record<string, any>, header?: Record<string, any>, options?: Partial<CustomRequestOptions>) {
url: string,
data?: Record<string, any>,
query?: Record<string, any>,
header?: Record<string, any>,
options?: Partial<CustomRequestOptions>,
) => {
return http<T>({ return http<T>({
url, url,
query, query,
@ -91,13 +82,7 @@ export const httpPost = <T>(
/** /**
* PUT * PUT
*/ */
export const httpPut = <T>( export function httpPut<T>(url: string, data?: Record<string, any>, query?: Record<string, any>, header?: Record<string, any>, options?: Partial<CustomRequestOptions>) {
url: string,
data?: Record<string, any>,
query?: Record<string, any>,
header?: Record<string, any>,
options?: Partial<CustomRequestOptions>,
) => {
return http<T>({ return http<T>({
url, url,
data, data,
@ -111,12 +96,7 @@ export const httpPut = <T>(
/** /**
* DELETE query * DELETE query
*/ */
export const httpDelete = <T>( export function httpDelete<T>(url: string, query?: Record<string, any>, header?: Record<string, any>, options?: Partial<CustomRequestOptions>) {
url: string,
query?: Record<string, any>,
header?: Record<string, any>,
options?: Partial<CustomRequestOptions>,
) => {
return http<T>({ return http<T>({
url, url,
query, query,

View File

@ -1,9 +1,7 @@
import pagesConfig from '@/pages.json' import { pages, subPackages } from '@/pages.json'
import { isMpWeixin } from './platform' import { isMpWeixin } from './platform'
const { pages, subPackages, tabBar = { list: [] } } = { ...pagesConfig } export function getLastPage() {
export const getLastPage = () => {
// getCurrentPages() 至少有1个元素所以不再额外判断 // getCurrentPages() 至少有1个元素所以不再额外判断
// const lastPage = getCurrentPages().at(-1) // const lastPage = getCurrentPages().at(-1)
// 上面那个在低版本安卓中打包会报错,所以改用下面这个【虽然我加了 src/interceptions/prototype.ts但依然报错】 // 上面那个在低版本安卓中打包会报错,所以改用下面这个【虽然我加了 src/interceptions/prototype.ts但依然报错】
@ -11,46 +9,12 @@ export const getLastPage = () => {
return pages[pages.length - 1] return pages[pages.length - 1]
} }
export const tabBarList = tabBar?.list || []
/** 判断当前页面是否是 tabbar 页 */
export const getIsTabbar = () => {
try {
const lastPage = getLastPage()
const currPath = lastPage?.route
return Boolean(tabBar?.list?.some((item) => item.pagePath === currPath))
} catch {
return false
}
}
/**
* tabbar
* @param path
* @returns true: tabbar false: tabbar
*/
export const isTableBar = (path: string) => {
if (!tabBar) {
return false
}
if (!tabBar.list.length) {
// 通常有 tabBar 的话list 不能有空且至少有2个元素这里其实不用处理
return false
}
// 这里需要处理一下 path因为 tabBar 中的 pagePath 是不带 /pages 前缀的
if (path.startsWith('/')) {
path = path.substring(1)
}
return !!tabBar.list.find((e) => e.pagePath === path)
}
/** /**
* path redirectPath * path redirectPath
* path '/pages/login/index' * path '/pages/login/index'
* redirectPath '/pages/demo/base/route-interceptor' * redirectPath '/pages/demo/base/route-interceptor'
*/ */
export const currRoute = () => { export function currRoute() {
const lastPage = getLastPage() const lastPage = getLastPage()
const currRoute = (lastPage as any).$page const currRoute = (lastPage as any).$page
// console.log('lastPage.$page:', currRoute) // console.log('lastPage.$page:', currRoute)
@ -65,7 +29,7 @@ export const currRoute = () => {
return getUrlObj(fullPath) return getUrlObj(fullPath)
} }
const ensureDecodeURIComponent = (url: string) => { function ensureDecodeURIComponent(url: string) {
if (url.startsWith('%')) { if (url.startsWith('%')) {
return ensureDecodeURIComponent(decodeURIComponent(url)) return ensureDecodeURIComponent(decodeURIComponent(url))
} }
@ -76,7 +40,7 @@ const ensureDecodeURIComponent = (url: string) => {
* url: /pages/login/index?redirect=%2Fpages%2Fdemo%2Fbase%2Froute-interceptor * url: /pages/login/index?redirect=%2Fpages%2Fdemo%2Fbase%2Froute-interceptor
* : {path: /pages/login/index, query: {redirect: /pages/demo/base/route-interceptor}} * : {path: /pages/login/index, query: {redirect: /pages/demo/base/route-interceptor}}
*/ */
export const getUrlObj = (url: string) => { export function getUrlObj(url: string) {
const [path, queryStr] = url.split('?') const [path, queryStr] = url.split('?')
// console.log(path, queryStr) // console.log(path, queryStr)
@ -99,11 +63,11 @@ export const getUrlObj = (url: string) => {
* key needLogin, route-block 使 * key needLogin, route-block 使
* key pages key, key * key pages key, key
*/ */
export const getAllPages = (key = 'needLogin') => { export function getAllPages(key = 'needLogin') {
// 这里处理主包 // 这里处理主包
const mainPages = pages const mainPages = pages
.filter((page) => !key || page[key]) .filter(page => !key || page[key])
.map((page) => ({ .map(page => ({
...page, ...page,
path: `/${page.path}`, path: `/${page.path}`,
})) }))
@ -115,7 +79,7 @@ export const getAllPages = (key = 'needLogin') => {
const { root } = subPageObj const { root } = subPageObj
subPageObj.pages subPageObj.pages
.filter((page) => !key || page[key]) .filter(page => !key || page[key])
.forEach((page: { path: string } & Record<string, any>) => { .forEach((page: { path: string } & Record<string, any>) => {
subPages.push({ subPages.push({
...page, ...page,
@ -132,18 +96,18 @@ export const getAllPages = (key = 'needLogin') => {
* pages * pages
* path * path
*/ */
export const getNeedLoginPages = (): string[] => getAllPages('needLogin').map((page) => page.path) export const getNeedLoginPages = (): string[] => getAllPages('needLogin').map(page => page.path)
/** /**
* pages * pages
* path * path
*/ */
export const needLoginPages: string[] = getAllPages('needLogin').map((page) => page.path) export const needLoginPages: string[] = getAllPages('needLogin').map(page => page.path)
/** /**
* baseUrl * baseUrl
*/ */
export const getEnvBaseUrl = () => { export function getEnvBaseUrl() {
// 请求基准地址 // 请求基准地址
let baseUrl = import.meta.env.VITE_SERVER_BASEURL let baseUrl = import.meta.env.VITE_SERVER_BASEURL
@ -172,7 +136,7 @@ export const getEnvBaseUrl = () => {
/** /**
* UPLOAD_BASEURL * UPLOAD_BASEURL
*/ */
export const getEnvBaseUploadUrl = () => { export function getEnvBaseUploadUrl() {
// 请求基准地址 // 请求基准地址
let baseUploadUrl = import.meta.env.VITE_UPLOAD_BASEURL let baseUploadUrl = import.meta.env.VITE_UPLOAD_BASEURL

29
src/utils/queryString.ts Normal file
View File

@ -0,0 +1,29 @@
/**
* URL查询字符串 qs
*
* @param obj
* @returns
*/
export function stringifyQuery(obj: Record<string, any>): string {
if (!obj || typeof obj !== 'object' || Array.isArray(obj))
return ''
return Object.entries(obj)
.filter(([_, value]) => value !== undefined && value !== null)
.map(([key, value]) => {
// 对键进行编码
const encodedKey = encodeURIComponent(key)
// 处理数组类型
if (Array.isArray(value)) {
return value
.filter(item => item !== undefined && item !== null)
.map(item => `${encodedKey}=${encodeURIComponent(item)}`)
.join('&')
}
// 处理基本类型
return `${encodedKey}=${encodeURIComponent(value)}`
})
.join('&')
}

View File

@ -1,11 +1,11 @@
import { CustomRequestOptions } from '@/interceptors/request' import type { CustomRequestOptions } from '@/interceptors/request'
/** /**
* 请求方法: 主要是对 uni.request openapi-ts-request request * 请求方法: 主要是对 uni.request openapi-ts-request request
* @param options * @param options
* @returns Promise * @returns Promise
*/ */
const http = <T>(options: CustomRequestOptions) => { function http<T>(options: CustomRequestOptions) {
// 1. 返回 Promise 对象 // 1. 返回 Promise 对象
return new Promise<T>((resolve, reject) => { return new Promise<T>((resolve, reject) => {
uni.request({ uni.request({
@ -20,15 +20,17 @@ const http = <T>(options: CustomRequestOptions) => {
if (res.statusCode >= 200 && res.statusCode < 300) { if (res.statusCode >= 200 && res.statusCode < 300) {
// 2.1 提取核心数据 res.data // 2.1 提取核心数据 res.data
resolve(res.data as T) resolve(res.data as T)
} else if (res.statusCode === 401) { }
else if (res.statusCode === 401) {
// 401错误 -> 清理用户信息,跳转到登录页 // 401错误 -> 清理用户信息,跳转到登录页
// userStore.clearUserInfo() // userStore.clearUserInfo()
// uni.navigateTo({ url: '/pages/login/login' }) // uni.navigateTo({ url: '/pages/login/login' })
reject(res) reject(res)
} else { }
else {
// 其他错误 -> 根据后端错误信息轻提示 // 其他错误 -> 根据后端错误信息轻提示
!options.hideErrorToast && !options.hideErrorToast
uni.showToast({ && uni.showToast({
icon: 'none', icon: 'none',
title: (res.data as T & { msg?: string })?.msg || '请求错误', title: (res.data as T & { msg?: string })?.msg || '请求错误',
}) })

View File

@ -21,8 +21,8 @@ export function showToast(options: ToastOptions | string) {
position: 'middle', position: 'middle',
message: '', message: '',
} }
const mergedOptions = const mergedOptions
typeof options === 'string' = typeof options === 'string'
? { ...defaultOptions, message: options } ? { ...defaultOptions, message: options }
: { ...defaultOptions, ...options } : { ...defaultOptions, ...options }
// 映射position到uniapp支持的格式 // 映射position到uniapp支持的格式

View File

@ -21,7 +21,7 @@ import { toast } from './toast'
*/ */
export const uploadFileUrl = { export const uploadFileUrl = {
/** 用户头像上传地址 */ /** 用户头像上传地址 */
USER_AVATAR: import.meta.env.VITE_SERVER_BASEURL + '/user/avatar', USER_AVATAR: `${import.meta.env.VITE_SERVER_BASEURL}/user/avatar`,
} }
/** /**
@ -31,12 +31,7 @@ export const uploadFileUrl = {
* @param formData * @param formData
* @param options * @param options
*/ */
export const useFileUpload = <T = string>( export function useFileUpload<T = string>(url: string, filePath: string, formData: Record<string, any> = {}, options: Omit<UploadOptions, 'sourceType' | 'sizeType' | 'count'> = {}) {
url: string,
filePath: string,
formData: Record<string, any> = {},
options: Omit<UploadOptions, 'sourceType' | 'sizeType' | 'count'> = {},
) => {
return useUpload<T>( return useUpload<T>(
url, url,
formData, formData,
@ -76,13 +71,9 @@ export interface UploadOptions {
* @param options * @param options
* @returns * @returns
*/ */
export const useUpload = <T = string>( export function useUpload<T = string>(url: string, formData: Record<string, any> = {}, options: UploadOptions = {},
url: string,
formData: Record<string, any> = {},
options: UploadOptions = {},
/** 直接传入文件路径,跳过选择器 */ /** 直接传入文件路径,跳过选择器 */
directFilePath?: string, directFilePath?: string) {
) => {
/** 上传中状态 */ /** 上传中状态 */
const loading = ref(false) const loading = ref(false)
/** 上传错误状态 */ /** 上传错误状态 */
@ -161,7 +152,8 @@ export const useUpload = <T = string>(
success: (res) => { success: (res) => {
const file = res.tempFiles[0] const file = res.tempFiles[0]
// 检查文件大小是否符合限制 // 检查文件大小是否符合限制
if (!checkFileSize(file.size)) return if (!checkFileSize(file.size))
return
// 开始上传 // 开始上传
loading.value = true loading.value = true
@ -295,7 +287,8 @@ function uploadFile<T>({
// 上传成功 // 上传成功
data.value = _data as T data.value = _data as T
onSuccess?.(_data) onSuccess?.(_data)
} catch (err) { }
catch (err) {
// 响应解析错误 // 响应解析错误
console.error('解析上传响应失败:', err) console.error('解析上传响应失败:', err)
error.value = true error.value = true
@ -320,7 +313,8 @@ function uploadFile<T>({
progress.value = res.progress progress.value = res.progress
onProgress?.(res.progress) onProgress?.(res.progress)
}) })
} catch (err) { }
catch (err) {
// 创建上传任务失败 // 创建上传任务失败
console.error('创建上传任务失败:', err) console.error('创建上传任务失败:', err)
error.value = true error.value = true

View File

@ -1,21 +1,15 @@
{ {
"compilerOptions": { "compilerOptions": {
"composite": true, "composite": true,
"skipLibCheck": true, "lib": ["esnext", "dom"],
"baseUrl": ".",
"module": "ESNext", "module": "ESNext",
"moduleResolution": "Node", "moduleResolution": "Node",
"resolveJsonModule": true,
"noImplicitThis": true,
"allowSyntheticDefaultImports": true,
"allowJs": true,
"sourceMap": true,
"baseUrl": ".",
"paths": { "paths": {
"@/*": ["./src/*"], "@/*": ["./src/*"],
"@img/*": ["./src/static/*"] "@img/*": ["./src/static/*"]
}, },
"outDir": "dist", "resolveJsonModule": true,
"lib": ["esnext", "dom"],
"types": [ "types": [
"@dcloudio/types", "@dcloudio/types",
"@uni-helper/uni-types", "@uni-helper/uni-types",
@ -23,12 +17,17 @@
"wot-design-uni/global.d.ts", "wot-design-uni/global.d.ts",
"z-paging/types", "z-paging/types",
"./src/typings.d.ts" "./src/typings.d.ts"
] ],
"allowJs": true,
"noImplicitThis": true,
"outDir": "dist",
"sourceMap": true,
"allowSyntheticDefaultImports": true,
"skipLibCheck": true
}, },
"vueCompilerOptions": { "vueCompilerOptions": {
"plugins": ["@uni-helper/uni-types/volar-plugin"] "plugins": ["@uni-helper/uni-types/volar-plugin"]
}, },
"exclude": ["node_modules"],
"include": [ "include": [
"src/**/*.ts", "src/**/*.ts",
"src/**/*.js", "src/**/*.js",
@ -37,5 +36,6 @@
"src/**/*.jsx", "src/**/*.jsx",
"src/**/*.vue", "src/**/*.vue",
"src/**/*.json" "src/**/*.json"
] ],
"exclude": ["node_modules"]
} }

View File

@ -2,8 +2,8 @@
import { presetUni } from '@uni-helper/unocss-preset-uni' import { presetUni } from '@uni-helper/unocss-preset-uni'
import { import {
defineConfig, defineConfig,
presetIcons,
presetAttributify, presetAttributify,
presetIcons,
transformerDirectives, transformerDirectives,
transformerVariantGroup, transformerVariantGroup,
} from 'unocss' } from 'unocss'
@ -20,7 +20,7 @@ export default defineConfig({
scale: 1.2, scale: 1.2,
warn: true, warn: true,
extraProperties: { extraProperties: {
display: 'inline-block', 'display': 'inline-block',
'vertical-align': 'middle', 'vertical-align': 'middle',
}, },
}), }),
@ -39,6 +39,7 @@ export default defineConfig({
center: 'flex justify-center items-center', center: 'flex justify-center items-center',
}, },
], ],
safelist: [],
rules: [ rules: [
[ [
'p-safe', 'p-safe',

View File

@ -1,5 +1,6 @@
import path from 'node:path'
import process from 'node:process'
import fs from 'fs-extra' import fs from 'fs-extra'
import path from 'path'
export function copyNativeRes() { export function copyNativeRes() {
const waitPath = path.resolve(__dirname, '../src/nativeResources') const waitPath = path.resolve(__dirname, '../src/nativeResources')
@ -31,7 +32,8 @@ export function copyNativeRes() {
console.log( console.log(
`[copyNativeRes] 成功将 nativeResources 目录中的资源移动到构建目录:${buildPath}`, `[copyNativeRes] 成功将 nativeResources 目录中的资源移动到构建目录:${buildPath}`,
) )
} catch (error) { }
catch (error) {
console.error(`[copyNativeRes] 复制资源失败:`, error) console.error(`[copyNativeRes] 复制资源失败:`, error)
} }
}, },

View File

@ -1,14 +1,16 @@
// src/plugins/updatePackageJson.ts // src/plugins/updatePackageJson.ts
import { Plugin } from 'vite' import type { Plugin } from 'vite'
import fs from 'fs/promises' import fs from 'node:fs/promises'
import path from 'path' import path from 'node:path'
import process from 'node:process'
const updatePackageJson = (): Plugin => { function updatePackageJson(): Plugin {
return { return {
name: 'update-package-json', name: 'update-package-json',
async buildStart() { async buildStart() {
// 只在生产环境构建时执行 // 只在生产环境构建时执行
if (process.env.NODE_ENV !== 'production') return if (process.env.NODE_ENV !== 'production')
return
const packageJsonPath = path.resolve(process.cwd(), 'package.json') const packageJsonPath = path.resolve(process.cwd(), 'package.json')
@ -21,10 +23,11 @@ const updatePackageJson = (): Plugin => {
packageJson['update-time'] = new Date().toISOString().split('T')[0] // YYYY-MM-DD packageJson['update-time'] = new Date().toISOString().split('T')[0] // YYYY-MM-DD
// 写回文件(保持 2 空格缩进) // 写回文件(保持 2 空格缩进)
await fs.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n', 'utf-8') await fs.writeFile(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`, 'utf-8')
console.log(`[update-package-json] 更新时间戳: ${packageJson['update-time']}`) console.log(`[update-package-json] 更新时间戳: ${packageJson['update-time']}`)
} catch (error) { }
catch (error) {
console.error('[update-package-json] 插件执行失败:', error) console.error('[update-package-json] 插件执行失败:', error)
} }
}, },

View File

@ -1,27 +1,27 @@
import Uni from '@dcloudio/vite-plugin-uni'
import dayjs from 'dayjs'
import path from 'node:path' import path from 'node:path'
import { defineConfig, loadEnv } from 'vite' import process from 'node:process'
// @see https://uni-helper.js.org/vite-plugin-uni-pages import Uni from '@dcloudio/vite-plugin-uni'
import UniPages from '@uni-helper/vite-plugin-uni-pages' import Components from '@uni-helper/vite-plugin-uni-components'
// @see https://uni-helper.js.org/vite-plugin-uni-layouts // @see https://uni-helper.js.org/vite-plugin-uni-layouts
import UniLayouts from '@uni-helper/vite-plugin-uni-layouts' import UniLayouts from '@uni-helper/vite-plugin-uni-layouts'
// @see https://github.com/uni-helper/vite-plugin-uni-manifest
import UniManifest from '@uni-helper/vite-plugin-uni-manifest'
// @see https://uni-helper.js.org/vite-plugin-uni-pages
import UniPages from '@uni-helper/vite-plugin-uni-pages'
// @see https://github.com/uni-helper/vite-plugin-uni-platform // @see https://github.com/uni-helper/vite-plugin-uni-platform
// 需要与 @uni-helper/vite-plugin-uni-pages 插件一起使用 // 需要与 @uni-helper/vite-plugin-uni-pages 插件一起使用
import UniPlatform from '@uni-helper/vite-plugin-uni-platform' import UniPlatform from '@uni-helper/vite-plugin-uni-platform'
// @see https://github.com/uni-helper/vite-plugin-uni-manifest
import UniManifest from '@uni-helper/vite-plugin-uni-manifest'
/** /**
* *
* @see https://github.com/uni-ku/bundle-optimizer * @see https://github.com/uni-ku/bundle-optimizer
*/ */
import Optimization from '@uni-ku/bundle-optimizer' import Optimization from '@uni-ku/bundle-optimizer'
import dayjs from 'dayjs'
import { visualizer } from 'rollup-plugin-visualizer' import { visualizer } from 'rollup-plugin-visualizer'
import AutoImport from 'unplugin-auto-import/vite' import AutoImport from 'unplugin-auto-import/vite'
import { defineConfig, loadEnv } from 'vite'
import ViteRestart from 'vite-plugin-restart' import ViteRestart from 'vite-plugin-restart'
import { copyNativeRes } from './vite-plugins/copyNativeRes'
import updatePackageJson from './vite-plugins/updatePackageJson' import updatePackageJson from './vite-plugins/updatePackageJson'
import Components from '@uni-helper/vite-plugin-uni-components'
// https://vitejs.dev/config/ // https://vitejs.dev/config/
export default async ({ command, mode }) => { export default async ({ command, mode }) => {
@ -75,7 +75,7 @@ export default async ({ command, mode }) => {
// 自定义插件禁用 vite:vue 插件的 devToolsEnabled强制编译 vue 模板时 inline 为 true // 自定义插件禁用 vite:vue 插件的 devToolsEnabled强制编译 vue 模板时 inline 为 true
name: 'fix-vite-plugin-vue', name: 'fix-vite-plugin-vue',
configResolved(config) { configResolved(config) {
const plugin = config.plugins.find((p) => p.name === 'vite:vue') const plugin = config.plugins.find(p => p.name === 'vite:vue')
if (plugin && plugin.api && plugin.api.options) { if (plugin && plugin.api && plugin.api.options) {
plugin.api.options.devToolsEnabled = false plugin.api.options.devToolsEnabled = false
} }
@ -91,7 +91,7 @@ export default async ({ command, mode }) => {
// Optimization 插件需要 page.json 文件,故应在 UniPages 插件之后执行 // Optimization 插件需要 page.json 文件,故应在 UniPages 插件之后执行
Optimization({ Optimization({
enable: { enable: {
optimization: true, 'optimization': true,
'async-import': true, 'async-import': true,
'async-component': true, 'async-component': true,
}, },
@ -113,9 +113,9 @@ export default async ({ command, mode }) => {
}, },
}, },
// 打包分析插件h5 + 生产环境才弹出 // 打包分析插件h5 + 生产环境才弹出
UNI_PLATFORM === 'h5' && UNI_PLATFORM === 'h5'
mode === 'production' && && mode === 'production'
visualizer({ && visualizer({
filename: './node_modules/.cache/visualizer/stats.html', filename: './node_modules/.cache/visualizer/stats.html',
open: true, open: true,
gzipSize: true, gzipSize: true,
@ -163,7 +163,7 @@ export default async ({ command, mode }) => {
[VITE_APP_PROXY_PREFIX]: { [VITE_APP_PROXY_PREFIX]: {
target: VITE_SERVER_BASEURL, target: VITE_SERVER_BASEURL,
changeOrigin: true, changeOrigin: true,
rewrite: (path) => path.replace(new RegExp(`^${VITE_APP_PROXY_PREFIX}`), ''), rewrite: path => path.replace(new RegExp(`^${VITE_APP_PROXY_PREFIX}`), ''),
}, },
} }
: undefined, : undefined,