app.json

@@ -9,13 +9,7 @@
     "pages/index/edit",
     "pages/about/index",
     "pages/today/index",
-<<<<<<< HEAD
-    "pages/garden/index",
-    "pages/community/index",
-    "pages/log/index"
-=======
     "pages/preview/index"
->>>>>>> 79b1af6bb6953ca3f3001c51e08e8b42220a57bb
   ],
   "window": {
     "navigationBarTextStyle": "black",
@@ -32,35 +26,14 @@
         "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": "今日农事"
       }
     ]
   },

pages/add/index.js

@@ -6,7 +6,6 @@ Page({
    * 页面的初始数据
    */
   data: {
-    key:'',
     timer:null,
     list:[],
     hotList:[
@@ -41,10 +40,9 @@ Page({
     const key = e.detail.value
     this.data.timer = setTimeout(() => {
       if (key.length === 0){
-        this.setData({list:[],key:''})
+        this.setData({list:[]})
         return
       }
-      this.setData({key:key})
       this.fetchList(key)
 
     }, 500)
@@ -61,51 +59,6 @@ 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

pages/add/index.wxml

@@ -3,7 +3,7 @@
   <view class="padding">
     <t-search placeholder="请输入植物名称..." shape="round" bind:change="search" />
   </view>
-  <view wx:if="{{list.length === 0 && key.length === 0}}">
+  <view wx:if="{{list.length === 0}}">
     <view class="font-14 bold padding">热门植物</view>
     <view>
       <view class="grid">
@@ -18,7 +18,7 @@
   </view>
   <!-- 搜索列表 -->
   <view>
-    <scroll-view scroll-y="{{true}}" wx:if="{{list.length > 0}}">
+    <scroll-view scroll-y="{{true}}">
       <view wx:for="{{list}}">
         <view class=" flex flex-center flex-justify-start" style="padding: 16rpx 32rpx;"  data-id="{{item.id}}" bind:tap="goInfo">
           <image class="pic1" mode="aspectFill" src="{{item.oss.url}}"></image>
@@ -29,10 +29,5 @@
         </view>
       </view>
     </scroll-view>
-    <view wx:if="{{list.length === 0 && key.length > 0}}">
-      <view class="full-width flex flex-center" style="margin-top: 96rpx;">
-        <t-button theme="primary" shape="round" style="width: 60%;" variant="outline" bind:tap="addPlant" >通过 植趣AI 搜索</t-button>
-      </view>
-    </view>
   </view>
 </view>

pages/community/index.js

@@ -1,66 +0,0 @@
-// pages/community/index.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/community/index.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/community/index.wxml

@@ -1,2 +0,0 @@
-<!--pages/community/index.wxml-->
-<text>pages/community/index.wxml</text>

pages/community/index.wxss

@@ -1 +0,0 @@
-/* pages/community/index.wxss */

pages/garden/index.js

@@ -1,66 +0,0 @@
-// pages/garden/index.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/garden/index.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/garden/index.wxml

@@ -1,2 +0,0 @@
-<!--pages/garden/index.wxml-->
-<text>pages/garden/index.wxml</text>

pages/garden/index.wxss

@@ -1 +0,0 @@
-/* pages/garden/index.wxss */

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 不会撑满父容器 */

pages/log/index.js

@@ -1,66 +0,0 @@
-// pages/log/index.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/log/index.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/log/index.wxml

@@ -1,2 +0,0 @@
-<!--pages/log/index.wxml-->
-<text>pages/log/index.wxml</text>

pages/log/index.wxss

@@ -1 +0,0 @@
-/* pages/log/index.wxss */