From b60f8fe485d5bee362fe4e4fba3be6a31a3b5618 Mon Sep 17 00:00:00 2001 From: koogua Date: Mon, 22 Aug 2022 15:06:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95/=E6=B3=A8?= =?UTF-8?q?=E5=86=8C/=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 9 ++- .../Home/Controllers/AccountController.php | 7 +-- app/Http/Home/Views/account/forget.volt | 42 ++++++++++++++ .../Home/Views/account/forget_by_email.volt | 28 +++++++++ .../Home/Views/account/forget_by_phone.volt | 28 +++++++++ .../Home/Views/account/forget_password.volt | 48 --------------- app/Http/Home/Views/account/login.volt | 3 +- app/Http/Home/Views/account/register.volt | 58 ++++++------------- .../Home/Views/account/register_by_email.volt | 35 +++++++++++ .../Home/Views/account/register_by_phone.volt | 35 +++++++++++ app/Services/Utils/IndexCourseCache.php | 52 +++++++---------- 11 files changed, 220 insertions(+), 125 deletions(-) create mode 100644 app/Http/Home/Views/account/forget.volt create mode 100644 app/Http/Home/Views/account/forget_by_email.volt create mode 100644 app/Http/Home/Views/account/forget_by_phone.volt delete mode 100644 app/Http/Home/Views/account/forget_password.volt create mode 100644 app/Http/Home/Views/account/register_by_email.volt create mode 100644 app/Http/Home/Views/account/register_by_phone.volt diff --git a/CHANGELOG.md b/CHANGELOG.md index 84517528..a59a261d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ -### [v1.5.7](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.7)(2022-08-28) +### [v1.5.8](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.8)(2022-08-28) + +- 整理migrations +- 更新自动安装脚本 +- 优化登录/注册/忘记密码页 +- 修复移动端首页课程缓存刷新 + +### [v1.5.7](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.7)(2022-08-18) - 清理群组残留 - 升级腾讯云存储SDK到v2.5.6 diff --git a/app/Http/Home/Controllers/AccountController.php b/app/Http/Home/Controllers/AccountController.php index 4efc598a..320cb9c5 100644 --- a/app/Http/Home/Controllers/AccountController.php +++ b/app/Http/Home/Controllers/AccountController.php @@ -148,9 +148,9 @@ class AccountController extends Controller } /** - * @Get("/password/forget", name="home.account.forget_pwd") + * @Get("/forget", name="home.account.forget") */ - public function forgetPasswordAction() + public function forgetAction() { $service = new FullH5UrlService(); @@ -167,9 +167,8 @@ class AccountController extends Controller $captcha = $service->getSettings('captcha'); - $this->seo->prependTitle('忘记密码'); + $this->seo->prependTitle('重置密码'); - $this->view->pick('account/forget_password'); $this->view->setVar('captcha', $captcha); } diff --git a/app/Http/Home/Views/account/forget.volt b/app/Http/Home/Views/account/forget.volt new file mode 100644 index 00000000..8056110f --- /dev/null +++ b/app/Http/Home/Views/account/forget.volt @@ -0,0 +1,42 @@ +{% extends 'templates/main.volt' %} + +{% block content %} + + {% set action_url = url({'for':'home.account.reset_pwd'}) %} + +
+ 首页 + 帐号 + 重置密码 +
+ +
+ +
+ + · + 注册账户 +
+
+ +{% endblock %} + +{% block include_js %} + + {{ js_include('https://ssl.captcha.qq.com/TCaptcha.js',false) }} + {{ js_include('home/js/captcha.verify.js') }} + +{% endblock %} \ No newline at end of file diff --git a/app/Http/Home/Views/account/forget_by_email.volt b/app/Http/Home/Views/account/forget_by_email.volt new file mode 100644 index 00000000..2a61dff4 --- /dev/null +++ b/app/Http/Home/Views/account/forget_by_email.volt @@ -0,0 +1,28 @@ +
+
+ + +
+
+ + +
+
+
+ + +
+
+ +
+
+
+
+ + + + + +
+
+
\ No newline at end of file diff --git a/app/Http/Home/Views/account/forget_by_phone.volt b/app/Http/Home/Views/account/forget_by_phone.volt new file mode 100644 index 00000000..fc766c82 --- /dev/null +++ b/app/Http/Home/Views/account/forget_by_phone.volt @@ -0,0 +1,28 @@ +
+
+ + +
+
+ + +
+
+
+ + +
+
+ +
+
+
+
+ + + + + +
+
+
\ No newline at end of file diff --git a/app/Http/Home/Views/account/forget_password.volt b/app/Http/Home/Views/account/forget_password.volt deleted file mode 100644 index 39cbef41..00000000 --- a/app/Http/Home/Views/account/forget_password.volt +++ /dev/null @@ -1,48 +0,0 @@ -{% extends 'templates/main.volt' %} - -{% block content %} - -
- 首页 - 忘记密码 -
- -
- -
- -{% endblock %} - -{% block include_js %} - - {{ js_include('https://ssl.captcha.qq.com/TCaptcha.js',false) }} - {{ js_include('home/js/captcha.verify.js') }} - -{% endblock %} \ No newline at end of file diff --git a/app/Http/Home/Views/account/login.volt b/app/Http/Home/Views/account/login.volt index 34641c28..e2746070 100644 --- a/app/Http/Home/Views/account/login.volt +++ b/app/Http/Home/Views/account/login.volt @@ -4,6 +4,7 @@
首页 + 帐号 登录
@@ -25,7 +26,7 @@
· - 忘记密码 + 忘记密码
{% if oauth_provider.qq.enabled == 1 %} diff --git a/app/Http/Home/Views/account/register.volt b/app/Http/Home/Views/account/register.volt index 4d86fdb1..6e72d254 100644 --- a/app/Http/Home/Views/account/register.volt +++ b/app/Http/Home/Views/account/register.volt @@ -4,54 +4,34 @@ {% set register_with_phone = local_oauth.register_with_phone == 1 %} {% set register_with_email = local_oauth.register_with_email == 1 %} + {% set action_url = url({'for':'home.account.do_register'}) %}
首页 + 帐号 注册
-