Browse Source

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

lxf 1 day ago
parent
commit
65417b3235

+ 25 - 2
src/components/pageComponents/ArchivesFarmTimeLine.vue

@@ -59,7 +59,7 @@
                                                 </el-icon>
                                             </div>
                                         </div>
-                                        <div class="title-wrap van-ellipsis" v-if="fw.flowStatus != null && fw.flowStatus != 0">
+                                        <div class="title-wrap van-ellipsis" v-if="fw.flowStatus != null && fw.flowStatus != 0 && fw.flowStatus != -2">
                                             <div class="title-text">{{ flowStatusStr[fw.flowStatus] }}</div>
                                             <div class="title-text blue-tag" v-if="fw?.executionLimitDays >= 0">限时溯源</div>
                                         </div>
@@ -565,7 +565,9 @@ const handleSeasonClick = (seasonValue) => {
 const getArrangeStatusClass = (fw) => {
     const t = props.pageType === 'agri_record' ? fw?.flowStatus : fw?.sourceType;
     if (props.pageType === 'agri_record') {
-        if (t == null || t == 0) return "status-default";
+        if (t == null || t == 0 || t == -2) return "status-default";
+        // 农事记录:内容仍用 status-warning 的红字/红标签,外边框与箭头改为灰色
+        if (t == -1) return "status-warning status-warning-agri-record";
         if (t == 3) return "status-warning-bg";
         if (t == 5) return "status-normal";
         return "status-act";
@@ -932,6 +934,7 @@ const getPhenologyTermProgress = (phenologyProgress) => {
 const flowStatusStr = {
     '3': '待认证',
     '-1': '已过期',
+    '-2': '已过期',
     '5': '已认证',
 }
 
@@ -1350,6 +1353,26 @@ watch(
                     }
                 }
 
+                .arrange-card.status-warning.status-warning-agri-record {
+                    border-color: #bbbbbb;
+
+                    .card-left {
+                        .left-info {
+                            .left-date {
+                                color: #bbbbbb;
+                                border-color: #bbbbbb;
+                            }
+                        }
+                        .text-name,.text-icon {
+                            color: #bbbbbb;
+                        }
+                    }
+
+                    &::before {
+                        border-right-color: #bbbbbb;
+                    }
+                }
+
                 .arrange-card.status-complete {
                     border-color: #FF943D;
 

+ 1 - 1
src/views/old_mini/interactionList/index.vue

@@ -1,6 +1,6 @@
 <template>
     <custom-header v-if="!showClose" name="农情互动" bgColor="#f2f4f5"></custom-header>
-    <div class="interaction-list-wrapper" :class="{ 'show-close': !showClose }">
+    <div class="interaction-list-wrapper" :class="{ 'show-close': showClose }">
         <div class="interaction-card" v-if="showClose">
             <img v-if="listData[0]?.coverUrl" :src="listData[0]?.coverUrl" alt="">
             <div class="card-content">