diff --git a/CHANGELOG.md b/CHANGELOG.md index 0acff682..a8ce1a89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,29 @@ +### [v1.4.4](https://gitee.com/koogua/course-tencent-cloud/releases/v1.4.4)(2021-09-17) + +- 后台增加邮件手机登录选择配置 +- 增加移动端支付选项配置 +- 首页增加秒杀，直播，提问，文章接口 +- 增加秒杀列表列表接口 +- 精简取消点赞以及取消收藏逻辑 +- 修复浮点转整型精度丢失造成的支付回调失败 +- 修复竖屏直播时造成的位置错乱 +- 修复视频清晰度配置序列化问题 +- 修复评论取消点赞数量不变问题 +- 修复章节资源数量问题 +- 修复删除课程后引发的用户课程列表错误问题 +- 修正课程咨询列表查询条件 +- 修正回答，兑换礼品说明重复转译的问题 +- 资源下载查询主键由md5改为加密的ID +- 去除上传文件md5唯一索引 +- 去除课程发布对章节的要求 +- 去除点播回调中的处理数量限制 +- 优化文章，课程，提问，群组全文搜索 +- 优化直播列表数据结构 +- 优化章节目录交互呈现 +- 优化后台添加学员重复检查 +- 优化订单发货逻辑 +- 优化公众号订阅逻辑 + ### [v1.4.3](https://gitee.com/koogua/course-tencent-cloud/releases/v1.4.3)(2021-08-23) - 优化邮件验证码 diff --git a/app/Http/Admin/Controllers/SettingController.php b/app/Http/Admin/Controllers/SettingController.php index 94bd7ee3..52de0444 100644 --- a/app/Http/Admin/Controllers/SettingController.php +++ b/app/Http/Admin/Controllers/SettingController.php @@ -350,10 +350,12 @@ class SettingController extends Controller $qqAuth = $settingService->getQQAuthSettings(); $weixinAuth = $settingService->getWeixinAuthSettings(); $weiboAuth = $settingService->getWeiboAuthSettings(); + $localAuth = $settingService->getLocalAuthSettings(); $this->view->setVar('qq_auth', $qqAuth); $this->view->setVar('weixin_auth', $weixinAuth); $this->view->setVar('weibo_auth', $weiboAuth); + $this->view->setVar('local_auth', $localAuth); } } diff --git a/app/Http/Admin/Services/Setting.php b/app/Http/Admin/Services/Setting.php index 9ec9c821..8c096c7a 100644 --- a/app/Http/Admin/Services/Setting.php +++ b/app/Http/Admin/Services/Setting.php @@ -15,6 +15,11 @@ use App\Services\WeChat as WeChatService; class Setting extends Service { + public function getLocalAuthSettings() + { + return $this->getSettings('oauth.local'); + } + public function getQQAuthSettings() { $oauth = $this->getSettings('oauth.qq'); diff --git a/app/Http/Admin/Views/setting/oauth.volt b/app/Http/Admin/Views/setting/oauth.volt index 15b714b7..a7116e16 100644 --- a/app/Http/Admin/Views/setting/oauth.volt +++ b/app/Http/Admin/Views/setting/oauth.volt @@ -4,12 +4,16 @@
+ {{ partial('setting/oauth_local') }} +
+
{{ partial('setting/oauth_qq') }}
diff --git a/app/Http/Admin/Views/setting/oauth_local.volt b/app/Http/Admin/Views/setting/oauth_local.volt new file mode 100644 index 00000000..f258e782 --- /dev/null +++ b/app/Http/Admin/Views/setting/oauth_local.volt @@ -0,0 +1,24 @@ +
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + + +
+
+
\ No newline at end of file diff --git a/app/Http/Api/Controllers/PublicController.php b/app/Http/Api/Controllers/PublicController.php index 5c64bf3f..bc4058e2 100644 --- a/app/Http/Api/Controllers/PublicController.php +++ b/app/Http/Api/Controllers/PublicController.php @@ -86,6 +86,24 @@ class PublicController extends Controller return $this->jsonSuccess(['captcha' => $captcha]); } + /** + * @Get("/payment/info", name="api.public.payment_info") + */ + public function paymentInfoAction() + { + $service = new AppService(); + + $alipay = $service->getSettings('pay.alipay'); + $wxpay = $service->getSettings('pay.wxpay'); + + $content = [ + 'alipay' => ['enabled' => $alipay['enabled']], + 'wxpay' => ['enabled' => $wxpay['enabled']], + ]; + + return $this->jsonSuccess($content); + } + /** * @Get("/reward/options", name="api.public.reward_options") */ diff --git a/app/Http/Home/Views/account/login.volt b/app/Http/Home/Views/account/login.volt index 34641c28..59254fef 100644 --- a/app/Http/Home/Views/account/login.volt +++ b/app/Http/Home/Views/account/login.volt @@ -2,6 +2,9 @@ {% block content %} + {% set login_with_phone = oauth_provider.local.login_with_phone == 1 %} + {% set login_with_email = oauth_provider.local.login_with_email == 1 %} +
首页 登录 diff --git a/app/Http/Home/Views/account/login_by_password.volt b/app/Http/Home/Views/account/login_by_password.volt index cded753e..a1d15f4a 100644 --- a/app/Http/Home/Views/account/login_by_password.volt +++ b/app/Http/Home/Views/account/login_by_password.volt @@ -1,8 +1,20 @@