From 8df0747f19ed8585162095f906bfcc359780b39e Mon Sep 17 00:00:00 2001 From: aonoa <1991849113@qq.com> Date: Sun, 3 Sep 2023 14:38:54 +0800 Subject: [PATCH 1/2] docs(README): Update README file Signed-off-by: aonoa <1991849113@qq.com> --- README.md | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ README.zh-CN.md | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/README.md b/README.md index e69de29b..91ddd774 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,59 @@ +# vben3 + +## Introduction + +Vben3 is a free and open source middle and back-end template. Using the latest `vue3`, `vite4`, `TypeScript` and other mainstream technology development, the out-of-the-box middle and back-end front-end solutions can also be used for learning reference. + ++ Github：[https://github.com/vbenjs/vben3](https://github.com/vbenjs/vben3) ++ Document：[https://github.com/vbenjs/vben3-doc](https://github.com/vbenjs/vben3-doc) ++ KOOK：[https://kook.top/6ZPFKi](https://kook.top/6ZPFKi) ++ Vben3 QQ group：4286109 + + + +## Install + +``` +git clone https://github.com/vbenjs/vben3.git +pnpm i +pnpm dev +``` + + + +## How to contribute + +You are very welcome to join！[Raise an issue](https://github.com/vbenjs/vben3/issues/new/choose) Or submit a Pull Request。 + +**Pull Request:** + +1. Fork code! +2. Create your own branch: `git checkout -b feat/xxxx` +3. Submit your changes: `git commit -am 'feat(function): add xxxxx'` +4. Push your branch: `git push origin feat/xxxx` +5. submit`pull request` + + + +## Git Contribution submission specification + +- reference [vue](https://github.com/vuejs/vue/blob/dev/.github/COMMIT_CONVENTION.md) specification ([Angular](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular)) + - `feat` Add new features + - `fix` Fix the problem/BUG + - `style` The code style is related and does not affect the running result + - `perf` Optimization/performance improvement + - `refactor` Refactor + - `revert` Undo edit + - `test` Test related + - `docs` Documentation/notes + - `chore` Dependency update/scaffolding configuration modification etc. + - `workflow` Workflow improvements + - `ci` Continuous integration + - `types` Type definition file changes + - `wip` In development + + + +## License + +Vben3 is MIT licensed. See the [LICENSE](https://github.com/vbenjs/vben3/blob/master/LICENSE) file for details. diff --git a/README.zh-CN.md b/README.zh-CN.md index e69de29b..cb4d2fa1 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -0,0 +1,59 @@ +# vben3 后台管理系统 + +## 简介 + +Vben3 是一个免费开源的中后台模版。使用了最新的`vue3`,`vite4`,`TypeScript`等主流技术开发，开箱即用的中后台前端解决方案，也可用于学习参考。 + ++ 项目仓库地址：[https://github.com/vbenjs/vben3](https://github.com/vbenjs/vben3) ++ 文档仓库地址：[https://github.com/vbenjs/vben3-doc](https://github.com/vbenjs/vben3-doc) ++ KOOK：[https://kook.top/6ZPFKi](https://kook.top/6ZPFKi) ++ Vben3 QQ群：4286109 + + + +## 安装 + +``` +git clone https://github.com/vbenjs/vben3.git +pnpm i +pnpm dev +``` + + + +## 如何贡献 + +非常欢迎你的加入！[提一个 Issue](https://github.com/vbenjs/vben3/issues/new/choose) 或者提交一个 Pull Request。 + +**Pull Request:** + +1. Fork 代码! +2. 创建自己的分支: `git checkout -b feat/xxxx` +3. 提交你的修改: `git commit -am 'feat(function): add xxxxx'` +4. 推送您的分支: `git push origin feat/xxxx` +5. 提交`pull request` + + + +## Git 贡献提交规范 + +- 参考 [vue](https://github.com/vuejs/vue/blob/dev/.github/COMMIT_CONVENTION.md) 规范 ([Angular](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular)) + - `feat` 增加新功能 + - `fix` 修复问题/BUG + - `style` 代码风格相关无影响运行结果的 + - `perf` 优化/性能提升 + - `refactor` 重构 + - `revert` 撤销修改 + - `test` 测试相关 + - `docs` 文档/注释 + - `chore` 依赖更新/脚手架配置修改等 + - `workflow` 工作流改进 + - `ci` 持续集成 + - `types` 类型定义文件更改 + - `wip` 开发中 + + + +## 许可证 + +Halo 使用 MIT 协议开源。 \ No newline at end of file From 102e2ef9531b527c46214819ce831dc36f7b24a6 Mon Sep 17 00:00:00 2001 From: aonoa <1991849113@qq.com> Date: Sun, 3 Sep 2023 15:08:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(login-form):=20=E4=BF=AE=E5=A4=8DH5?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: aonoa <1991849113@qq.com> --- apps/admin/src/pages/sys/login/login-form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/admin/src/pages/sys/login/login-form.vue b/apps/admin/src/pages/sys/login/login-form.vue index b81002d1..ba6a98c4 100644 --- a/apps/admin/src/pages/sys/login/login-form.vue +++ b/apps/admin/src/pages/sys/login/login-form.vue @@ -137,7 +137,7 @@ async function handleLogin() { {{t('sys.login.mobileSignInFormTitle')}} - + {{t('sys.login.qrSignInFormTitle')}}