diff --git a/app/Http/Controllers/Web/BalanceController.php b/app/Http/Controllers/Web/BalanceController.php index be7d335..8d407c6 100644 --- a/app/Http/Controllers/Web/BalanceController.php +++ b/app/Http/Controllers/Web/BalanceController.php @@ -25,7 +25,7 @@ public function index(Request $request): View $balance = $request->user()->balance; - $balances = Balance::thisUser()->latest()->paginate(50); + $balances = Balance::thisUser()->latest()->paginate(100); $drops_rate = config('drops.rate'); @@ -107,10 +107,13 @@ public function notify(Request $request): View|JsonResponse } // 检测订单是否已支付 - if ($balance->paid_at !== null) { - // return $this->success('订单已支付'); - return view('balances.process', compact('balance')); - } + // if ($balance->paid_at !== null) { + // // return $this->success('订单已支付'); + // return view('balances.process', compact('balance')); + // } + + + return view('balances.process', compact('balance')); // try { // $data = Pay::alipay()->callback(); @@ -132,8 +135,6 @@ public function notify(Request $request): View|JsonResponse // throw new ChargeException('商户不匹配'); // } - return view('balances.process'); - // // if ((new \App\Jobs\CheckAndChargeBalance())->checkAndCharge($balance, true)) { // return view('pay_process'); @@ -164,7 +165,7 @@ public function transactions(Request $request): View $transactions = $transactions->where('payment', $request->payment); } - $transactions = $transactions->latest()->paginate(30); + $transactions = $transactions->latest()->paginate(100)->withQueryString(); return view('balances.transactions', compact('transactions', 'modules')); } diff --git a/resources/views/balances/transactions.blade.php b/resources/views/balances/transactions.blade.php index d838554..041607f 100644 --- a/resources/views/balances/transactions.blade.php +++ b/resources/views/balances/transactions.blade.php @@ -5,6 +5,10 @@ @section('content')
- @if ($t->type = 'payout') + |
+ @if ($t->type === 'payout')
支出
- @else($t->type = 'payin')
+ @elseif($t->type === 'income')
收入
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 696c4f3..f55548a 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -55,7 +55,7 @@
@guest
@if (Route::has('admin.login'))
|