Merge branch 'farmer' of http://www.sysuimars.cn:3000/feiniao/feiniao-farm-h5 into farmer

src/components/pageComponents/ArchivesFarmTimeLine.vue

@@ -42,7 +42,7 @@
                                                 执行者：{{ fw.sourceDataJson.executorName }}
                                             </div> -->
                                         </div>
-                                        <div class="title-text van-ellipsis" v-if="shouldShowBlue(p)">{{ fw.title }}</div>
+                                        <div class="title-text van-ellipsis" v-if="shouldShowBlue(p)">{{ fw.content }}123123123123</div>
                                     </div>
                                     <div class="card-left agri-record-card" v-else>
                                         <div class="left-info">
@@ -492,10 +492,9 @@ const getArrangeStatusClass = (fw) => {
         if (t == null) return "status-default";
         return "status-act";
     }else{
-        if (t == 9) return "status-complete";
-        if (t == 8 ) return "status-warning";
-        if (t == 5) return "status-normal";
-        return "status-complete";
+        if (t == 10) return "status-complete";
+        if (t == 11 ) return "status-warning";
+        return "status-normal";
     }
 };
 
@@ -1121,6 +1120,7 @@ watch(
                             .title-text {
                                 margin-top: 5px;
                                 width: fit-content;
+                                max-width: 100%;
                                 text-align: left;
                                 color: #2199F8;
                                 padding: 0 6px;

src/components/popup/agriExecutePopup.vue

@@ -157,7 +157,7 @@ const handleExecuted = () => {
 
     .execute-image {
         width: 100%;
-        height: 184px;
+        height: 200px;
         border-radius: 5px;
         object-fit: cover;
         margin: 11px 0 13px 0;

src/views/old_mini/create_farm/index.vue

@@ -711,8 +711,11 @@ watch(
 const specieList = ref([]);
 function getSpecieList() {
     return VE_API.farm.fetchSpecieList({ point: centerPoint.value }).then(({ data }) => {
-        specieList.value = data || [];
-        return data;
+        const list = Array.isArray(data) ? data : [];
+        // 只保留名称包含“荔枝”的品类
+        const litchiList = list.filter((item) => item?.name && item.name.includes("荔枝"));
+        specieList.value = litchiList;
+        return litchiList;
     });
 }