余额日志修复，按钮颜色自定义

application/api/controller/Account.php

@@ -27,16 +27,19 @@ class Account extends Api
     public function logs()
     {
         try {
+            $user_id = $this->auth->id ?? -1;
             $page = $this->request->get('page', 1);
             $page_size = $this->request->get('page_size', 10);
             $tab = $this->request->get('tab', 'all');
             $accountType = $this->request->get('accountType', '');
-            $where = [];
+            $where = [
+                'user_id' => $user_id,
+            ];
             if ($tab != 'all') {
                 $where['inc_or_exp'] = $tab == 'income' ? 1 : 2;
             }
             if ($accountType) {
-                $where['account_type'] =  $accountType == 'amount' ? ['in', ['amount', 'freeze']] : $accountType;
+                $where['account_type'] = $accountType == 'amount' ? ['in', ['amount', 'freeze']] : $accountType;
             }
             $list = AccountLogService::getList($where, $page_size, 'id desc')->toArray();
 
@@ -66,12 +69,12 @@ class Account extends Api
             $name = $this->request->post('name', '');
             // 验证参数
             $error = $this->validate($this->request->post(), [
-                'name'   => 'require',
+                'name' => 'require',
                 'amount' => 'require|number|between:1,500',
             ], [
-                'name.require'   => '微信真实姓名必填',
+                'name.require' => '微信真实姓名必填',
                 'amount.require' => '提现金额不正确',
-                'amount.number'  => '提现金额必须为数字',
+                'amount.number' => '提现金额必须为数字',
                 'amount.between' => '提现金额必须在1到500之间',
             ]);
             if (true !== $error) {

application/api/controller/Demand.php

@@ -112,38 +112,44 @@ class Demand extends Api
                 }
             }
             $btnNameFun = function ($opType, $item) {
-                $name = '查看详情';
+                $button = ['name' => '查看详情', 'theme' => 'light'];
                 if ($opType == 'all') {
-                    $name = '参与投标';
+                    $button = ['name' => '参与投标', 'theme' => 'danger'];
                     if ($item->status == 1 && $item->isMyWin && $item->winBidding->bidding_status == 2 && $item->winBidding->process_status == 1) {
-                        $name = '确认接单';
+                        $button = ['name' => '确认接单', 'theme' => 'danger'];
                     } elseif ($item->status == 2 && $item->isMyWin && $item->winBidding->bidding_status == 2 && $item->winBidding->process_status == 2) {
-                        $name = '合同签约';
+                        $button = ['name' => '合同签约', 'theme' => 'danger'];
                     } elseif ($item->status == 3 && $item->isMyWin && $item->winBidding->bidding_status == 2 && $item->winBidding->process_status == 2) {
-                        $name = '工作完成';
+                        $button = ['name' => '工作完成', 'theme' => 'danger'];
                     } elseif ($item->is_bid) {
-                        $name = '已投标';
+                        $button = ['name' => '已投标', 'theme' => 'light'];
                     }
                 } elseif ($opType == 'myQuote') {
                     if ($item->status == 1 && $item->isMyWin && $item->winBidding->bidding_status == 2 && $item->winBidding->process_status == 1) {
-                        $name = '确认接单';
+                        $button = ['name' => '确认接单', 'theme' => 'danger'];
                     } elseif ($item->status == 2 && $item->isMyWin && $item->winBidding->bidding_status == 2 && $item->winBidding->process_status == 2) {
-                        $name = '合同签约';
+                        $button = ['name' => '合同签约', 'theme' => 'danger'];
                     } elseif ($item->status == 3 && $item->isMyWin && $item->winBidding->bidding_status == 2 && $item->winBidding->process_status == 2) {
-                        $name = '工作完成';
+                        $button = ['name' => '工作完成', 'theme' => 'danger'];
+                    } elseif ($item->status == 4 && $item->accept_status == 1) {
+                        $button = ['name' => '待验收', 'theme' => 'light'];
+                    } elseif ($item->status == 5 && $item->accept_status == 2) {
+                        $button = ['name' => '待收货', 'theme' => 'light'];
                     }
                 } elseif ($opType == 'my') {
                     if ($item->status == 2 && $item->demand_contracts && $item->demand_contracts->status2 == 1) {
-                        $name = '合同签约';
+                        $button = ['name' => '合同签约', 'theme' => 'danger'];
                     } elseif ($item->status == 2) {
-                        $name = '详聊沟通';
+                        $button = ['name' => '详聊沟通', 'theme' => 'danger'];
+                    } elseif ($item->status == 3 && $item->work_status == 1) {
+                        $button = ['name' => '工作中', 'theme' => 'light'];
                     } elseif ($item->status == 4 && $item->accept_status == 1) {
-                        $name = '前去验收';
+                        $button = ['name' => '前去验收', 'theme' => 'danger'];
                     } elseif ($item->status == 5 && $item->accept_status == 2) {
-                        $name = '确认收货';
+                        $button = ['name' => '确认收货', 'theme' => 'danger'];
                     }
                 }
-                return $name;
+                return $button;
             };
             $list = DemandService::getList($where, $page_size, 'id desc', '', ['user', 'demandContracts', 'demandBiddings', 'winBidding']);
             $list = $list->each(function ($item, $key) use ($user_id, $opType, $btnNameFun) {
@@ -152,7 +158,7 @@ class Demand extends Api
                 $item->demand_biddings_count = count($demand_bidding);
                 $item->is_bid = in_array($user_id, $bidUserIds);
                 $item->isMyWin = $item->winBidding && $item->winBidding->user_id == $user_id;
-                $item->btnName = $btnNameFun($opType, $item);
+                $item->button = $btnNameFun($opType, $item);
             });
             $this->success('', $list);
         } catch (\Exception $e) {