Skip to content

Commit 22d6266

Browse files
modstartmodstart
committed
feat: modstart upgrade
1 parent cac7c19 commit 22d6266

File tree

59 files changed

+402
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+402
-175
lines changed

‎module/Member/Api/Controller/AuthController.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,6 +1125,15 @@ public function oauthBindCaptchaRaw()
11251125
return CaptchaFacade::create('default');
11261126
}
11271127

1128+
public function oauthBindCaptcha()
1129+
{
1130+
Session::forget('oauthBindCaptchaPass');
1131+
$captcha = $this->oauthBindCaptchaRaw();
1132+
return Response::generate(0, 'ok', [
1133+
'image' => 'data:image/png;base64,' . base64_encode($captcha->getOriginalContent()),
1134+
]);
1135+
}
1136+
11281137
/**
11291138
* @return array
11301139
* @Api 授权登录-获取注册邮箱验证码

‎module/Member/Api/routes.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
$router->match(['post'], 'oauth/callback', 'AuthController@oauthCallback');
3030
$router->match(['post'], 'oauth/try_login', 'AuthController@oauthTryLogin');
3131
$router->match(['post'], 'oauth/bind', 'AuthController@oauthBind');
32+
$router->match(['post'], 'oauth/bind_captcha', 'AuthController@oauthBindCaptcha');
33+
$router->match(['post'], 'oauth/bind_captcha_verify', 'AuthController@oauthBindCaptchaVerify');
34+
$router->match(['post'], 'oauth/bind_phone_verify', 'AuthController@oauthBindPhoneVerify');
35+
$router->match(['post'], 'oauth/bind_email_verify', 'AuthController@oauthBindEmailVerify');
3236

3337
$router->match(['post'], 'sso/client_prepare', 'AuthController@ssoClientPrepare');
3438
$router->match(['post'], 'sso/client', 'AuthController@ssoClient');

‎module/Member/Config/MemberAdminList.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ class MemberAdminList
88
{
99
private static $gridFields = [];
1010

11+
/**
12+
* @param \Closure $callback function($builder) {}
13+
*/
1114
public static function registerGridField(\Closure $callback)
1215
{
1316
self::$gridFields[] = $callback;

‎module/Member/Docs/release.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
- 新增：用户VIP开通赠送积分功能开启
44
- 新增：授权登录绑定手机和邮箱可配置
5+
- 新增：用户注册处理器新增排序字段
6+
- 新增：用户注册登录弹窗逻辑兼容处理
57

68
---
79

‎module/Member/Provider/RegisterProcessor/AbstractMemberRegisterProcessorProvider.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66

77
abstract class AbstractMemberRegisterProcessorProvider
88
{
9+
public function order()
10+
{
11+
return 100;
12+
}
13+
914
abstract public function name();
1015

1116
abstract public function title();

‎module/Member/View/pc/login.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</div>
2929

3030
<div class="ub-form flat">
31-
<form action="?" method="post" data-ajax-form>
31+
<form action="{{\ModStart\Core\Input\Request::currentPageUrl()}}" method="post" data-ajax-form>
3232
<div class="line">
3333
<div class="field">
3434
<input type="text" class="form-lg" name="username" placeholder="输入用户" />
@@ -76,7 +76,7 @@
7676
@if(!modstart_config('retrieveDisable',false))
7777
<div class="retrieve">
7878
忘记密码?
79-
<a href="{{$__msRoot}}retrieve?redirect={{urlencode($redirect)}}">找回密码</a>
79+
<a target="_parent" href="{{$__msRoot}}retrieve?redirect={{urlencode($redirect)}}">找回密码</a>
8080
</div>
8181
@endif
8282
</div>

‎module/Member/View/pc/loginDialog.blade.php‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
@extends($_viewFrame)
2+
3+
@section('pageTitleMain')登录@endsection
4+
@section('pageKeywords')登录@endsection
5+
@section('pageDescription')登录@endsection
6+
7+
@section('headAppend')
8+
@parent
9+
{!! \ModStart\Core\Hook\ModStartHook::fireInView('MemberLoginPageHeadAppend'); !!}
10+
@endsection
11+
12+
@section('bodyAppend')
13+
@parent
14+
{!! \ModStart\Core\Hook\ModStartHook::fireInView('MemberLoginPageBodyAppend'); !!}
15+
@endsection
16+
17+
{!! \ModStart\ModStart::style('html,body{background:var(--color-content-bg);}') !!}
18+
@section('body')
19+
20+
<div class="ub-account pb-member-login-account">
21+
22+
<div class="box" data-member-login-box>
23+
<div class="nav">
24+
<a href="javascript:;" class="active">登录</a>
25+
@if(!modstart_config('registerDisable',false))
26+
·
27+
<a href="{{$__msRoot}}register?dialog=1&redirect={{!empty($redirect)?urlencode($redirect):''}}">注册</a>
28+
@endif
29+
</div>
30+
31+
<div class="ub-form flat">
32+
<form action="{{\ModStart\Core\Input\Request::currentPageUrl()}}" method="post" data-ajax-form>
33+
<div class="line">
34+
<div class="field">
35+
<input type="text" class="form-lg" name="username" placeholder="输入用户" />
36+
</div>
37+
</div>
38+
<div class="line">
39+
<div class="field">
40+
<input type="password" class="form-lg" name="password" placeholder="输入密码" />
41+
</div>
42+
</div>
43+
@if(modstart_config('loginCaptchaEnable',false))
44+
<?php $providerName = modstart_config('loginCaptchaProvider',null); ?>
45+
@if($providerName && ($provider = \Module\Vendor\Provider\Captcha\CaptchaProvider::get($providerName)))
46+
<div style="padding:0.5rem;">
47+
{!! $provider->render() !!}
48+
</div>
49+
@else
50+
<div class="line">
51+
<div class="field">
52+
<div class="row no-gutters">
53+
<div class="col-6">
54+
<input type="text" class="form-lg" name="captcha" autocomplete="off" placeholder="图片验证码" />
55+
</div>
56+
<div class="col-6">
57+
<img class="captcha captcha-lg" title="刷新验证" data-captcha
58+
src="{{modstart_web_url('login/captcha')}}"
59+
onclick="$(this).attr('src','{{modstart_web_url('login/captcha')}}?'+Math.random())" />
60+
</div>
61+
</div>
62+
</div>
63+
</div>
64+
@endif
65+
@endif
66+
<div class="line">
67+
<div class="field">
68+
<button type="submit" class="btn btn-primary btn-lg btn-block">登录</button>
69+
<input type="hidden" name="redirect" value="{{empty($redirect)?'':$redirect}}">
70+
</div>
71+
</div>
72+
</form>
73+
</div>
74+
75+
@include('module::Member.View.pc.oauthButtons')
76+
77+
@if(!modstart_config('retrieveDisable',false))
78+
<div class="retrieve">
79+
忘记密码?
80+
<a target="_parent" href="{{$__msRoot}}retrieve?redirect={{urlencode($redirect)}}">找回密码</a>
81+
</div>
82+
@endif
83+
</div>
84+
85+
</div>
86+
87+
@endsection

‎module/Member/View/pc/loginPhone.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</div>
4545

4646
<div class="ub-form flat">
47-
<form action="?" method="post" data-ajax-form>
47+
<form action="{{\ModStart\Core\Input\Request::currentPageUrl()}}" method="post" data-ajax-form>
4848
<div class="line">
4949
<div class="field">
5050
<input type="text" class="form-lg" name="phone" placeholder="输入手机" />
@@ -90,7 +90,7 @@
9090
@if(!modstart_config('retrieveDisable',false))
9191
<div class="retrieve">
9292
忘记密码?
93-
<a href="{{$__msRoot}}retrieve?redirect={{urlencode($redirect)}}">找回密码</a>
93+
<a target="_parent" href="{{$__msRoot}}retrieve?redirect={{urlencode($redirect)}}">找回密码</a>
9494
</div>
9595
@endif
9696
</div>

‎module/Member/View/pc/memberProfile/delete.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<div class="title">注销账号</div>
1414
</div>
1515
<div class="body">
16-
<form action="?" data-ajax-form class="ub-form" method="post">
16+
<form action="{{\ModStart\Core\Input\Request::currentPageUrl()}}" data-ajax-form class="ub-form" method="post">
1717
<div class="line">
1818
<div class="label">用户ID：</div>
1919
<div class="field">

‎module/Member/View/pc/memberProfile/email.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<div class="title">{{$pageTitle}}</div>
3333
</div>
3434
<div class="body">
35-
<form action="?" class="ub-form" method="post" style="max-width:40em;" data-ajax-form>
35+
<form action="{{\ModStart\Core\Input\Request::currentPageUrl()}}" class="ub-form" method="post" style="max-width:40em;" data-ajax-form>
3636

3737
@if(! \Module\Vendor\Provider\MailSender\MailSenderProvider::hasProvider())
3838
<div class="line">

0 commit comments

Comments
 (0)