From 0eae352872e782894d0e8501a794e609d1bb8a1d Mon Sep 17 00:00:00 2001
From: lingling <1077478963@qq.com>
Date: Fri, 21 Feb 2025 22:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA=E6=97=B6=E9=97=B4=E4=B8=BA=E4=B8=9C?=
 =?UTF-8?q?=E5=85=AB=E5=8C=BA=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/TaskController.php | 4 ++--
 process/Task2.php                     | 2 +-
 public/js/index-ff644a8b.js           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controller/api/TaskController.php b/app/controller/api/TaskController.php
index a1a95f5..35efb14 100644
--- a/app/controller/api/TaskController.php
+++ b/app/controller/api/TaskController.php
@@ -82,7 +82,7 @@ class TaskController
         $user_id = $request->data['id'];
         $phone = $request->post('phone');
         $GetLodeLog = GetLodeLog::where('phone', $phone)->first();
-        if ($GetLodeLog->status == 0 && !empty($GetLodeLog)) {
+        if ( !empty($GetLodeLog) &&$GetLodeLog->status == 0) {
             return ApiResponseApp::success([]);
         }
         if ($GetLodeLog->status == 1) {
@@ -93,7 +93,7 @@ class TaskController
         /**
          * 这里查询是否上号成功 2是等待上号
          */
-        if ($GetLodeLog->status == 2 && !empty($GetLodeLog)) {
+        if ( !empty($GetLodeLog)&&$GetLodeLog->status == 2 ) {
             $ws_build_status = SendCode::send_code($phone)['code'];
             //上号成功
             if (UserPhone::where('phone', $phone)->count() == 0 && $ws_build_status==0) {
diff --git a/process/Task2.php b/process/Task2.php
index 13505e6..492e5b5 100644
--- a/process/Task2.php
+++ b/process/Task2.php
@@ -63,7 +63,7 @@ class Task2
                         $score = $hours * 20;
                     
                         // 计算剩余的秒数
-                        $remainingTime = $value->time - ($hours * 3600);
+                        $remainingTime = $value->time % 3600;
                         var_dump($remainingTime);
                         // 更新用户的积分
                         $value->score += $score;
diff --git a/public/js/index-ff644a8b.js b/public/js/index-ff644a8b.js
index 3486467..5643892 100644
--- a/public/js/index-ff644a8b.js
+++ b/public/js/index-ff644a8b.js
@@ -718,7 +718,7 @@ const fe = function () {
                       ),
                     ]),
                     S("div", Oe, [
-                      S("span", He, F(e.$t("每日奖励重置时间")) + " UTC：", 1),
+                      S("span", He, F(e.$t("每日奖励重置时间")) + " UTC+8：", 1),
                       u(
                         E,
                         {