2 Incheckningar 2f7365b7a7 ... 240dda7340

Upphovsman SHA1 Meddelande Datum
  lxf 240dda7340 Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-farm-h5 2 dagar sedan
  lxf fedcd40eb6 fix: 农资农情需求样式 2 dagar sedan

BIN
src/assets/img/home/farm.png


+ 111 - 6
src/components/taskItem.vue

@@ -5,10 +5,10 @@
                 <div class="item-name">梢期杀虫</div>
                 <div class="item-time">2025.08.27</div>
             </div>
-            <div class="top-r" v-if="!status">查看药物处方</div>
+            <div class="top-r" v-if="!status">查看处方</div>
         </div>
         <div class="item-box">
-            <div class="title-wrap">
+            <!-- <div class="title-wrap">
                 <div class="title-l">
                     <div class="item-title">未命名农场</div>
                     <div class="setting-text">设为特别关注</div>
@@ -38,6 +38,28 @@
                     农场报告已经生成,请点击查看
                     <el-icon class="right-icon" color="#FF953D" size="12"><ArrowRight /></el-icon>
                 </div>
+            </div> -->
+
+            <div class="farm-text">
+                <span class="text-title">农场现状:</span>现状现状现状选咋混给农场现状现状现状现状选咋混给选咋混给选咋混给选咋混<span class="text-more">点击查看照片</span>
+            </div>
+            <div class="img-text-wrap">
+                <div class="left-wrap">
+                    <div class="left-img">
+                        <img src="@/assets/img/home/farm.png" alt="">
+                    </div>
+                    <div class="right-text">
+                        <div class="farm-info">
+                            从化荔博园
+                            <div class="info-tag-wrap">
+                                <div class="tag-item second">200亩</div>
+                                <div class="tag-item primary">桂味</div>
+                            </div>
+                        </div>
+                        <div class="farm-addr">广东省广州市从化区</div>
+                    </div>
+                </div>
+                <div class="right-wrap">特别关注</div>
             </div>
             <slot name="footer"></slot>
         </div>
@@ -58,7 +80,7 @@ const toPage = () => {
 
 <style lang="scss" scoped>
 .farm-item {
-    background: #cfe9ff;
+    background: #CFE9FF;
     border-radius: 14px;
     &.done {
         background: #EBEBEB;
@@ -85,20 +107,103 @@ const toPage = () => {
             color: #000000;
         }
         .item-name {
-            margin-right: 5px;
-            color: #ffffff;
+            margin-right: 8px;
+            color: #2199F8;
             padding: 0 10px;
             height: 29px;
             border-radius: 4px;
+            border: 1px solid #2199F8;
             line-height: 29px;
-            background: linear-gradient(180deg, #7bc5ff, #2199f8);
+            background: #fff;
         }
     }
     .item-box {
         background: #fff;
         border-radius: 10px 10px 14px 14px;
+        border: 1px solid rgba(183, 183, 183, 0.1);
         padding: 10px 12px;
     }
+
+    .farm-text {
+        background: rgba(183, 183, 183, 0.1);
+        padding: 6px 8px;
+        border-radius: 5px;
+        font-size: 12px;
+        color: #909090;
+        line-height: 1.5;
+        overflow: hidden;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+        line-clamp: 2;
+        word-break: break-all;
+        .text-title {
+            color: #424242;
+        }
+        .text-more {
+            padding-left: 10px;
+            color: #2199F8;
+            white-space: nowrap;
+        }
+    }
+    .img-text-wrap {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .left-wrap {
+            display: flex;
+            align-items: center;
+            .left-img {
+                width: 40px;
+                height: 40px;
+                border-radius: 6px;
+                img {
+                    width: 100%;
+                    height: 100%;
+                    object-fit: contain;
+                }
+            }
+            .right-text {
+                padding-left: 8px;
+                .farm-info {
+                    font-size: 14px;
+                    color: #1D2129;
+                    display: flex;
+                    align-items: center;
+                    .info-tag-wrap {
+                        margin-left: 10px;
+                        display: flex;
+                        align-items: center;
+                        gap: 4px;
+                        .tag-item {
+                            height: 20px;
+                            line-height: 20px;
+                            padding: 0 8px;
+                            border-radius: 2px;
+                            font-size: 12px;
+                            &.second {
+                                color: #1D2129;
+                                background: #F4F4F4;
+                            }
+                            &.primary {
+                                color: #2199F8;
+                                background: #E8F3FF;
+                            }
+                        }
+                    }
+                }
+                .farm-addr {
+                    padding-top: 2px;
+                    font-size: 12px;
+                    color: #86909C;
+                }
+            }
+        }
+        .right-wrap {
+            color: #FF953D;
+            font-size: 12px;
+        }
+    }
     .title-wrap {
         display: flex;
         align-items: center;

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

@@ -77,7 +77,7 @@ import customHeader from "@/components/customHeader.vue";
 import { Popup} from "vant";
 import { Edit, Close, Plus } from '@element-plus/icons-vue'
 
-const isEdit = ref(true);
+const isEdit = ref(false);
 const showAddPopup = ref(false);
 
 const input = ref("");

+ 19 - 21
src/views/old_mini/task_condition/components/task.vue

@@ -9,13 +9,13 @@
         <div class="task-list">
             <div class="list-filter">
                 <div class="filter-item" :class="{ active: activeIndex === 0 }" @click="handleActiveFilter(0)">
-                    待执行
+                    待确认(9)
                 </div>
                 <div class="filter-item" :class="{ active: activeIndex === 1 }" @click="handleActiveFilter(1)">
-                    已完成
+                    待执行(4)
                 </div>
                 <div class="filter-item" :class="{ active: activeIndex === 2 }" @click="handleActiveFilter(2)">
-                    发起的需求
+                    已完成(8)
                 </div>
             </div>
             <div class="select-group">
@@ -34,25 +34,15 @@
                     <task-item>
                         <template #footer>
                             <div class="item-footer">
-                                <div class="footer-l prrmary-btn" v-if="item == 2 || item == 1">
-                                    <img class="share-icon" src="@/assets/img/home/share-icon.png" alt="" />
-                                    转发
-                                </div>
-                                <div class="footer-l" v-else>
-                                    删除订单
+                                <div class="footer-l" @click="toDetail">
+                                    查看详情
                                 </div>
                                 <div class="footer-r">
                                     <div class="btn second">
-                                        <el-icon class="btn-icon" size="14" color="#8B8B8B"><ChatDotSquare /></el-icon>
-                                        联系果园
-                                    </div>
-                                    <div class="btn primary" v-if="item == 2 || item == 1" @click="toPage">
-                                        <el-icon class="btn-icon" size="14"><Plus /></el-icon>
-                                        报价
+                                        忽略
                                     </div>
-                                    <div class="btn primary" v-else>
-                                        <el-icon class="btn-icon" size="14"><Select /></el-icon>
-                                        我已完成
+                                    <div class="btn primary" @click="toPage">
+                                        下发农事
                                     </div>
                                 </div>
                             </div>
@@ -110,7 +100,13 @@ function handleActiveFilter(i) {
 }
 
 function toPage() {
-    router.push("/services_agri")
+    // router.push("/servicZes_agri")
+}
+
+function toDetail() {
+    router.push({
+        path: "/modify_work",
+    });
 }
 </script>
 
@@ -231,8 +227,10 @@ function toPage() {
                 display: flex;
                 align-items: center;
                 &.second {
-                    border: 1px solid #8B8B8B;
-                    color: #8B8B8B;
+                    // border: 1px solid #8B8B8B;
+                    // color: #8B8B8B;
+                    color: #2199F8;
+                    background: rgba(33, 153, 248, 0.1);
                 }
                 &.primary {
                     background: #2199F8;