diff --git a/src/components/CropPopup.vue b/src/components/CropPopup.vue
index 289242d..e4e5c23 100644
--- a/src/components/CropPopup.vue
+++ b/src/components/CropPopup.vue
@@ -5,6 +5,7 @@
     :safe-area-inset-bottom="true"
     :close-on-click-modal="true"
     custom-style="border-radius: 32rpx 32rpx 0 0; padding: 40rpx 32rpx"
+    @close="handeClosePopup"
   >
     <view class="mb-5 text-center text-base text-gray-700 font-semibold">
       {{ patchStore.cropApiType === 'ADD' ? '新增作物' : '编辑作物' }}
@@ -59,7 +60,7 @@
     </view>
 
     <wd-datetime-picker
-        :model-value="new Date(patchStore.recordForm.date).getTime()"
+        :model-value="new Date(patchStore.cropForm.date).getTime()"
         v-model:visible="showTimePicker"
         type="date"
         :max-date="Date.now()"
@@ -77,14 +78,21 @@ import { formatDate } from "@/utils";
 const patchStore = usePatchStore()
 const showTimePicker = ref(false)
 
-
 function onDateConfirm({ value }){
-  patchStore.recordForm.date = formatDate(new Date(value))
+  patchStore.cropForm.date = formatDate(new Date(value))
   showTimePicker.value = false
 }
 
+function handeClosePopup() {
+  setTimeout(() => {
+    patchStore.showPatchFab = true
+    patchStore.showRecordFab = true
+  }, 300)
+}
+
 function cancelClick() {
-  patchStore.showRecordPopup = false
+  patchStore.showCropPopup = false
+  handeClosePopup()
 }
 
 async function deleteClick() {
@@ -112,13 +120,16 @@ async function saveClick() {
   if (patchStore.cropApiType === 'ADD') {
     await patchStore.addCropApi()
     await patchStore.queryPatch(patchStore.currentPatch.id)
+    await patchStore.queryPatchList()
     uni.showToast({ title: '新增作物成功', icon: 'none' })
   } else if (patchStore.cropApiType === 'UPDATE') {
     await patchStore.updateCropApi(patchStore.cropForm.id)
     await patchStore.queryPatch(patchStore.currentPatch.id)
+    await patchStore.queryPatchList()
     uni.showToast({ title: '更新作物成功', icon: 'none' })
   }
 
   patchStore.showCropPopup = false
+  handeClosePopup()
 }
 </script>
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index f3072ca..77580de 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -15,10 +15,14 @@
 
     <view class="p-3">
       <wd-search v-model="patchStore.patchSearch"
-                 :maxlength="20" :placeholder-left="true" :hide-cancel="true"
+                 :maxlength="20" :placeholder-left="true"
                  placeholder="请输入菜地名称或者菜地地点"
                  @change="patchStore.queryPatchList()"
-                 @clear="patchStore.queryPatchList()"/>
+                 @clear="patchStore.queryPatchList()">
+        <template #suffix>
+          <wd-button type="primary" icon="refresh" round @click="patchStore.queryPatchList()"/>
+        </template>
+      </wd-search>
     </view>
 
     <wd-card v-for="(item, index) in patchStore.patchList" :key="item.id">
@@ -38,7 +42,7 @@
 
       <template #footer>
         <view class="flex-1 flex justify-between items-center">
-          <view v-if="item.crop" class="flex flex-col gap-1">
+          <view v-if="item.crop" class="flex flex-col gap-1" @click="updateCropClick(item)">
             <view class="text-base font-medium">
               {{ item.crop.name }}
               <text class="text-sm text-gray-400 font-normal ml-1">{{ item.crop.variety }}</text>
@@ -65,6 +69,7 @@
     </liu-drag-button>
 
     <patch-popup />
+    <crop-popup />
     <view class="h-[10px]"></view>
   </view>
 </template>
@@ -74,8 +79,9 @@ import { computed } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
 import appLogo from '@/static/logo.png'
 import { usePatchStore } from "@/stores/patch";
-import type {ICrop, IPatch} from "@/types";
+import type { ICrop, IPatch } from "@/types";
 import PatchPopup from "@/components/PatchPopup.vue";
+import CropPopup from "@/components/CropPopup.vue";
 
 defineOptions({ name: 'Home' })
 
@@ -144,4 +150,12 @@ function handlePreview(crop: ICrop) {
   const fullUrls = crop.images?.map(url => `${patchStore.baseUrl}/${url}`) as string[]
   uni.previewImage({ urls: fullUrls, current: fullUrls[0] })
 }
+
+function updateCropClick(patch: IPatch) {
+  patchStore.currentPatch = patch
+  patchStore.showPatchFab = false
+  patchStore.cropForm = JSON.parse(JSON.stringify(patch.crop))
+  patchStore.cropApiType = 'UPDATE'
+  patchStore.showCropPopup = true
+}
 </script>
diff --git a/src/pages/record/index.vue b/src/pages/record/index.vue
index 11c0ed8..0293e9b 100644
--- a/src/pages/record/index.vue
+++ b/src/pages/record/index.vue
@@ -1 +1 @@
-<template>
  <view class="min-h-screen flex flex-col" style="background-image: linear-gradient(180deg, #4CAF50 0%, #8BC34A 42%, #E8F5E9 100%)">
    <view class="self-center py-3 flex items-center gap-2 w-full">
      <view class="grid grid-cols-3 items-center w-full">
        <view></view>

        <view v-if="patchStore.currentPatch.crop" @click="updateCropClick" class="flex flex-col">
          <text class="text-center text-lg text-white font-semibold truncate">
            {{ patchStore.currentPatch.crop.name }}
          </text>
          <text v-if="patchStore.currentPatch.crop.variety" class="text-center text-sm text-white/70 truncate">
            {{ patchStore.currentPatch.crop.variety }}
          </text>
        </view>

        <view v-else class="self-center py-3">
          <wd-button type="info" @click="addCropClick">点击添加作物</wd-button>
        </view>

        <view class="flex justify-end">
          <wd-button icon="list" type="info" round @click="showHistoryClick"></wd-button>
        </view>
      </view>
    </view>

    <view class="px-4">
      <view
          v-for="(item, index) in patchStore.recordList"
          :key="item.id"
          class="flex"
      >
        <!-- 时间轴 -->
        <view class="flex flex-col items-center mr-2">
          <view class="w-20 h-20 rounded-full bg-gray-300"/>
          <view v-if="index !== patchStore.recordList.length - 1" class="flex-1 w-[2px] bg-gray-200"/>
        </view>

        <view class="flex-1 pb-4">
          <wd-card>
            <template #title>
              <view class="w-full flex flex-col gap-1.5" @click="updateRecordClick(item)">
                <view class="flex justify-between items-center">
                  <view class="text-base font-medium">
                    {{ item.type }}
                  </view>
                  <wd-tag type="primary" round>
                    {{ item.stage }}
                  </wd-tag>
                  <view class="text-xs text-gray-400">
                    {{ item.date }}
                  </view>
                </view>
              </view>
            </template>

            <view class="flex flex-col gap-2">
              <view
                  v-if="item.images.length"
                  :class="`grid gap-2 mt-2 ${gridCols(item.images.length)}`"
              >
                <view
                    v-for="(url, i) in item.images"
                    :key="i"
                    class="w-full rounded-lg overflow-hidden"
                    @click="previewImages(item.images, i)"
                >
                  <wd-img
                      :src="`${patchStore.baseUrl}/${url}`"
                      width="100%"
                      mode="widthFix"
                      lazy-load
                      :radius="8"
                  />
                </view>
              </view>

              <view v-if="item.videos.length" class="mt-2">
                <view
                    v-for="(url, i) in item.videos"
                    :key="i"
                    class="relative w-full overflow-hidden rounded-lg bg-black"
                    @click="playVideo(url)"
                >
                  <view class="h-[360rpx] flex items-center justify-center">
                    <wd-icon
                        name="play-circle-fill"
                        size="40px"
                        color="#fff"
                    />
                  </view>
                </view>
              </view>

              <text class="text-sm text-gray-500">
                {{ item.content }}
              </text>
            </view>
          </wd-card>
        </view>
      </view>
    </view>

    <wd-empty v-if="patchStore.recordList.length === 0" tip="暂无数据"/>

    <wd-picker v-model="value" v-model:visible="showHistory" :columns="columns" />

    <liu-drag-button v-if="patchStore.showRecordFab && patchStore.currentPatch.crop"
                     background="#22c55e" @clickBtn="addRecordClick">
      <wd-icon name="plus" size="24px"></wd-icon>
    </liu-drag-button>

    <record-popup />
    <crop-popup />
    <view class="h-[10px]"></view>
  </view>
</template>

<script setup lang="ts">
import {computed, ref} from 'vue'
import { usePatchStore } from "@/stores/patch";
import RecordPopup from "@/components/RecordPopup.vue";
import type { IRecord } from "@/types";
import { formatDate } from "@/utils";
import CropPopup from "@/components/CropPopup.vue";

const showHistory = ref(false)
const value = ref<string[]>([])
const columns = ref([
  { label: '选项1', value: '1' },
  { label: '选项2', value: '2' },
  { label: '选项3', value: '3' }
])

const patchStore = usePatchStore()

function gridCols(count: number): string {
  if (count === 1) return 'grid-cols-1'
  if (count === 2) return 'grid-cols-2'
  if (count === 4) return 'grid-cols-2'
  return 'grid-cols-3'
}

function previewImages(urls: string[], index: number) {
  const fullUrls = urls.map(url => `${patchStore.baseUrl}/${url}`)
  uni.previewImage({ urls: fullUrls, current: fullUrls[index] })
}

function playVideo(url: string) {
  const fullUrl = `${patchStore.baseUrl}/${url}`
  wx.previewMedia({
    sources: [{ url: fullUrl, type: 'video' }],
    current: 0,
    fail: (err) => {
      console.error(err)
      uni.showToast({ title: '视频预览失败', icon: 'none' })
    }
  })
}

function addCropClick() {
  patchStore.cropForm = {
    id: 0,
    patch_id: patchStore.currentPatch.id,
    name: '',
    variety: '',
    date: formatDate(Date.now()),
  }
  patchStore.cropApiType = 'ADD'
  patchStore.showCropPopup = true
}

function updateCropClick() {
  patchStore.cropForm = JSON.parse(JSON.stringify(patchStore.currentPatch.crop))
  patchStore.cropApiType = 'UPDATE'
  patchStore.showCropPopup = true
}

function addRecordClick() {
  patchStore.recordForm = {
    id: 0,
    crop_id: patchStore.currentPatch.crop.id,
    type: '💧 浇水',
    date: formatDate(Date.now()),
    content: '',
    images: [],
    videos: [],
    stage: '生长期'
  }
  patchStore.imageFileList = []
  patchStore.videoFileList = []
  patchStore.recordApiType = 'ADD'
  patchStore.showRecordPopup = true
  patchStore.showRecordFab = false
}

function updateRecordClick(record: IRecord) {
  patchStore.recordForm = JSON.parse(JSON.stringify(record))

  patchStore.imageFileList = []
  patchStore.recordForm.images.forEach(image => {
    patchStore.imageFileList.push({
      url: `${patchStore.baseUrl}/${image}`,
    })
  })

  patchStore.videoFileList = []
  patchStore.recordForm.videos.forEach(video => {
    patchStore.videoFileList.push({
      url: `${patchStore.baseUrl}/${video}`,
    })
  })

  patchStore.recordApiType = 'UPDATE'
  patchStore.showRecordPopup = true
  patchStore.showRecordFab = false
}

function showHistoryClick() {
  // showHistory.value = true
  uni.showToast({ title: '查看历史作物，正在开发', icon: 'none' })
}
</script>
\ No newline at end of file
+<template>
  <view class="min-h-screen flex flex-col" style="background-image: linear-gradient(180deg, #4CAF50 0%, #8BC34A 42%, #E8F5E9 100%)">
    <view class="self-center py-3 flex items-center gap-2 w-full">
      <view class="grid grid-cols-3 items-center w-full">
        <view></view>

        <view v-if="patchStore.currentPatch.crop" @click="updateCropClick" class="flex flex-col">
          <text class="text-center text-lg text-white font-semibold truncate">
            {{ patchStore.currentPatch.crop.name }}
          </text>
          <text v-if="patchStore.currentPatch.crop.variety" class="text-center text-sm text-white/70 truncate">
            {{ patchStore.currentPatch.crop.variety }}
          </text>
        </view>

        <view v-else class="self-center py-3">
          <wd-button type="info" @click="addCropClick">点击添加作物</wd-button>
        </view>

        <view class="flex justify-end">
          <wd-button icon="list" type="info" round @click="showHistoryClick"></wd-button>
        </view>
      </view>
    </view>

    <view class="px-4">
      <view
          v-for="(item, index) in patchStore.recordList"
          :key="item.id"
          class="flex"
      >
        <!-- 时间轴 -->
        <view class="flex flex-col items-center mr-2">
          <view class="w-20 h-20 rounded-full bg-gray-300"/>
          <view v-if="index !== patchStore.recordList.length - 1" class="flex-1 w-[2px] bg-gray-200"/>
        </view>

        <view class="flex-1 pb-4">
          <wd-card>
            <template #title>
              <view class="w-full flex flex-col gap-1.5" @click="updateRecordClick(item)">
                <view class="flex justify-between items-center">
                  <view class="text-base font-medium">
                    {{ item.type }}
                  </view>
                  <wd-tag type="primary" round>
                    {{ item.stage }}
                  </wd-tag>
                  <view class="text-xs text-gray-400">
                    {{ item.date }}
                  </view>
                </view>
              </view>
            </template>

            <view class="flex flex-col gap-2">
              <view
                  v-if="item.images.length"
                  :class="`grid gap-2 mt-2 ${gridCols(item.images.length)}`"
              >
                <view
                    v-for="(url, i) in item.images"
                    :key="i"
                    class="w-full rounded-lg overflow-hidden"
                    @click="previewImages(item.images, i)"
                >
                  <wd-img
                      :src="`${patchStore.baseUrl}/${url}`"
                      width="100%"
                      mode="widthFix"
                      lazy-load
                      :radius="8"
                  />
                </view>
              </view>

              <view v-if="item.videos.length" class="mt-2">
                <view
                    v-for="(url, i) in item.videos"
                    :key="i"
                    class="relative w-full overflow-hidden rounded-lg bg-black"
                    @click="playVideo(url)"
                >
                  <view class="h-[360rpx] flex items-center justify-center">
                    <wd-icon
                        name="play-circle-fill"
                        size="40px"
                        color="#fff"
                    />
                  </view>
                </view>
              </view>

              <text class="text-sm text-gray-500">
                {{ item.content }}
              </text>
            </view>
          </wd-card>
        </view>
      </view>
    </view>

    <wd-empty v-if="patchStore.recordList.length === 0" tip="暂无数据"/>

    <wd-picker v-model="value" v-model:visible="showHistory" :columns="columns" />

    <liu-drag-button v-if="patchStore.showRecordFab && patchStore.currentPatch.crop"
                     background="#22c55e" @clickBtn="addRecordClick">
      <wd-icon name="plus" size="24px"></wd-icon>
    </liu-drag-button>

    <record-popup />
    <crop-popup />
    <view class="h-[10px]"></view>
  </view>
</template>

<script setup lang="ts">
import {computed, ref} from 'vue'
import { usePatchStore } from "@/stores/patch";
import RecordPopup from "@/components/RecordPopup.vue";
import type { IRecord } from "@/types";
import { formatDate } from "@/utils";
import CropPopup from "@/components/CropPopup.vue";

const showHistory = ref(false)
const value = ref<string[]>([])
const columns = ref([
  { label: '选项1', value: '1' },
  { label: '选项2', value: '2' },
  { label: '选项3', value: '3' }
])

const patchStore = usePatchStore()

function gridCols(count: number): string {
  if (count === 1) return 'grid-cols-1'
  if (count === 2) return 'grid-cols-2'
  if (count === 4) return 'grid-cols-2'
  return 'grid-cols-3'
}

function previewImages(urls: string[], index: number) {
  const fullUrls = urls.map(url => `${patchStore.baseUrl}/${url}`)
  uni.previewImage({ urls: fullUrls, current: fullUrls[index] })
}

function playVideo(url: string) {
  const fullUrl = `${patchStore.baseUrl}/${url}`
  wx.previewMedia({
    sources: [{ url: fullUrl, type: 'video' }],
    current: 0,
    fail: (err) => {
      console.error(err)
      uni.showToast({ title: '视频预览失败', icon: 'none' })
    }
  })
}

function addCropClick() {
  patchStore.cropForm = {
    id: 0,
    patch_id: patchStore.currentPatch.id,
    name: '',
    variety: '',
    date: formatDate(Date.now()),
  }
  patchStore.cropApiType = 'ADD'
  patchStore.showCropPopup = true
  patchStore.showRecordFab = false
}

function updateCropClick() {
  patchStore.cropForm = JSON.parse(JSON.stringify(patchStore.currentPatch.crop))
  patchStore.cropApiType = 'UPDATE'
  patchStore.showCropPopup = true
  patchStore.showRecordFab = false
}

function addRecordClick() {
  patchStore.recordForm = {
    id: 0,
    crop_id: patchStore.currentPatch.crop.id,
    type: '💧 浇水',
    date: formatDate(Date.now()),
    content: '',
    images: [],
    videos: [],
    stage: '生长期'
  }
  patchStore.imageFileList = []
  patchStore.videoFileList = []
  patchStore.recordApiType = 'ADD'
  patchStore.showRecordPopup = true
  patchStore.showRecordFab = false
}

function updateRecordClick(record: IRecord) {
  patchStore.recordForm = JSON.parse(JSON.stringify(record))

  patchStore.imageFileList = []
  patchStore.recordForm.images.forEach(image => {
    patchStore.imageFileList.push({
      url: `${patchStore.baseUrl}/${image}`,
    })
  })

  patchStore.videoFileList = []
  patchStore.recordForm.videos.forEach(video => {
    patchStore.videoFileList.push({
      url: `${patchStore.baseUrl}/${video}`,
    })
  })

  patchStore.recordApiType = 'UPDATE'
  patchStore.showRecordPopup = true
  patchStore.showRecordFab = false
}

function showHistoryClick() {
  // showHistory.value = true
  uni.showToast({ title: '查看历史作物，正在开发', icon: 'none' })
}
</script>
\ No newline at end of file
diff --git a/src/stores/patch.ts b/src/stores/patch.ts
index bdc36d0..50e91a0 100644
--- a/src/stores/patch.ts
+++ b/src/stores/patch.ts
@@ -38,12 +38,14 @@ export const usePatchStore = defineStore('patch', {
   }),
   actions: {
     async queryPatchList() {
+      this.patchList = []
       this.patchList = await this.queryPatchListApi()
     },
     async queryPatch(patchId: number) {
       this.currentPatch = await this.queryPatchApi(patchId)
     },
     async queryRecordList(cropId: number) {
+      this.recordList = []
       this.recordList = await this.queryRecordListApi(cropId)
     },
     async queryPatchListApi() {