diff --git a/app.json b/app.json index 31ff0d9..d9ad8de 100644 --- a/app.json +++ b/app.json @@ -25,7 +25,7 @@ "selectedIconPath": "static/img/home1.png", "pagePath": "pages/index/index", "iconSize": 48, - "text": "首页" + "text": "我的花园" }, { "iconPath": "static/img/home.png", diff --git a/pages/add/edit.js b/pages/add/edit.js index 8d32fdc..0dd9f59 100644 --- a/pages/add/edit.js +++ b/pages/add/edit.js @@ -50,7 +50,6 @@ Page({ if(res.errMsg.indexOf("uploadFile:ok") > -1){ const data = JSON.parse(res.data) const id = data.data.file.id - console.log(id); } } }) diff --git a/pages/add/info.js b/pages/add/info.js index 8d315a6..1049aa2 100644 --- a/pages/add/info.js +++ b/pages/add/info.js @@ -75,7 +75,7 @@ Page({ libraryId: this.data.info.id, userId: user.id } - api('/plant/plantByLibrary', 'POST', data, 'json').then(res => { + api('/plant/plantByLibrary', 'GET', data).then(res => { if (res.code === 200) { wx.navigateTo({ url: '../about/index?type=1', diff --git a/pages/add/info.wxml b/pages/add/info.wxml index 9fab3cb..9a1c2ca 100644 --- a/pages/add/info.wxml +++ b/pages/add/info.wxml @@ -8,9 +8,11 @@ - - + + + + diff --git a/pages/index/edit.js b/pages/index/edit.js index 0c4f4ca..eaffa31 100644 --- a/pages/index/edit.js +++ b/pages/index/edit.js @@ -27,8 +27,10 @@ Page({ if (res.code === 200){ const tmp = res.data tmp.farms.suitableFertilizer = tmp.farms.suitableFertilizer.split(',') + if (tmp.ossList.length >0 ){ + tmp.pic = tmp.ossList[0].url + } this.setData({info:res.data}) - console.log(tmp); } }) }, @@ -88,6 +90,7 @@ Page({ icon:'success', title: res.msg, }) + this.fetchInfo() }else { wx.showModal({ content: res.msg diff --git a/pages/index/edit.wxml b/pages/index/edit.wxml index 6348313..f4fa08b 100644 --- a/pages/index/edit.wxml +++ b/pages/index/edit.wxml @@ -6,7 +6,8 @@ - + + diff --git a/pages/index/index.js b/pages/index/index.js index c2a7bd3..d5da919 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -6,7 +6,9 @@ Page({ list:[] }, onLoad(options) { - + wx.setNavigationBarTitle({ + title: '我的花园', + }) }, onShow(){ this.fetchList() @@ -22,7 +24,12 @@ Page({ const data = {userId: user.id,current:1,pageSize:20} api('/plant/getList','POST',data,'json').then(res => { if (res.code === 200){ - const tmps = res.data.list + const tmps = res.data.list.map(e => { + if (e.ossList.length >0){ + e.pic = e.ossList[0].url + } + return e + }) this.setData({list:tmps}) } }) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 43f28e2..be59762 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -17,7 +17,8 @@ - + + {{item.name}} {{item.latinName}} diff --git a/pages/index/info.js b/pages/index/info.js index a1b8e58..6924277 100644 --- a/pages/index/info.js +++ b/pages/index/info.js @@ -7,7 +7,8 @@ Page({ * 页面的初始数据 */ data: { - id:'' + id:'', + farms:[] }, /** @@ -24,13 +25,31 @@ Page({ if (res.code === 200){ const tmp = res.data tmp.farms.suitableFertilizer = tmp.farms.suitableFertilizer.split(',') - this.setData({info:res.data}) + if (tmp.ossList.length >0 ){ + tmp.pic = tmp.ossList[0].url + tmp.picList = tmp.ossList.map(sub => sub.url) + } console.log(tmp); + this.setData({info:res.data}) } }) - api('/plant/todayFarm',data).then(res => { + api('/plant/todayFarm','GET',data).then(res => { if (res.code === 200){ - console.log(res); + this.setData({farms:res.data}) + } + }) + }, + + addFarmLog(e){ + const item = e.currentTarget.dataset.item + const data = {id:item.id,plantId:item.plantId, title:item.title,remark:'测试',status:2} + api('/plant/addRecord','POST',data,'json').then(res => { + if (res.code === 200){ + wx.showToast({ + icon:'success', + title: res.msg, + }) + this.fetchInfo() } }) }, diff --git a/pages/index/info.json b/pages/index/info.json index ced5b27..4d27e19 100644 --- a/pages/index/info.json +++ b/pages/index/info.json @@ -1,4 +1,7 @@ { "navigationStyle": "custom", - "usingComponents": {} + "usingComponents": { + "t-swiper": "tdesign-miniprogram/swiper/swiper", + "t-swiper-nav": "tdesign-miniprogram/swiper-nav/swiper-nav" + } } \ No newline at end of file diff --git a/pages/index/info.wxml b/pages/index/info.wxml index 415747b..bb42bb0 100644 --- a/pages/index/info.wxml +++ b/pages/index/info.wxml @@ -2,13 +2,19 @@ - + + + + + - - + + + + @@ -37,43 +43,18 @@ 今日任务 - + - 浇水 + {{item.title}} 每{{info.farms.wateringCycle}}天一次 - 完成 - - - - - - - - 施肥 - 每{{info.farms.liquidFertilizerCycle}}天一次 - - - - 未完成 - - - - - - - - - 旋转 - 每{{info.farms.rotationCycle}}天一次 - - - - 未完成 + 未完成 + 完成 + 逾期 diff --git a/pages/today/index.js b/pages/today/index.js index 475c248..33bbdc2 100644 --- a/pages/today/index.js +++ b/pages/today/index.js @@ -16,6 +16,9 @@ Page({ */ onLoad(options) { this.init() + wx.setNavigationBarTitle({ + title: '今日农事', + }) }, init(){ @@ -42,11 +45,31 @@ Page({ if (res.code === 200){ const data = res.data if (data !== null){ - this.setData({list:data}) + const tmps = data.map(e => { + if (e.ossList.length > 0){ + e.pic = e.ossList[0].url + } + return e + }) + this.setData({list:tmps}) } } }) }, + + addFarmLog(e){ + const item = e.currentTarget.dataset.item + const data = {id:item.id,plantId:item.plantId, title:item.title,remark:'测试',status:2} + api('/plant/addRecord','POST',data,'json').then(res => { + if (res.code === 200){ + wx.showToast({ + icon:'success', + title: res.msg, + }) + this.fetchInfo() + } + }) + }, /** * 生命周期函数--监听页面隐藏 */ diff --git a/pages/today/index.wxml b/pages/today/index.wxml index 7522869..8d6fa43 100644 --- a/pages/today/index.wxml +++ b/pages/today/index.wxml @@ -1,13 +1,41 @@ - + - 已完成所有任务 + 已完成所有任务 今天暂无农事需要完成 + + + 今日任务 + + + + + + + {{sub.title}} + + + + {{item.name}} + + + 未完成 + 完成 + 逾期 + + + + + + + + + \ No newline at end of file diff --git a/pages/today/index.wxss b/pages/today/index.wxss index 6896fbd..f0fcf96 100644 --- a/pages/today/index.wxss +++ b/pages/today/index.wxss @@ -1,4 +1,8 @@ /* pages/today/index.wxss */ +page { + background-color: #F6F6F6; +} + .empty { width: 140rpx; height: 140rpx; @@ -6,4 +10,15 @@ border-radius: 140rpx; background-image: url("https://res.catter.cn/pub/2025/09/30/20250930143142508.png"); background-size: cover; +} + +.pic{ + width: 100rpx; + height: 100rpx; + border-radius: 16rpx; +} + +.action { + + } \ No newline at end of file