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

src/components/pageComponents/ArchivesFarmTimeLine.vue

@@ -59,9 +59,9 @@
                                                 </el-icon>
                                             </div>
                                         </div>
-                                        <div class="title-wrap van-ellipsis">
-                                            <div class="title-text" v-if="fw.flowStatus != null && fw.flowStatus != 0">{{ flowStatusStr[fw.flowStatus] }}</div>
-                                            <div class="title-text blue-tag" v-if="fw.flowStatus != null && fw.flowStatus != 0">限时溯源</div>
+                                        <div class="title-wrap van-ellipsis" v-if="fw.flowStatus != null && fw.flowStatus != 0">
+                                            <div class="title-text">{{ flowStatusStr[fw.flowStatus] }}</div>
+                                            <div class="title-text blue-tag" v-if="fw?.executionLimitDays >= 0">限时溯源</div>
                                         </div>
                                     </div>
                                     <div class="card-right"
@@ -567,6 +567,7 @@ const getArrangeStatusClass = (fw) => {
     if (props.pageType === 'agri_record') {
         if (t == null || t == 0) return "status-default";
         if (t == 3) return "status-warning-bg";
+        if (t == 5) return "status-normal";
         return "status-act";
     } else {
         if (t == 10) return "status-complete";
@@ -931,7 +932,7 @@ const getPhenologyTermProgress = (phenologyProgress) => {
 const flowStatusStr = {
     '3': '待认证',
     '-1': '已过期',
-    '2': '已认证',
+    '5': '已认证',
 }
 
 // 判断物候期是否应该显示蓝色（已过或当前节气的物候期）

src/views/old_mini/agri_record/index.vue

@@ -117,7 +117,9 @@ const handleVarietyClick = (tab, index) => {
         showSelectRegionPopup.value = true;
         VE_API.basic_farm.updateLastViewTime({
             regionId: tab.regionId,
-        })
+        }).then(() => {
+            getVarietyTabs(false);
+        });
     }
 };
 

src/views/old_mini/monitor/index.vue

@@ -128,7 +128,9 @@ const handleVarietyClick = (tab, index) => {
         showSelectRegionPopup.value = true;
         VE_API.basic_farm.updateLastViewTime({
             regionId: tab.regionId,
-        })
+        }).then(() => {
+            getVarietyTabs(false);
+        });
     }
 };