Merge pull request #130 from cashwarden/feature/cw-12

fix: fix bug
cashwarden · Oct 12, 2021 · 68aaa6a · 68aaa6a
2 parents 9936146 + 98c6a2a
commit 68aaa6a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/modules/backend/controllers/SiteController.php b/modules/backend/controllers/SiteController.php
@@ -4,9 +4,9 @@
 
 use app\core\models\User;
 use app\modules\backend\models\LoginForm;
+use Carbon\Carbon;
 use Yii;
 use yii\web\Response;
-use yiier\helpers\DateHelper;
 
 class SiteController extends \yii\web\Controller
 {
@@ -21,8 +21,8 @@ public function actionIndex()
         if (Yii::$app->user->isGuest) {
             return $this->redirect('login');
         }
-        $start = DateHelper::beginTimestamp();
-        $end = DateHelper::endTimestamp();
+        $start = Carbon::now()->startOfDay()->toDateTimeString();
+        $end = Carbon::now()->endOfDay()->toDateTimeString();
         $todayUserTotal = User::find()->where(['between', 'created_at', $start, $end])->count();
         return $this->render('index', [
             'todayUserTotal' => $todayUserTotal,

diff --git a/modules/backend/controllers/UserController.php b/modules/backend/controllers/UserController.php
@@ -31,7 +31,7 @@ public function actionIndex()
                 'email' => request('email'),
             ]),
             'pagination' => [
-                'pageSize' => 2,
+                'pageSize' => 20,
             ],
             'sort' => ['defaultOrder' => ['id' => SORT_DESC]]
         ]);

diff --git a/web/favicon.ico b/web/favicon.ico