From 6090085741be7032bd5fe5f6d0cda4b02964d5ec Mon Sep 17 00:00:00 2001 From: wt Date: Tue, 30 Sep 2025 16:01:37 +0800 Subject: [PATCH] fix --- app.json | 3 +- app.wxss | 3 +- pages/add/edit.js | 13 +++++- pages/add/edit.wxml | 18 ++------- pages/add/index.js | 12 ++++-- pages/add/index.json | 4 +- pages/add/index.wxml | 32 +++++++-------- pages/add/index.wxss | 33 +++++++++++++-- pages/add/info.js | 70 ++++++++++++++++++++++++++++++++ pages/add/info.json | 7 ++++ pages/add/info.wxml | 91 ++++++++++++++++++++++++++++++++++++++++++ pages/add/info.wxss | 15 +++++++ pages/index/index.wxml | 17 +++++--- pages/index/index.wxss | 7 ++++ 14 files changed, 276 insertions(+), 49 deletions(-) create mode 100644 pages/add/info.js create mode 100644 pages/add/info.json create mode 100644 pages/add/info.wxml create mode 100644 pages/add/info.wxss diff --git a/app.json b/app.json index a611078..1562836 100644 --- a/app.json +++ b/app.json @@ -3,7 +3,8 @@ "pages/index/index", "pages/add/index", "pages/add/edit", - "pages/login/index" + "pages/login/index", + "pages/add/info" ], "window": { "navigationBarTextStyle": "black", diff --git a/app.wxss b/app.wxss index 5352222..a69bbf2 100644 --- a/app.wxss +++ b/app.wxss @@ -3,7 +3,8 @@ page { --td-brand-color: #4FAB5F; --td-brand-color-active: #4FAB5F; color: #373737; - background: white + background: white; + } .container { diff --git a/pages/add/edit.js b/pages/add/edit.js index f9c1a3b..8d32fdc 100644 --- a/pages/add/edit.js +++ b/pages/add/edit.js @@ -7,6 +7,11 @@ Page({ * 页面的初始数据 */ data: { + page:{ + current:1, + pageSize:10 + }, + tmpList:[], fileList:[], form:{ name:'', @@ -22,8 +27,12 @@ Page({ }, fetchList(){ - api('/farmTemplate/list','POST').then(res => { - console.log(res); + const data = {...this.data.page} + api('/farmTemplate/list','POST',data,'json').then(res => { + if (res.code === 200){ + const tmps = res.data.list + this.setData({tmpList:tmps}) + } }) }, diff --git a/pages/add/edit.wxml b/pages/add/edit.wxml index 02bb52f..45fadc9 100644 --- a/pages/add/edit.wxml +++ b/pages/add/edit.wxml @@ -3,8 +3,8 @@ - - 什么时候施肥（可选） + + 什么时候{{item.Name}}（可选） @@ -14,19 +14,7 @@ - - - 何时进行修建（可选） - - - - - - - - - - + 上传花的照片（必填） diff --git a/pages/add/index.js b/pages/add/index.js index 358e441..1f533e6 100644 --- a/pages/add/index.js +++ b/pages/add/index.js @@ -6,7 +6,11 @@ Page({ * 页面的初始数据 */ data: { - + list:[ + {url:'https://res.catter.cn/pub/2025/09/30/20250930143920286.png',name:'金鱼吊兰'}, + {url:'https://res.catter.cn/pub/2025/09/30/20250930145312611.png',name:'月季'}, + {url:'https://res.catter.cn/pub/2025/09/30/20250930150006852.png',name:'多肉'} + ] }, /** @@ -16,9 +20,11 @@ Page({ }, - goEdit(){ + + + goInfo(){ wx.navigateTo({ - url: '../add/edit', + url: '../add/info', }) } }) \ No newline at end of file diff --git a/pages/add/index.json b/pages/add/index.json index 5e91e98..018a964 100644 --- a/pages/add/index.json +++ b/pages/add/index.json @@ -1,4 +1,6 @@ { "navigationBarTitleText": "添加", - "usingComponents": {} + "usingComponents": { + "t-search": "tdesign-miniprogram/search/search" + } } \ No newline at end of file diff --git a/pages/add/index.wxml b/pages/add/index.wxml index cee9f94..8f2b776 100644 --- a/pages/add/index.wxml +++ b/pages/add/index.wxml @@ -1,22 +1,20 @@ - - - - - - - - - 植物 - 添加新植物，科学的进行种植！ + + \ No newline at end of file diff --git a/pages/add/index.wxss b/pages/add/index.wxss index 45fd381..53d5fc8 100644 --- a/pages/add/index.wxss +++ b/pages/add/index.wxss @@ -1,11 +1,10 @@ /* pages/add/index.wxss */ .card { - width: 95vw; - height: 50vw; + margin: 16rpx; - border: #DAE2FD 1rpx solid; border-radius: 16rpx; background-color: #F6F8FE; + } .bg { @@ -13,4 +12,32 @@ height: 100rpx; background-color:#A4B7FA ; border-radius: 100rpx; +} + +.grid { + width: 100vw; + display: grid; + grid-template-columns: 1fr 1fr; /* 两列等分 */ + gap: 32rpx; /* 图片间隔 */ + box-sizing: border-box; + padding: 16rpx; +} + +.item { + position: relative; + width: 100%; + padding-top: 75%; /* 高宽比 = 4:3，可以改成 100% 就是正方形 */ + overflow: hidden; + +} + +.pic { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + object-fit: cover; /* 小程序等效是 mode="aspectFill" */ + border-top-left-radius: 16rpx; + border-top-right-radius: 16rpx; } \ No newline at end of file diff --git a/pages/add/info.js b/pages/add/info.js new file mode 100644 index 0000000..bbbe7b7 --- /dev/null +++ b/pages/add/info.js @@ -0,0 +1,70 @@ +// pages/add/info.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + goBack(){ + wx.navigateBack() + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/add/info.json b/pages/add/info.json new file mode 100644 index 0000000..76db9e1 --- /dev/null +++ b/pages/add/info.json @@ -0,0 +1,7 @@ +{ + "navigationStyle": "custom", + "usingComponents": { + "t-avatar": "tdesign-miniprogram/avatar/avatar", + "t-tag": "tdesign-miniprogram/tag/tag" + } +} \ No newline at end of file diff --git a/pages/add/info.wxml b/pages/add/info.wxml new file mode 100644 index 0000000..ceed698 --- /dev/null +++ b/pages/add/info.wxml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + 多肉 + 石榴属 + + + + + + 多肉植物也叫多水植物、肉质植物，是指植物器官的茎或叶或根具有发达的薄壁组织用以贮藏水分，在外形上显得肥厚多汁的一类植物 + + + + + + 浇水 + + + 每7天一次 + + + + + 施肥 + + + + 每1月一次 + 液体肥料 + + + + + + 每1月一次 + 缓释肥 + + + 推荐肥料 + + + 树木、灌木专用肥料 + 通用型植物肥料 + + + + + + + 修剪 + + + 每7天一次 + + + + + 光照 + + + 喜阳、全日照 + + 多肉 喜阳，最好每天晒够6小时 + + + + + + 获取养护日程 + 立即拥有 + + + \ No newline at end of file diff --git a/pages/add/info.wxss b/pages/add/info.wxss new file mode 100644 index 0000000..3ada709 --- /dev/null +++ b/pages/add/info.wxss @@ -0,0 +1,15 @@ +/* pages/add/info.wxss */ +page { + background-color: #F6F6F6; +} + + +.bottom { + position: fixed; + bottom: 0; + right: 0; + left: 0; + padding-top: 16rpx; + padding-bottom: 32rpx; + background-color: white; +} \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml index d7127ee..4243765 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,14 +1,19 @@ - - + + - + - 添加花盆 - 您还没有添加任何花盆 + 暂无植物 + 您还没有添加任何植物 + + + 添加您的第一颗植物 - + + 您添加的植物将全部显示在这里 + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index c37b0ed..768b294 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -5,4 +5,11 @@ height: 140rpx; background-color:#F6F6F6 ; border-radius: 140rpx; + background-image: url("https://res.catter.cn/pub/2025/09/30/20250930143142508.png"); + background-size: cover; +} + +.bottom{ + position: fixed; + bottom: 68rpx; } \ No newline at end of file