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] =?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)"