fixed 节点编辑port值未被读取,重置密码页面显示的小问题

This commit is contained in:
兔姬桑
2020-08-06 03:40:38 +08:00
parent f0413230d4
commit fa627e55bd
3 changed files with 21 additions and 8 deletions

View File

@@ -214,7 +214,6 @@ class AuthController extends Controller {
// 退出
public function logout(): RedirectResponse {
Auth::logout();
@@ -613,7 +612,7 @@ class AuthController extends Controller {
$verify->status = 1;
$verify->save();
return Redirect::back()->with('successMsg', trans('auth.reset_password_new'));
return Redirect::to('login')->with('successMsg', trans('auth.reset_password_new'));
}
$verify = Verify::type(1)->whereToken($token)->first();

View File

@@ -3,9 +3,9 @@
<link href="/assets/global/vendor/bootstrap-select/bootstrap-select.min.css" type="text/css" rel="stylesheet">
<link href="/assets/global/vendor/switchery/switchery.min.css" type="text/css" rel="stylesheet">
<style type="text/css">
.hidden {
display: none
}
.hidden {
display: none
}
</style>
@endsection
@section('content')
@@ -478,6 +478,20 @@
// ajax同步提交
function Submit() {
const type = $("input[name='type']:checked").val();
let port;
switch (type) {
case '2':
port = $("#v2ray_port").val();
break;
case '3':
port = $("#trojan_port").val();
break;
case '1':
case '4':
default:
port = $("#single_port").val();
}
$.ajax({
type: "POST",
url: @isset($node) "/node/edit" @else "/node/add" @endisset,
@@ -501,7 +515,7 @@
sort: $('#sort').val(),
is_udp: document.getElementById("is_udp").checked ? 1 : 0,
status: document.getElementById("status").checked ? 1 : 0,
type: $("input[name='type']:checked").val(),
type: type,
method: $('#method').val(),
protocol: $('#protocol').val(),
protocol_param: $('#protocol_param').val(),
@@ -511,7 +525,7 @@
is_subscribe: document.getElementById("is_subscribe").checked ? 1 : 0,
detection_type: $("input[name='detection_type']:checked").val(),
single: document.getElementById("single").checked ? 1 : 0,
port: $("input[name='port']").val(),
port: port,
passwd: $('#passwd').val(),
v2_alter_id: $('#v2_alter_id').val(),
v2_port: $('#v2_port').val(),

View File

@@ -27,7 +27,7 @@
</div>
<div class="form-group form-material floating" data-plugin="formMaterial">
<input class="form-control" type="password" autocomplete="off" name="confirmPassword" required/>
<label class="floating-label" for="confirmPassword">{{trans('auth.confirm_Password')}}</label>
<label class="floating-label" for="confirmPassword">{{trans('auth.confirm_password')}}</label>
</div>
@endif
<a href="/login"