From 37ad1cae256b7a9c5648def08a7abc34cda3314e Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 20:11:12 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/API/H5/FenzhenController.php  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index 6f55485..0228493 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -20,13 +20,13 @@ class FenzhenController extends Controller
     // 这里放 弃检逻辑
     $id = request('id');
     $xmid = request('xmid');
-    $orderInfo=DB::table('orders')->where('id',$id)->first();
-    if(!$orderInfo) return \Yz::echoError1("订单不存在");
+    $orderInfo = DB::table('orders')->where('id', $id)->first();
+    if (!$orderInfo) return \Yz::echoError1("订单不存在");
     $service = new ComboItemGroupService();
-    $q=$service->QiJian($orderInfo->tj_number,$orderInfo->name,[$xmid]);
-    if($q['status']===true){
-      return \Yz::Return(true, "弃检成功",[]);
-    }else{
+    $q = $service->QiJian($orderInfo->tj_number, $orderInfo->name, [$xmid]);
+    if ($q['status'] === true) {
+      return \Yz::Return(true, "弃检成功", []);
+    } else {
       return \Yz::echoError1($q['msg']);
     }
 
@@ -254,8 +254,8 @@ class FenzhenController extends Controller
       $res['data']['end_time'] = date('H:i', $last_time);
       $check_tip = false;
       if ($error_day == -1) {
-        $et = $info->appointment_date . strtotime($res['data']['end_time']);
-//        $et = '2024-10-10 00:00:00';
+        $et = $info->appointment_date . strtotime($res['data']['end_time'] . ':00');
+        // $et = '2024-10-10 00:00:00';
         $check_tip = (time() - strtotime($et)) > (60 * 20);
       }
       return \Yz::Return(true, "获取成功", [
@@ -361,13 +361,13 @@ class FenzhenController extends Controller
     $beizhu = !!$item->beizhu ? $item->beizhu : '';
     $tishi = !!$item->tishi ? $item->tishi : '';
     $ret = [];
-    if(!!$canqian){
+    if (!!$canqian) {
       $ret[] = $canqian;
     }
-    if(!!$beizhu){
+    if (!!$beizhu) {
       $ret[] = $beizhu;
     }
-    if(!!$tishi){
+    if (!!$tishi) {
       $ret[] = $tishi;
     }
     return count($ret) == 0 ? '' : '(' . implode(',', $ret) . ')';

From fece577ebd6ec5166b7b76d37bf09b27c212247e Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 20:13:30 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index 0228493..4741da7 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -257,6 +257,7 @@ class FenzhenController extends Controller
         $et = $info->appointment_date . strtotime($res['data']['end_time'] . ':00');
         // $et = '2024-10-10 00:00:00';
         $check_tip = (time() - strtotime($et)) > (60 * 20);
+        $check_tip = $et;
       }
       return \Yz::Return(true, "获取成功", [
         'info' => [

From 546c2187968f09f8da51a1e305f57039a9f54750 Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 20:14:28 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index 4741da7..aa35429 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -254,10 +254,10 @@ class FenzhenController extends Controller
       $res['data']['end_time'] = date('H:i', $last_time);
       $check_tip = false;
       if ($error_day == -1) {
-        $et = $info->appointment_date . strtotime($res['data']['end_time'] . ':00');
+        $et = $info->appointment_date . ' ' . $res['data']['end_time'] . ':00';
         // $et = '2024-10-10 00:00:00';
         $check_tip = (time() - strtotime($et)) > (60 * 20);
-        $check_tip = $et;
+//        $check_tip = $et;
       }
       return \Yz::Return(true, "获取成功", [
         'info' => [

From 188634bb4f6259c56d749fd293909b4d2a02b2ee Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 20:15:24 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index aa35429..53d6c43 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -257,7 +257,7 @@ class FenzhenController extends Controller
         $et = $info->appointment_date . ' ' . $res['data']['end_time'] . ':00';
         // $et = '2024-10-10 00:00:00';
         $check_tip = (time() - strtotime($et)) > (60 * 20);
-//        $check_tip = $et;
+        $check_tip = $et;
       }
       return \Yz::Return(true, "获取成功", [
         'info' => [

From 72ee428f3b7fe4f48a852077d220d09688a4b265 Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 20:16:57 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index 53d6c43..b019fb2 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -257,7 +257,7 @@ class FenzhenController extends Controller
         $et = $info->appointment_date . ' ' . $res['data']['end_time'] . ':00';
         // $et = '2024-10-10 00:00:00';
         $check_tip = (time() - strtotime($et)) > (60 * 20);
-        $check_tip = $et;
+        $check_tip = json_encode([time() - strtotime($et), 60 * 20]);
       }
       return \Yz::Return(true, "获取成功", [
         'info' => [

From 03c4307f29969811fde1c42311b1a93307a58fff Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 20:18:33 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index b019fb2..fd60bac 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -257,7 +257,7 @@ class FenzhenController extends Controller
         $et = $info->appointment_date . ' ' . $res['data']['end_time'] . ':00';
         // $et = '2024-10-10 00:00:00';
         $check_tip = (time() - strtotime($et)) > (60 * 20);
-        $check_tip = json_encode([time() - strtotime($et), 60 * 20]);
+        $check_tip = json_encode([time() - strtotime($et), 60 * 20], JSON_UNESCAPED_UNICODE);
       }
       return \Yz::Return(true, "获取成功", [
         'info' => [

From d670d86a13f7912c897a321c517ceacd75da9792 Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 20:26:03 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/API/H5/FenzhenController.php    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index fd60bac..a906143 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -130,12 +130,14 @@ class FenzhenController extends Controller
         }
       }
       $end_status = 0;
+      $tip_check_show = false;
       foreach ($time_line as $time_line_item) {
         if ($time_line_item['status'] == 4) {
           $end_status += 1;
         }
       }
       if (count($time_line) <= $end_status + 1) {
+        $tip_check_show = true;
         $time_line[count($time_line) - 1]['status'] = 4;
       }
       // -1 报告未出 不能预约 报告解读 不显示
@@ -254,10 +256,12 @@ class FenzhenController extends Controller
       $res['data']['end_time'] = date('H:i', $last_time);
       $check_tip = false;
       if ($error_day == -1) {
-        $et = $info->appointment_date . ' ' . $res['data']['end_time'] . ':00';
-        // $et = '2024-10-10 00:00:00';
-        $check_tip = (time() - strtotime($et)) > (60 * 20);
-        $check_tip = json_encode([time() - strtotime($et), 60 * 20], JSON_UNESCAPED_UNICODE);
+        if ($tip_check_show) {
+          $et = $info->appointment_date . ' ' . $res['data']['end_time'] . ':00';
+          // $et = '2024-10-10 00:00:00';
+          $check_tip = (time() - strtotime($et)) > (60 * 20);
+//        $check_tip = json_encode([time() - strtotime($et), 60 * 20], JSON_UNESCAPED_UNICODE);
+        }
       }
       return \Yz::Return(true, "获取成功", [
         'info' => [

From f2a77bb6c647b18b9640a5a9805408c05e2c8f6c Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 20:27:45 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index a906143..de28b95 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -256,7 +256,7 @@ class FenzhenController extends Controller
       $res['data']['end_time'] = date('H:i', $last_time);
       $check_tip = false;
       if ($error_day == -1) {
-        if ($tip_check_show) {
+        if (!!$tip_check_show) {
           $et = $info->appointment_date . ' ' . $res['data']['end_time'] . ':00';
           // $et = '2024-10-10 00:00:00';
           $check_tip = (time() - strtotime($et)) > (60 * 20);

From f59e4c0e1c33a31b6332c57ef4fb999e963c1f2f Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 20:30:19 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/API/H5/FenzhenController.php  |  2 --
 h5/pages/user/fenzhen/fenzhen.vue             | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index de28b95..819a9fb 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -258,9 +258,7 @@ class FenzhenController extends Controller
       if ($error_day == -1) {
         if (!!$tip_check_show) {
           $et = $info->appointment_date . ' ' . $res['data']['end_time'] . ':00';
-          // $et = '2024-10-10 00:00:00';
           $check_tip = (time() - strtotime($et)) > (60 * 20);
-//        $check_tip = json_encode([time() - strtotime($et), 60 * 20], JSON_UNESCAPED_UNICODE);
         }
       }
       return \Yz::Return(true, "获取成功", [
diff --git a/h5/pages/user/fenzhen/fenzhen.vue b/h5/pages/user/fenzhen/fenzhen.vue
index 99d8c67..f025f06 100644
--- a/h5/pages/user/fenzhen/fenzhen.vue
+++ b/h5/pages/user/fenzhen/fenzhen.vue
@@ -29,17 +29,19 @@
 
 	const fenzhen_list = ref(false);
 	const check_tip_show = ref(false);
-	const checkTipShow = () => {
-		check_tip_show.value = true
-		uni.showModal({
-			title: '提示',
-			content: '所有项目已完成，请进行检后签到',
-			showCancel: false,
-			confirmText: '确定',
-			success: function(res) {
+	const checkTipShow = (show) => {
+		if (!!show) {
+			check_tip_show.value = true
+			uni.showModal({
+				title: '提示',
+				content: '所有项目已完成，请进行检后签到',
+				showCancel: false,
+				confirmText: '确定',
+				success: function(res) {
 
-			}
-		});
+				}
+			});
+		}
 	}
 	const getFenzhenList = async (loading = true) => {
 		if (!!loading) {
@@ -52,7 +54,7 @@
 		$response(response, () => {
 			fenzhen_list.value = response.data;
 			if (!check_tip_show.value) {
-				checkTipShow()
+				checkTipShow(response.data.check_tip)
 			}
 			setTimeout(() => {
 				if (!!window.location.href.includes('/pages/user/fenzhen/fenzhen') &&
@@ -270,7 +272,8 @@
 
 								<view class="more_wrapper mt-20rpx" v-if="i.more === fenzhen_active && !!fenzhen_info">
 									<template v-for="(item, index) in fenzhen_info.list" :key="index">
-										<view class="between h-90rpx b-0 b-b-1 b-solid b-#EAEAEA" v-if="item.status == 1">
+										<view class="between h-90rpx b-0 b-b-1 b-solid b-#EAEAEA"
+											v-if="item.status == 1 || item.status == 2">
 											<view class="text-#000000 text-30rpx">{{ item.name }}</view>
 											<view class="center">
 												<text @click="qijian(item)"

From cd47e792a4dd4d990998781e19014dbca42bf6ea Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 20:52:20 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index 819a9fb..447a54f 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -253,7 +253,9 @@ class FenzhenController extends Controller
           }
         }
       }
-      $res['data']['end_time'] = date('H:i', $last_time);
+      if (!$tip_check_show) {
+        $res['data']['end_time'] = date('H:i', $last_time);
+      }
       $check_tip = false;
       if ($error_day == -1) {
         if (!!$tip_check_show) {

From bc6c6122c3399f2ea3a5e2d30eaf19da4f646b07 Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 20:53:34 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index 447a54f..f996eb1 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -254,7 +254,8 @@ class FenzhenController extends Controller
         }
       }
       if (!$tip_check_show) {
-        $res['data']['end_time'] = date('H:i', $last_time);
+//        $res['data']['end_time'] = date('H:i', $last_time);
+        $res['data']['end_time'] = '00:12';
       }
       $check_tip = false;
       if ($error_day == -1) {

From 95a2e909e7ab32a65a868138efb2c6123cf7b65b Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 20:58:12 +0800
Subject: [PATCH 12/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index f996eb1..40d0111 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -253,9 +253,8 @@ class FenzhenController extends Controller
           }
         }
       }
-      if (!$tip_check_show) {
-//        $res['data']['end_time'] = date('H:i', $last_time);
-        $res['data']['end_time'] = '00:12';
+      if (!!$tip_check_show) {
+        $res['data']['end_time'] = date('H:i', $last_time);
       }
       $check_tip = false;
       if ($error_day == -1) {
@@ -272,7 +271,8 @@ class FenzhenController extends Controller
           'check_date' => $info->appointment_date,
           'plan_number' => $info->plan_number,
           'start_time' => $res['data']['start_time'] . ':00',
-          'end_time' => $res['data']['end_time'],
+          // 'end_time' => $res['data']['end_time'],
+          'end_time' => '11:11',
           'yuji_end_time' => $res['data']['yuji_end_time'],
           'yuji_use_time' => $res['data']['yuji_use_time'],
           'use_time' => $res['data']['use_time'],

From bf8b15958604a05ddd82be6741690566831a6b28 Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 20:59:33 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index 40d0111..a6553c6 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -253,8 +253,8 @@ class FenzhenController extends Controller
           }
         }
       }
-      if (!!$tip_check_show) {
-        $res['data']['end_time'] = date('H:i', $last_time);
+      if (!$tip_check_show) {
+//        $res['data']['end_time'] = date('H:i', $last_time);
       }
       $check_tip = false;
       if ($error_day == -1) {
@@ -271,8 +271,7 @@ class FenzhenController extends Controller
           'check_date' => $info->appointment_date,
           'plan_number' => $info->plan_number,
           'start_time' => $res['data']['start_time'] . ':00',
-          // 'end_time' => $res['data']['end_time'],
-          'end_time' => '11:11',
+           'end_time' => $res['data']['end_time'],
           'yuji_end_time' => $res['data']['yuji_end_time'],
           'yuji_use_time' => $res['data']['yuji_use_time'],
           'use_time' => $res['data']['use_time'],

From ad5a27dc9902a2a3c55b8b4c36d5f9d8c0b4ecc1 Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 21:00:54 +0800
Subject: [PATCH 14/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index a6553c6..b5c5abc 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -253,9 +253,6 @@ class FenzhenController extends Controller
           }
         }
       }
-      if (!$tip_check_show) {
-//        $res['data']['end_time'] = date('H:i', $last_time);
-      }
       $check_tip = false;
       if ($error_day == -1) {
         if (!!$tip_check_show) {

From 7ed9e8f13676ee5271f37dc9b893db2a4b560487 Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Wed, 27 Nov 2024 21:01:43 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?=
 =?UTF-8?q?=E5=BC=95=E5=AF=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index b5c5abc..34a9788 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -253,6 +253,9 @@ class FenzhenController extends Controller
           }
         }
       }
+      if (!$tip_check_show) {
+        $res['data']['end_time'] = date('H:i', $last_time);
+      }
       $check_tip = false;
       if ($error_day == -1) {
         if (!!$tip_check_show) {