From 7acb4868611c5c3a499b49281bede37f55ba97dd Mon Sep 17 00:00:00 2001
From: sdaduanbilei <sdaduanbilei@163.com>
Date: Fri, 9 Jan 2026 14:17:05 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BB=BB=E5=8A=A1=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/garden/info.js   | 9 ++++++---
 pages/garden/info.wxml | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pages/garden/info.js b/pages/garden/info.js
index 1ef48e9..6d1e652 100644
--- a/pages/garden/info.js
+++ b/pages/garden/info.js
@@ -44,9 +44,10 @@ Page({
         }
       
         tmp.carePlans.map(e => {
-          console.log(e.id);
           const item = tmp.todayCares.find(sub => sub.careId === e.id)
-          e.status = item? item.status:2
+          console.log(item);
+          e.status = item ? item.status:2
+          e.todayCareId = item.id
           return e
 
         })
@@ -85,13 +86,15 @@ Page({
 
   make(e){
     const item = e.currentTarget.dataset.item
+    console.log(item);
     if (item.status === 2){
       wx.showModal({
         content: '已完成',
       })
       return
     }
-    const data = {id:item.id,plantId:item.plantId,  name:item.name,remark:'测试',status:2}
+    const data = {id:item.todayCareId,plantId:item.plantId,  name:item.name,remark:item.name,status: 2}
+    console.log(data);
     api('/plant/makeCare','POST',data,'json').then(res => {
       if (res.code === 200){
         wx.showToast({
diff --git a/pages/garden/info.wxml b/pages/garden/info.wxml
index f7e7cd7..afa458b 100644
--- a/pages/garden/info.wxml
+++ b/pages/garden/info.wxml
@@ -62,6 +62,9 @@
                     </view>
                     <view class="mt-16">{{item.name}}</view>
                     <view class="mt-16 font-12 grey">每{{item.period}}天一次</view>
+                    <view wx:if="{{item.status === 1}}">
+                      <view class="mt-16 font-12 primary">立即完成</view>
+                    </view>
                     <view wx:if="{{item.status === 2}}">
                       <view class="mt-16 font-12 primary">已完成</view>
                     </view>