From af84bc65cb98f8a135e59731b1e5ab1bb8d239bf Mon Sep 17 00:00:00 2001
From: liutk <961510893@qq.com>
Date: Sun, 1 Sep 2024 15:18:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/ActivityController.php | 6 +++---
 app/Admin/Controllers/HomeController.php     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Admin/Controllers/ActivityController.php b/app/Admin/Controllers/ActivityController.php
index d91445e..c9b7cd8 100644
--- a/app/Admin/Controllers/ActivityController.php
+++ b/app/Admin/Controllers/ActivityController.php
@@ -341,9 +341,9 @@ class ActivityController extends AdminController
     public function finish(Activity $activity)
     {
         //若存在未公布结果的比赛场次，无法结算；
-        if($activity->games()->where('state', '<>', 2)->exists()){ 
-            return $this->response()->fail('该活动存在未公布结果的竞猜场次，请先公布结果');
-        }
+        // if($activity->games()->where('state', '<>', 2)->exists()){ 
+        //     return $this->response()->fail('该活动存在未公布结果的竞猜场次，请先公布结果');
+        // }
         $res = $this->service->finishActivity($activity);
         return  $this->autoResponse($res, '结算');
     }
diff --git a/app/Admin/Controllers/HomeController.php b/app/Admin/Controllers/HomeController.php
index 3d4757d..e84c465 100644
--- a/app/Admin/Controllers/HomeController.php
+++ b/app/Admin/Controllers/HomeController.php
@@ -212,9 +212,9 @@ tooltip: { trigger: 'axis' },
 xAxis: { type: 'category', boundaryGap: false, data: ['".implode("','", $days)."']},
 yAxis: { type: 'value' },
 grid:{ left: '7%', right:'3%', top: 60, bottom: 30, },
-legend: { data: ['访问量','注册量'] },
+legend: { data: ['新增访问量','注册量'] },
 series: [
-    { name: '访问量', data: {$dayCreateUser}, type: 'line', areaStyle: {}, smooth: true, symbol: 'none', },
+    { name: '新增访问量', data: {$dayCreateUser}, type: 'line', areaStyle: {}, smooth: true, symbol: 'none', },
     { name:'注册量', data: {$dayBindUser}, type: 'line', areaStyle: {}, smooth: true, symbol: 'none', },
 ]}");