修改分页查询

common/components/ActiveRecord.php

@@ -308,7 +308,7 @@ class ActiveRecord extends \yii\db\ActiveRecord {
             'currentPage'=>$pagination->page,
             'totalPages'=>$pagination->pageCount,
             'startNum' => $startNum,
-            'totalCount' => $pagination->totalCount,
+            'totalCount' => intval($pagination->totalCount),
             'pageSize' => $pagination->pageSize,
         ];
     }

frontendApi/modules/v1/controllers/BonusController.php

@@ -73,13 +73,13 @@ class BonusController extends BaseController {
 //                $showCFLX = true;
 //            }
 //        }
-        $wallet[] = ['walletType' => 'bonus', 'walletName' => 'Member bonus', 'amount' => Tool::formatPrice($data['BONUS'])];//会员奖金
+        $wallet[] = ['walletType' => 'bonus', 'walletName' => 'Member Bonus', 'amount' => Tool::formatPrice($data['BONUS'])];//会员奖金
         $wallet[] = ['walletType' => 'cash', 'walletName' => 'Member Ecoin', 'amount' => Tool::formatPrice($data['CASH'])];//会员余额
 //        $wallet[] = ['walletType' => 'point', 'walletName' => '会员积分', 'amount' => Tool::formatPrice($data['RECONSUME_POINTS'])];
 //        $wallet[] = ['walletType' => 'exchange', 'walletName' => 'Exchange points', 'amount' => Tool::formatPrice($data['EXCHANGE_POINTS'])];//兑换点数
 //        $wallet[] = ['walletType' => 'tourism_points', 'walletName' => 'Travel points', 'amount' => Tool::formatPrice($data['TOURISM_POINTS'])];//旅游积分
-        $wallet[] = ['walletType' => 'garage_points', 'walletName' => 'Car points', 'amount' => Tool::formatPrice($data['GARAGE_POINTS'])];//车奖积分
-        $wallet[] = ['walletType' => 'villa_points', 'walletName' => 'Villa points', 'amount' => Tool::formatPrice($data['VILLA_POINTS'])];//房奖积分
+        $wallet[] = ['walletType' => 'garage_points', 'walletName' => 'Car Points', 'amount' => Tool::formatPrice($data['GARAGE_POINTS'])];//车奖积分
+        $wallet[] = ['walletType' => 'villa_points', 'walletName' => 'Villa Points', 'amount' => Tool::formatPrice($data['VILLA_POINTS'])];//房奖积分
 //        if ($showCFLX) {
 //            $wallet[] = ['walletType' => 'cf', 'walletName' => '福利积分一', 'amount' => Tool::formatPrice($data['CF'])];
 //            $wallet[] = ['walletType' => 'lx', 'walletName' => '福利积分二', 'amount' => Tool::formatPrice($data['LX'])];