wangsisi 1 тиждень тому
батько
коміт
bc146602c7

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

@@ -84,7 +84,7 @@
                             </div>
                         </div>
                         <template v-if="r.name === r.phenologyName">
-                            <div class="phenology-name single"
+                            <div class="phenology-name text-blue"
                                 :class="{ 'phenology-red': !shouldShowBlue(p), 'phenology-blue': shouldShowBlue(p) }"
                                 :style="r.phenologyName === getNextPhenologyName(idx, rIdx) ? 'padding: 6px 0;' : ''">
                                 {{ r.name }}
@@ -1016,7 +1016,8 @@ watch(
             color: #fff;
             font-size: 12px;
             position: absolute;
-            left: 39px;
+            // left: 39px;
+            left: -1px;
             z-index: 10;
             text-align: center;
             display: flex;
@@ -1060,6 +1061,8 @@ watch(
                 &.single {
                     width: 39px;
                     line-height: 39px;
+                    // z-index: 10;
+                    // position: relative;
                 }
 
                 &.phenology-blue {

+ 9 - 4
src/views/old_mini/interactionList/index.vue

@@ -141,11 +141,11 @@
         <div class="empty-data" v-if="!loading && listData.length === 0">暂无数据</div>
     </div>
 
-    <!-- <div class="custom-bottom-fixed-btns" :class="{ 'center-btn': false }">
+    <div class="custom-bottom-fixed-btns" :class="{ 'center-btn': false }">
         <div class="bottom-btn secondary-btn" @click="handleShowDroneConsultPopup">获取自动飞行航线</div>
         <div class="bottom-btn secondary-btn">邀请农情互动</div>
-        <div class="bottom-btn primary-btn" @click="handleSubmitAll">一键提交</div>
-    </div> -->
+        <!-- <div class="bottom-btn primary-btn" @click="handleSubmitAll">一键提交</div> -->
+    </div>
 
     <!-- 农场信息完善弹窗 -->
     <farm-info-popup :oldUser="oldUser" :expertMiniUserId="query.expertMiniUserId" v-model:show="showFarmInfoPopup" />
@@ -1042,9 +1042,14 @@ const handleSubmitAll = () => {
     }
 }
 
+.custom-bottom-fixed-btns{
+    justify-content: space-between;
+    .secondary-btn{
+        padding: 10px 20px;
+    }
+}
 .center-btn {
     justify-content: center;
-
     .primary-btn {
         padding: 10px 32px;
         background: #2199F8;