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 @@
{{item.name}}
每{{item.period}}天一次
+
+ 立即完成
+
已完成