diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index fc611780..c7d4ad47 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -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, ]); diff --git a/resources/views/user/services.blade.php b/resources/views/user/services.blade.php index 483840af..b7360d68 100644 --- a/resources/views/user/services.blade.php +++ b/resources/views/user/services.blade.php @@ -77,7 +77,7 @@ {!!$goods->type === 1? ' '.$dataPlusDays.' '.trans_choice('validation.attributes.day', 1):'/'.trans('validation.attributes.month')!!}
  • - {!!trans('user.service.node_count', ['num' => Auth::user()->nodes()->where('level', '<=', $goods->level)->count()])!!} + {!!trans('user.service.node_count', ['num' => $goods->node_count])!!}
  • {{trans('user.account.speed_limit')}}