From e79e15bb296a06f7b1ec0e1e7366d49aff2582d3 Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Tue, 29 Oct 2024 14:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8B=20=E6=8A=A5=E5=91=8A=E8=A7=A3=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 8 +++++---
 h5/pages/user/fenzhen/fenzhen.vue                         | 7 ++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
index 332a128..78d7656 100644
--- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
+++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php
@@ -93,12 +93,14 @@ class FenzhenController extends Controller
       //  1 时间已到 可以预约 报告解读
       //  2 已经预约 报告解读
       $check_report_status = -1;
+      // $now_time = time();
+      $now_time = strtotime('2024-11-07 00:00:00');
       if (!!$res['data']['report']) {
         $report_time = strtotime($res['data']['report'] . ' 00:00:00') + (60 * 60 * 24 * $report_day);
         $report_time_show = date('m月d日',  $report_time);
         $report_status = false;
         // 这里补充 获取 出具报告 时间的逻辑
-        if ($report_time < time()) {
+        if ($report_time < $now_time) {
           $report_status = true;
         }
         if (!$report_status) {
@@ -124,7 +126,7 @@ class FenzhenController extends Controller
         $check_report_status = 0;
         // $check_report_status = '2024年10月11日';
         // 这里补充 获取 报告解读 时间的逻辑
-        if ($check_report_time < time()) {
+        if ($check_report_time < $now_time) {
           if (!!$info->person_id) {
             $user_info = DB::table('web_user_person')->where(['id' => $info->person_id])->first();
             if (!!$user_info) {
@@ -204,7 +206,7 @@ class FenzhenController extends Controller
           'code' => $info->appointment_number,
         ],
         'list' => $time_line,
-        'report' => $check_report_status
+        'report' => $check_report_status,
       ]);
     } else {
       return \Yz::Return(true, "获取成功", [
diff --git a/h5/pages/user/fenzhen/fenzhen.vue b/h5/pages/user/fenzhen/fenzhen.vue
index 105f814..1956610 100644
--- a/h5/pages/user/fenzhen/fenzhen.vue
+++ b/h5/pages/user/fenzhen/fenzhen.vue
@@ -187,11 +187,8 @@
 							</view>
 						</view>
 					</view>
-					<view v-if="fenzhen_list.report !== -1" class="report_wrapper">
-						<view v-if="fenzhen_list.report !== 0 && fenzhen_list.report !== 1" class="report_tip_wrapper">
-							已预约 {{ fenzhen_list.report }} 报告解读
-						</view>
-						<view v-else-if="fenzhen_list.report === 1" @click="toReport()" class="report_button_wrapper">
+					<view class="report_wrapper">
+						<view v-if="fenzhen_list.report === 1" @click="toReport()" class="report_button_wrapper">
 							预约解读
 						</view>
 					</view>