diff --git a/app.json b/app.json
index 9d49623..ec0e043 100644
--- a/app.json
+++ b/app.json
@@ -8,7 +8,10 @@
"pages/index/info",
"pages/index/edit",
"pages/about/index",
- "pages/today/index"
+ "pages/today/index",
+ "pages/garden/index",
+ "pages/community/index",
+ "pages/log/index"
],
"window": {
"navigationBarTextStyle": "black",
@@ -25,14 +28,35 @@
"selectedIconPath": "static/img/home1.png",
"pagePath": "pages/index/index",
"iconSize": 48,
- "text": "我的花园"
+ "text": "首页"
+ },
+ {
+ "iconPath": "static/img/home.png",
+ "selectedIconPath": "static/img/home1.png",
+ "pagePath": "pages/garden/index",
+ "iconSize": 48,
+ "text": "花园"
+ },
+ {
+ "iconPath": "static/img/home.png",
+ "selectedIconPath": "static/img/home1.png",
+ "pagePath": "pages/community/index",
+ "iconSize": 48,
+ "text": "社区"
+ },
+ {
+ "iconPath": "static/img/home.png",
+ "selectedIconPath": "static/img/home1.png",
+ "pagePath": "pages/log/index",
+ "iconSize": 48,
+ "text": "日志"
},
{
"iconPath": "static/img/clock.png",
"selectedIconPath": "static/img/clock1.png",
"pagePath": "pages/today/index",
"iconSize": 48,
- "text": "今日农事"
+ "text": "我的"
}
]
},
diff --git a/pages/add/index.js b/pages/add/index.js
index c3165c2..9b91207 100644
--- a/pages/add/index.js
+++ b/pages/add/index.js
@@ -6,6 +6,7 @@ Page({
* 页面的初始数据
*/
data: {
+ key:'',
timer:null,
list:[],
hotList:[
@@ -40,9 +41,10 @@ Page({
const key = e.detail.value
this.data.timer = setTimeout(() => {
if (key.length === 0){
- this.setData({list:[]})
+ this.setData({list:[],key:''})
return
}
+ this.setData({key:key})
this.fetchList(key)
}, 500)
@@ -59,6 +61,51 @@ Page({
})
},
+ addPlant(){
+ var data = {
+ "aliases": "",
+ "farms": [
+ {
+ "cycleDays": 0,
+ "desc": "",
+ "name": ""
+ }
+ ],
+ "flowerDiameter": 0,
+ "floweringColor": "",
+ "floweringPeriod": "",
+ "floweringShape": "",
+ "foliageColor": "",
+ "foliageShape": "",
+ "foliageType": "",
+ "genus": "",
+ "GrowthHabit": "",
+ "hardyTempMax": 0,
+ "hardyTempMin": 0,
+ "height": 0,
+ "latinName": "",
+ "lifeCycle": "",
+ "lightIntensity": "",
+ "lightType": "",
+ "name": "",
+ "optimalTempMax": 0,
+ "optimalTempMin": 0,
+ "ossIds": [
+ "9b8efb93-af19-11f0-997e-bc2411e64a23"
+ ],
+ "pestsDiseases": "",
+ "tag": ""
+ }
+ data.name = this.data.key
+ api('/plant/plant','POST',data,'json').then(res => {
+ if(res.code === 200){
+ console.log(res.data);
+ }else {
+ wx.showModal({
+ content: res.msg})
+ }
+ })
+ },
goInfo(e){
const id = e.currentTarget.dataset.id
diff --git a/pages/add/index.wxml b/pages/add/index.wxml
index 421eda8..06b5267 100644
--- a/pages/add/index.wxml
+++ b/pages/add/index.wxml
@@ -3,7 +3,7 @@
-
+
热门植物
@@ -18,7 +18,7 @@
-
+
@@ -29,5 +29,10 @@
+
+
+ 通过 植趣AI 搜索
+
+
\ No newline at end of file
diff --git a/pages/community/index.js b/pages/community/index.js
new file mode 100644
index 0000000..5cc5f38
--- /dev/null
+++ b/pages/community/index.js
@@ -0,0 +1,66 @@
+// pages/community/index.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/community/index.json b/pages/community/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/community/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/community/index.wxml b/pages/community/index.wxml
new file mode 100644
index 0000000..07eab56
--- /dev/null
+++ b/pages/community/index.wxml
@@ -0,0 +1,2 @@
+
+pages/community/index.wxml
\ No newline at end of file
diff --git a/pages/community/index.wxss b/pages/community/index.wxss
new file mode 100644
index 0000000..1ed1d29
--- /dev/null
+++ b/pages/community/index.wxss
@@ -0,0 +1 @@
+/* pages/community/index.wxss */
\ No newline at end of file
diff --git a/pages/garden/index.js b/pages/garden/index.js
new file mode 100644
index 0000000..80c987b
--- /dev/null
+++ b/pages/garden/index.js
@@ -0,0 +1,66 @@
+// pages/garden/index.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/garden/index.json b/pages/garden/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/garden/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/garden/index.wxml b/pages/garden/index.wxml
new file mode 100644
index 0000000..c542b3c
--- /dev/null
+++ b/pages/garden/index.wxml
@@ -0,0 +1,2 @@
+
+pages/garden/index.wxml
\ No newline at end of file
diff --git a/pages/garden/index.wxss b/pages/garden/index.wxss
new file mode 100644
index 0000000..fd9e485
--- /dev/null
+++ b/pages/garden/index.wxss
@@ -0,0 +1 @@
+/* pages/garden/index.wxss */
\ No newline at end of file
diff --git a/pages/index/edit.wxss b/pages/index/edit.wxss
index a78f93b..650e30d 100644
--- a/pages/index/edit.wxss
+++ b/pages/index/edit.wxss
@@ -16,7 +16,7 @@ page {
.bg {
width: 100%;
height: 100%;
- background-color: rebeccapurple;
+
border-radius: 16rpx;
z-index: 1;
display: block; /* 必须加,否则 image 不会撑满父容器 */
diff --git a/pages/log/index.js b/pages/log/index.js
new file mode 100644
index 0000000..5069daa
--- /dev/null
+++ b/pages/log/index.js
@@ -0,0 +1,66 @@
+// pages/log/index.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/log/index.json b/pages/log/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/log/index.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/log/index.wxml b/pages/log/index.wxml
new file mode 100644
index 0000000..afd514f
--- /dev/null
+++ b/pages/log/index.wxml
@@ -0,0 +1,2 @@
+
+pages/log/index.wxml
\ No newline at end of file
diff --git a/pages/log/index.wxss b/pages/log/index.wxss
new file mode 100644
index 0000000..4c9622a
--- /dev/null
+++ b/pages/log/index.wxss
@@ -0,0 +1 @@
+/* pages/log/index.wxss */
\ No newline at end of file