BitMaster/ProxyPanel
1
0
Fork 0
mirror of https://github.com/ProxyPanel/ProxyPanel.git synced 2026-04-12 23:48:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #66 未开启在线支付，充值券无法充值的问题

Browse Source
This commit is contained in:
兔姬桑
2020-10-22 03:57:55 +08:00
parent 80ad760869
commit 5643a945eb
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Console/Commands/upgradeUserResetTime.php
View File

@@ -50,8 +50,7 @@ class upgradeUserResetTime extends Command
$user->update(['reset_time' => $reset_time]);
}
Log::info('---用户[ID：'.$user->id.' - '.$user->username.' ('.$user->email.')]的新重置日期为'.($reset_time !== null ? '【'.$reset_time.'】' :
'【无】').'---');
Log::info('---用户[ID：'.$user->id.' - '.$user->username.' ('.$user->email.')]的新重置日期为'.($reset_time !== null ? '【'.$reset_time.'】' : '【无】').'---');
}
Log::info('----------------------------【升级用户重置日期】结束----------------------------');

2
resources/views/user/index.blade.php
View File

@@ -27,7 +27,7 @@
<p class="ml-15 mt-15 text-left">更长使用<code>时间</code></p>
<p class="text-center">更多<code>流量</code></p>
<p class="mb-15 mr-15 text-right">更多优质<code>线路</code></p>
<a href="/services" class="btn btn-block btn-danger">快 来 购 买 服 务 吧！</a>
<a href="{{route('shop')}}" class="btn btn-block btn-danger">快 来 购 买 服 务 吧！</a>
@elseif(Auth::getUser()->enable)
<i class="wb-check green-400 font-size-40 mr-10"></i>
<span class="font-size-40 font-weight-100">{{trans('home.enabled')}}</span>

13
resources/views/user/services.blade.php
View File

@@ -103,7 +103,7 @@
<div class="modal-body">
<div class="alert alert-danger" id="charge_msg" style="display: none;"></div>
<form action="#" method="post">
@if(sysConfig('is_onlinePay'))
@if(sysConfig('is_onlinePay') || sysConfig('alipay_qrcode') || sysConfig('wechat_qrcode'))
<div class="mb-15 w-p50">
<select class="form-control" name="charge_type" id="charge_type">
@if(sysConfig('is_onlinePay'))
@@ -164,7 +164,8 @@
</div>
</div>
</div>
@endsection @section('script')
@endsection
@section('script')
<script src="assets/global/vendor/ionrangeslider/ion.rangeSlider.min.js"></script>
<script src="assets/global/js/Plugin/ionrangeslider.js"></script>
<script type="text/javascript">
@@ -190,16 +191,14 @@
}
$(document).ready(function() {
itemControl(parseInt($('#charge_type').val()));
let which_selected;
let which_selected = 3;
@if(sysConfig('is_onlinePay'))
which_selected = 1;
@elseif(sysConfig('alipay_qrcode') || sysConfig('wechat_qrcode'))
which_selected = 2;
@else
which_selected = 3;
@endif
itemControl(which_selected);
$('charge_type').val(which_selected);
});
@@ -238,7 +237,7 @@
// 充值
function pay(method, pay_type) {
const paymentType = parseInt($('#charge_type').val());
const paymentType = parseInt($('#charge_type').val() ?? 3);
const charge_coupon = $('#charge_coupon').val().trim();
const amount = parseInt($('#amount').val());
if (paymentType === 1) {