From 0dd43dfc4c0de7368df84882f078b6ae2688e4b5 Mon Sep 17 00:00:00 2001 From: LAE Slave Node Date: Thu, 17 Nov 2022 08:18:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=94=AF=E4=BB=98=E7=B1=BB=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/balances/transactions.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/balances/transactions.blade.php b/resources/views/balances/transactions.blade.php index d838554..74e869e 100644 --- a/resources/views/balances/transactions.blade.php +++ b/resources/views/balances/transactions.blade.php @@ -22,12 +22,12 @@ @foreach ($transactions as $t) - - @if ($t->type = 'payout') + + @if ($t->type === 'payout') 支出 - @else($t->type = 'payin') + @elseif($t->type === 'income') 收入 From 548c5ed07f4e590d99d0bd5862af9d7b97ceb75c Mon Sep 17 00:00:00 2001 From: LAE Slave Node Date: Thu, 17 Nov 2022 08:22:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Web/BalanceController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Web/BalanceController.php b/app/Http/Controllers/Web/BalanceController.php index be7d335..85a8e1e 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'); @@ -164,7 +164,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')); } From 8ebcae69a25d827555bbabf14d332c6ad7530d77 Mon Sep 17 00:00:00 2001 From: LAE Slave Node Date: Thu, 17 Nov 2022 08:23:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E8=BD=AC=E8=B4=A6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/balances/transactions.blade.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/views/balances/transactions.blade.php b/resources/views/balances/transactions.blade.php index 74e869e..041607f 100644 --- a/resources/views/balances/transactions.blade.php +++ b/resources/views/balances/transactions.blade.php @@ -5,6 +5,10 @@ @section('content')

交易记录

+ 收入 + 支出 + 转账记录 +
From 00189ae1bae8d5e71d7d696b6dbdb30f20e24d01 Mon Sep 17 00:00:00 2001 From: LAE Slave Node Date: Thu, 17 Nov 2022 08:29:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=99=BB=E5=BD=95=20U?= =?UTF-8?q?RL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/layouts/app.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'))
  • - {{ __('Login') }} + {{ __('Login') }}
    • @endif @else From 1f8e979284c6cff6f6ae85932073d956f1599ecb Mon Sep 17 00:00:00 2001 From: LAE Slave Node Date: Thu, 17 Nov 2022 14:43:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E4=BC=A0=E9=80=92=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Web/BalanceController.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Web/BalanceController.php b/app/Http/Controllers/Web/BalanceController.php index 85a8e1e..8d407c6 100644 --- a/app/Http/Controllers/Web/BalanceController.php +++ b/app/Http/Controllers/Web/BalanceController.php @@ -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');