BitMaster/ProxyPanel
1
0
Fork 0
mirror of https://github.com/ProxyPanel/ProxyPanel.git synced 2026-04-03 02:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed 底等级用户查看商品中线路条数计算错误的问题

Browse Source
This commit is contained in:
兔姬桑
2022-06-08 23:49:12 +08:00
parent f7db097a06
commit a06148ea12
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/UserController.php
View File

@@ -201,9 +201,22 @@ class UserController extends Controller
// 有重置日时按照重置日为标准，否则就以过期日为标准
$dataPlusDays = $user->reset_time ?? $user->expired_at;
$goodsList = Goods::whereStatus(1)->where('type', '<=', '2')->orderByDesc('type')->orderByDesc('sort')->get();
if ($user && $nodes = $user->userGroup) {
$nodes = $nodes->nodes();
foreach ($goodsList as $goods) {
$goods->node_count = $nodes->where('level', '<=', $goods->level)->count();
}
} else {
foreach ($goodsList as $goods) {
$goods->node_count = Node::where('level', '<=', $goods->level)->count();
}
}
return view('user.services', [
'chargeGoodsList' => Goods::type(3)->whereStatus(1)->orderBy('price')->get(),
'goodsList' => Goods::whereStatus(1)->where('type', '<=', '2')->orderByDesc('type')->orderByDesc('sort')->get(),
'goodsList' => $goodsList,
'renewTraffic' => $renewPrice->renew ?? 0,
'dataPlusDays' => $dataPlusDays > date('Y-m-d') ? Helpers::daysToNow($dataPlusDays) : 0,
]);

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

@@ -77,7 +77,7 @@
{!!$goods->type === 1? ' <code>'.$dataPlusDays.'</code> '.trans_choice('validation.attributes.day', 1):'/'.trans('validation.attributes.month')!!}
</li>
<li>
{!!trans('user.service.node_count', ['num' => Auth::user()->nodes()->where('level', '<=', $goods->level)->count()])!!}
{!!trans('user.service.node_count', ['num' => $goods->node_count])!!}
</li>
<li>
{{trans('user.account.speed_limit')}}