Merge branch 'main' of github.com:EdgeStanding/lae

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'));
     }

resources/views/balances/transactions.blade.php

@@ -5,6 +5,10 @@
 @section('content')
     <h2>交易记录</h2>
 
+    <a href="?type=income">收入</a>
+    <a href="?type=payout">支出</a>
+    <a href="?payment=transfer">转账记录</a>
+
     <div class="overflow-auto">
         <table class="table">
             <thead>
@@ -22,12 +26,12 @@
             @foreach ($transactions as $t)
                 <tr>
 
-                    <td>
-                        @if ($t->type = 'payout')
+		    <td>
+                        @if ($t->type === 'payout')
                             <span class="text-danger">
                                 支出
                             </span>
-                        @else($t->type = 'payin')
+                        @elseif($t->type === 'income')
                             <span class="text-success">
                                 收入
                             </span>

resources/views/layouts/app.blade.php

@@ -55,7 +55,7 @@
                     @guest
                         @if (Route::has('admin.login'))
                             <li class="nav-item">
-                                <a class="nav-link" href="{{ route('admin.login') }}">{{ __('Login') }}</a>
+                                <a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
                             </li>
                         @endif
                     @else