fix: 创建农场数据销毁，农事详情，农情需求

src/App.vue

@@ -138,7 +138,7 @@ const router = useRouter();
 // 首页loading加载完才显示底部导航栏
 const showTab = ref(false);
 // 0: 农户, 1: 专家, 2:农资农服
-const curRole = ref(0);
+const curRole = ref(2);
 
 let tabBarHeight = 0;
 onMounted(() => {

src/components/customHeader.vue

@@ -34,14 +34,15 @@ const props = defineProps({
     }
 })
 
-const emit = defineEmits(['close'])
+const emit = defineEmits(['close', "goback"])
 
 
 const goback = () => {
   if(!props.isGoBack){
     router.go(-1);
   }else{
-    eventBus.emit('header:goback')
+    // eventBus.emit('header:goback')
+    emit('goback')
   }
 };
 

src/components/taskItem.vue

@@ -1,11 +1,11 @@
 <template>
-    <div class="farm-item">
+    <div class="farm-item" :class="{'done': status}">
         <div class="item-top">
             <div class="top-l">
                 <div class="item-name">梢期杀虫</div>
                 <div class="item-time">2025.08.27</div>
             </div>
-            <div class="top-r">查看药物处方</div>
+            <div class="top-r" v-if="!status">查看药物处方</div>
         </div>
         <div class="item-box">
             <div class="title-wrap">
@@ -33,18 +33,44 @@
                     </div>
                     <span class="copy-text">点击复制</span>
                 </div>
+                <div class="desc-info report-text" @click="toPage">
+                    <el-icon class="done-icon" color="#fff" size="6"><Select /></el-icon>
+                    农场报告已经生成，请点击查看
+                    <el-icon class="right-icon" color="#FF953D" size="12"><ArrowRight /></el-icon>
+                </div>
             </div>
             <slot name="footer"></slot>
         </div>
     </div>
 </template>
 
-<script setup></script>
+<script setup>
+import { ref } from 'vue';
+import { useRouter } from "vue-router";
+
+const status = ref(1)
+
+const router = useRouter();
+const toPage = () => {
+    router.push("/report_detail")
+}
+</script>
 
 <style lang="scss" scoped>
 .farm-item {
     background: #cfe9ff;
     border-radius: 14px;
+    &.done {
+        background: #EBEBEB;
+        .item-top {
+            .item-name {
+                background: #C6C6C6;
+            }
+        }
+        .item-desc .copy-info .copy-text {
+            color: #000000;
+        }
+    }
     .item-top {
         display: flex;
         align-items: center;
@@ -122,6 +148,28 @@
                 color: #2199f8;
             }
         }
+        .report-text {
+            margin-top: 10px;
+            color: #FF953D;
+            font-size: 12px;
+            height: 32px;
+            line-height: 32px;
+            border-radius: 5px;
+            display: flex;
+            align-items: center;
+            padding-left: 11px;
+            background: linear-gradient(90deg, rgba(255, 149, 61, 0.1), rgba(255, 149, 61, 0));
+            .done-icon {
+                background: #FF953D;
+                width: 10px;
+                height: 10px;
+                border-radius: 50%;
+                margin-right: 5px;
+            }
+            .right-icon {
+                margin-left: 10px;
+            }
+        }
     }
 }
 </style>

src/views/old_mini/create_farm/editMap.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="edit-map">
-        <custom-header name="创建农场"></custom-header>
+        <custom-header name="创建农场" :isGoBack="true" @goback="backgToCreate"></custom-header>
         <div class="edit-map-content">
             <div class="edit-map-tip">操作提示：拖动圆点，即可调整地块边界</div>
             <div class="map-container" ref="mapContainer"></div>
@@ -26,7 +26,7 @@
 
 <script setup>
 import customHeader from "@/components/customHeader.vue";
-import { ref, onMounted, onActivated } from "vue";
+import { ref, onMounted, onActivated, onDeactivated } from "vue";
 import EditMap from "./map/editMap.js";
 import { useRouter, useRoute } from "vue-router";
 import { convertPointToArray } from "@/utils/index";
@@ -64,16 +64,30 @@ onActivated(() => {
     pointName.value = route.query.pointName
     const point = route.query.mapCenter || "POINT (113.6142086995688 23.585836479509055)"
     editMap.setMapPosition(convertPointToArray(point))
+
+    // 绘制勾画范围
+    const polygonData = store.state.home.polygonData;
+    if (polygonData) {
+        editMap.setAreaGeometry(polygonData?.geometryArr);
+    }
+})
+
+onDeactivated(() => {
+    editMap.clearLayer()
 })
 const goBack = () => {
     editMap.clearLayer()
-    router.back();
+    router.replace("/create_farm")
 };
+
+function backgToCreate() {
+    router.replace("/create_farm")
+}
 const confirm = () => {
     // getAreaGeometry
     const polygonData = editMap.getAreaGeometry()
     store.commit("home/SET_FARM_POLYGON", polygonData);
-    router.back();
+    router.replace("/create_farm")
 };
 </script>
 

src/views/old_mini/create_farm/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="create-farm">
-        <custom-header :name="isClient ? '新增用户' : '创建农场'"></custom-header>
+        <custom-header :name="isClient ? '新增用户' : '创建农场'" :isGoBack="true" @goback="backgToHome"></custom-header>
         <!-- 地图 -->
         <div class="map-container" ref="mapContainer"></div>
         <div class="farm-content">
@@ -261,7 +261,7 @@ const resetForm = (formEl) => {
     if (!formEl) return;
     formEl.resetFields();
     store.commit("home/SET_FARM_POLYGON", null);
-    router.go(-1);
+    router.replace("/home?reload=true");
 };
 
 const centerPoint = ref(null);
@@ -315,6 +315,10 @@ function getPhenology(containerId) {
         phenologyList.value = data;
     });
 }
+
+function backgToHome() {
+    router.replace("/home")
+}
 </script>
 
 <style lang="scss" scoped>

src/views/old_mini/create_farm/map/index.js

@@ -49,7 +49,7 @@ class IndexMap {
     this.kmap.getView().animate({
       center,
       zoom: 16,
-      duration: 500,
+      duration: 0,
     });
     this.setMapPoint(center)
   }

src/views/old_mini/modify_work/completedWork.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="completed-work">
         <custom-header name="农事详情"></custom-header>
-        <div class="work-content">
+        <div class="work-content" :class="{'hasBottom': curRole == 0}">
             <div class="content-status">
                 <div class="status-l" v-if="status === 0">
                     <div class="stauts-text">待执行</div>
@@ -9,11 +9,12 @@
                 </div>
                 <div class="status-l" v-if="status === 1">
                     <div class="stauts-text">
-                        <el-icon class="status-icon"><Select /></el-icon>
+                        <el-icon color="#2199F8" size="16" class="status-icon"><Select /></el-icon>
                         该农事已完成
                     </div>
                 </div>
-                <div class="status-r">{{ status === 0 ? "提醒执行" : "提醒复核" }}</div>
+                <div class="status-r" v-if="curRole == 0">{{ status === 0 ? "设置提醒" : "去评价" }}</div>
+                <div class="status-r" v-if="curRole == 1">{{ status === 0 ? "提醒执行" : "提醒复核" }}</div>
             </div>
 
             <div class="work-wrap">
@@ -137,6 +138,8 @@
                     </div>
                 </div>
             </div>
+
+            <div class="fixed-btn" v-if="curRole == 0">{{ status === 0 ? "确认完成" : "立即复核" }}</div>
         </div>
     </div>
 </template>
@@ -145,6 +148,13 @@
 import customHeader from "@/components/customHeader.vue";
 import { onMounted, ref } from "vue";
 import NewFarmMap from "./newFarmMap";
+import { useStore } from "vuex";
+
+const store = useStore();
+
+// 角色
+// const curRole = store.state.app.curRole
+const curRole = 0
 
 // 0：执行， 1： 复核
 const status = ref(0);
@@ -175,9 +185,137 @@ const prescriptioData = ref({
 const areaRef = ref(null);
 let newFarmMap = new NewFarmMap();
 onMounted(() => {
-    
-    // newFarmMap.initMap(point, areaRef.value);
+    const point = store.state.home.miniUserLocationPoint;
+    newFarmMap.initMap(point, areaRef.value, false);
+
+    getAreaList(() => {
+        console.log('areaList.value', areaList.value);
+        newFarmMap.initArea(areaList.value);
+    });
 })
+
+// 农场分区列表
+const areaList = ref([]);
+const regionId = ref(null);
+const getAreaList = (callback) => {
+    const data = [
+        {
+            "farmCode": "LBY",
+            "farmId": "766",
+            "id": 2,
+            "isGenerateReport": 1,
+            "name": "分区2",
+            "pointCount": 131,
+            "pointWkt": "POINT (113.6142086995688 23.585836479509055)",
+            "regionCode": "LBY-MR-2",
+            "wkt": "MULTIPOLYGON (((113.61348988377155 23.58617369800422, 113.61395837633405 23.58622555407246, 113.61414076654707 23.58622555407246, 113.61436964832843 23.5862774101407, 113.61478628474084 23.586468741036786, 113.61491681896747 23.58652417337007, 113.61512424307672 23.586449071517652, 113.61491503077356 23.585742756367924, 113.61479880177082 23.585596129050916, 113.61473800497858 23.585451289764112, 113.61438931780664 23.585286780835393, 113.61410858003889 23.585299297865365, 113.61385645239149 23.585249229909184, 113.61378135053907 23.585288569029306, 113.61357571446003 23.585283204611276, 113.61347200232355 23.585342213209604, 113.61338080721704 23.585506721974614, 113.61335934954492 23.585665866485304, 113.61342193444922 23.58616296916816, 113.61348988377155 23.58617369800422)))"
+        },
+        {
+            "farmCode": "LBY",
+            "farmId": "766",
+            "id": 9,
+            "isGenerateReport": 1,
+            "name": "分区9",
+            "pointCount": 63,
+            "pointWkt": "POINT (113.61725048541882 23.585262743588892)",
+            "regionCode": "LBY-MR-9",
+            "wkt": "MULTIPOLYGON (((113.61697301904715 23.585749021838886, 113.617320420354 23.585742359348075, 113.61752600578478 23.585708095109652, 113.61772112158744 23.5856785897931, 113.61789720170187 23.58559102562808, 113.61787340709186 23.585330236701996, 113.61793812843106 23.58526932250014, 113.61795526055036 23.585167481569073, 113.61793146594025 23.585022810339957, 113.61790671954574 23.58491525870246, 113.61779345720193 23.58473346788171, 113.61779821612386 23.584601169849783, 113.61771921801855 23.584509798547092, 113.61763260563801 23.584517412822354, 113.61755741467023 23.584640193010298, 113.61736515422085 23.584823887399946, 113.61726902399624 23.58487623554194, 113.61709484745067 23.584864814129187, 113.61707105284067 23.584962847922696, 113.61699586187265 23.585023762124397, 113.61689877986377 23.585071351344393, 113.61675981934107 23.58515796372515, 113.61663132844662 23.585192227963518, 113.61646000725422 23.58524076896813, 113.61634484134152 23.585320718857897, 113.61628392713976 23.585360693802862, 113.6162163504473 23.585397813394497, 113.61601552393823 23.585480618637533, 113.61596127222741 23.585499654325552, 113.61597174185577 23.585538677485918, 113.61598125969975 23.585561520311693, 113.61608690776846 23.585591025628073, 113.61610689524092 23.585611013100582, 113.61619350762157 23.58557960421532, 113.6162886860618 23.58552820785755, 113.61632104673151 23.585492040050294, 113.61638196093314 23.585453968674216, 113.61646095903859 23.585480618637543, 113.6164771393734 23.585505365031985, 113.61649617506146 23.585564375664962, 113.61648760900198 23.58561006131614, 113.61645048941011 23.58567192730245, 113.61649807863034 23.585676686224392, 113.61662466595578 23.585595784550236, 113.61671698904298 23.585495847187836, 113.61676553004737 23.585587218490588, 113.61681787818966 23.585559616742817, 113.61689211737293 23.5854558722431, 113.61695588692798 23.585499654325556, 113.61697301904715 23.585749021838886)))"
+        },
+        {
+            "farmCode": "LBY",
+            "farmId": "766",
+            "id": 29,
+            "isGenerateReport": 1,
+            "name": "分区8",
+            "pointCount": 40,
+            "pointWkt": "POINT (113.61587084394066 23.58618878122994)",
+            "regionCode": "LBY-MR-8",
+            "wkt": "MULTIPOLYGON (((113.61516876894466 23.58617727723074, 113.6153952936325 23.58616014511155, 113.61551426668275 23.586215348606817, 113.61564275757719 23.586290539574595, 113.61565798612749 23.58640951262483, 113.61577695917796 23.58637905552401, 113.61584168051715 23.586392380505654, 113.615912112563 23.58637048946448, 113.61613483011318 23.586200120056528, 113.6162547549478 23.586365730542376, 113.61623762282863 23.586448535785365, 113.61615196223237 23.586476137533136, 113.61634435485792 23.586946782901485, 113.61654695275945 23.586932042261843, 113.61651364030526 23.58667220511998, 113.61648127963554 23.586552280285296, 113.61640894402115 23.58641903046899, 113.61636135480092 23.586292443143435, 113.6163308977001 23.586121121951034, 113.61631471736528 23.58605735239606, 113.61618622647107 23.586071629162152, 113.61612911940675 23.58603260600161, 113.61610342122786 23.58595265611185, 113.61601109814079 23.585864140162432, 113.61585310193013 23.585803225960632, 113.61557898802205 23.585730890346124, 113.6153714990225 23.585723276070855, 113.61520493675204 23.585882224066058, 113.61516591359151 23.586056400611785, 113.61516876894466 23.58617727723074)))"
+        },
+        {
+            "farmCode": "LBY",
+            "farmId": "766",
+            "id": 12828,
+            "isGenerateReport": 1,
+            "name": "分区5",
+            "pointCount": 45,
+            "pointWkt": "POINT (113.61692837797158 23.58435388968608)",
+            "regionCode": "LBY-MR-5",
+            "wkt": "MULTIPOLYGON (((113.61726902399624 23.584875938109313, 113.61732981922493 23.584649032707855, 113.61741785928217 23.58458954618279, 113.6176284415812 23.584287354634938, 113.61761892373723 23.584146966435544, 113.61762249292879 23.584041080420736, 113.61758442155264 23.584010147427676, 113.61752374529698 23.583939953328095, 113.6174499820059 23.583857861923292, 113.61723702024568 23.5839113997961, 113.61706331959229 23.583947091711153, 113.61689794705232 23.583967317129648, 113.61673019505157 23.58399468093132, 113.61659218631306 23.584025613924393, 113.61641848565968 23.584054167456387, 113.61624716446725 23.584093428562902, 113.61621623147425 23.584286164904498, 113.61622218012678 23.584531249388036, 113.6162186109351 23.58466211974327, 113.61629713314835 23.584684724622857, 113.6166052733487 23.58470970896351, 113.61669926205845 23.584731124112597, 113.61678016373266 23.584778713332653, 113.61680276861217 23.584819164169826, 113.61683846052725 23.58481916416982, 113.61689080866942 23.584775144141148, 113.61697884872665 23.58482035390024, 113.61709484745067 23.584864516696555, 113.61726902399624 23.584875938109313)))"
+        },
+        {
+            "farmCode": "LBY",
+            "farmId": "766",
+            "id": 126202,
+            "isGenerateReport": 1,
+            "name": "LBY-MR-SG1",
+            "pointCount": null,
+            "pointWkt": "POINT (113.67786773078139 23.512815571668426)",
+            "regionCode": "LBY-MR-SG1",
+            "wkt": "POLYGON ((113.67643632076339 23.512862037149922, 113.67909107058698 23.51321600379307, 113.67909107058698 23.512673254940246, 113.67661330408497 23.512472673842463, 113.67643632076339 23.512862037149922))"
+        },
+        {
+            "farmCode": "LBY",
+            "farmId": "766",
+            "id": 172047,
+            "isGenerateReport": 1,
+            "name": "认养分区",
+            "pointCount": null,
+            "pointWkt": "POINT (113.61573550741103 23.586606696698798)",
+            "regionCode": "LBY认养分区",
+            "wkt": "MULTIPOLYGON (((113.61553138381385 23.586555391814727, 113.61578836560238 23.586770495089638, 113.61593018147823 23.586692924660838, 113.61571507820327 23.5864349910878, 113.61553138381385 23.586555391814727)))"
+        },
+        {
+            "farmCode": "LBY",
+            "farmId": "766",
+            "id": 175094,
+            "isGenerateReport": 1,
+            "name": "12",
+            "pointCount": null,
+            "pointWkt": "POINT (113.61860504330416 23.583859757151316)",
+            "regionCode": "LBY-MR-12",
+            "wkt": "MULTIPOLYGON (((113.61790764544605 23.58437349638575, 113.61810434755591 23.58448136528483, 113.61834039008784 23.58457781277093, 113.61887973458238 23.58461715319288, 113.61901298439875 23.584476289101246, 113.61925029597637 23.584407760624345, 113.61937973865497 23.58437349638575, 113.61932390063691 23.584164103817216, 113.61923506742585 23.5838836446801, 113.61920587937084 23.583660292607078, 113.61927060071025 23.58345216908441, 113.61940004338908 23.5832846550295, 113.6191449651692 23.58325927411221, 113.61896095351813 23.583223740827805, 113.61884166320624 23.58314759807564, 113.61873379430745 23.58305115058954, 113.6185180565094 23.583087952919755, 113.61840257333529 23.58318947658927, 113.61825028783096 23.583260543158076, 113.61815510939073 23.583216126552543, 113.61807262140928 23.583183131360045, 113.61779216227194 23.583299883580025, 113.61792541208831 23.58360953077215, 113.61817668317042 23.583615876001545, 113.61831374012445 23.583843035212283, 113.61829216634476 23.583925523193727, 113.61821348550086 23.5839014113223, 113.6179825191524 23.583770699597665, 113.6178530764738 23.583793542423393, 113.61783784792328 23.583905218459847, 113.617946985868 23.58400166594589, 113.61795713823494 23.584085422973374, 113.61786703597829 23.58419963710162, 113.61785815265716 23.58428847031246, 113.61790764544605 23.58437349638575)))"
+        },
+        {
+            "farmCode": "LBY",
+            "farmId": "766",
+            "id": 175095,
+            "isGenerateReport": 1,
+            "name": "13",
+            "pointCount": null,
+            "pointWkt": "POINT (113.61907779775447 23.582774628335315)",
+            "regionCode": "LBY-MR-13",
+            "wkt": "MULTIPOLYGON (((113.6185180565094 23.583087952919755, 113.61873379430756 23.58305115058954, 113.61884166320624 23.58314759807564, 113.61896095351813 23.583223740827805, 113.6191449651692 23.58325927411221, 113.61940004338908 23.5832846550295, 113.61952853428329 23.58303148037845, 113.61974554112703 23.582682175502953, 113.61942574156774 23.58233191884284, 113.61909737594897 23.58227005285653, 113.61872713181651 23.58242614549863, 113.61843207865172 23.58267265765886, 113.61843112686734 23.583051467850964, 113.6185180565094 23.583087952919755)))"
+        },
+        {
+            "farmCode": "LBY",
+            "farmId": "766",
+            "id": 175096,
+            "isGenerateReport": 1,
+            "name": "15",
+            "pointCount": null,
+            "pointWkt": "POINT (113.61729343325402 23.581078231145653)",
+            "regionCode": "LBY-MR-15",
+            "wkt": "MULTIPOLYGON (((113.61579634969576 23.580895993441118, 113.61623258421344 23.58139885286704, 113.61657522659812 23.581547965756727, 113.61743341886756 23.5818731587608, 113.61737155288142 23.58216345300349, 113.61798704012836 23.582252286214498, 113.61852479831566 23.58088806190449, 113.61799973058703 23.58035347633188, 113.61769991850042 23.580115530231183, 113.61644039047451 23.580399479244647, 113.61574558786083 23.580797642386187, 113.61579634969576 23.580895993441118)))"
+        }
+    ]
+    areaList.value = data;
+    regionId.value = (data && data.length && data[0].id) || "";
+    changeRegion(regionId.value);
+    callback && callback();
+    // VE_API.region.list({ farmId: gardenId.value }).then(({ data, code }) => {
+    // });
+};
+
+// 切换分区
+const gardenId = ref(null);
+const changeRegion = (e) => {
+    newFarmMap.getBlueRegion({ gardenId: gardenId.value, regionId: e }, () => {
+        // newFarmMap.setBlueRegion([{id: "ws0y1me7h94u"}, {id: "ws0y1me545tg"}])
+        // serveArea.value = "3.72亩"
+    });
+};
+
 </script>
 
 <style lang="scss" scoped>
@@ -190,12 +328,30 @@ onMounted(() => {
     .work-content {
         height: calc(100% - 40px);
         overflow: auto;
+        box-sizing: border-box;
+        &.hasBottom {
+            padding-bottom: 60px;
+        }
         .work-wrap {
             position: relative;
             z-index: 3;
             padding: 0 12px;
             top: -16px;
         }
+        .fixed-btn {
+            position: absolute;
+            z-index: 10;
+            bottom: 26px;
+            left: 50%;
+            transform: translateX(-50%);
+            padding: 0 60px;
+            height: 42px;
+            line-height: 42px;
+            background: linear-gradient(180deg, #70BFFE, #2199F8);
+            border-radius: 20px;
+            color: #fff;
+            font-size: 16px;
+        }
         .card-title {
             font-size: 16px;
             font-weight: bold;
@@ -242,6 +398,15 @@ onMounted(() => {
             .status-l {
                 .stauts-text {
                     font-size: 22px;
+                    display: flex;
+                    align-items: center;
+                    .status-icon {
+                        width: 24px;
+                        height: 24px;
+                        background: #FFFFFF;
+                        border-radius: 50%;
+                        margin-right: 8px;
+                    }
                 }
                 .stauts-sub-text {
                     color: rgba(255, 255, 255, 0.51);
@@ -427,6 +592,18 @@ onMounted(() => {
                 }
             }
         }
+
+        .work-map {
+            padding: 10px 0;
+            .map-content {
+                padding-top: 8px;
+                .map-dom {
+                    height: 166px;
+                    width: 100%;
+                    clip-path: inset(0px round 8px);
+                }
+            }
+        }
     }
 }
 </style>

src/views/old_mini/modify_work/newFarmMap.js

@@ -67,10 +67,10 @@ class EditNsMap {
         this.areaVal = 0
     }
 
-    initMap(location, target) {
+    initMap(location, target, movable = true) {
         let level = 18
         let coordinate = util.wktCastGeom(location).getFirstCoordinate()
-        this.kmap = new KMap.Map(target, level, coordinate[0], coordinate[1], null, 10, 22);
+        this.kmap = new KMap.Map(target, level, coordinate[0], coordinate[1], null, 10, 22, "img", movable, movable);
         let xyz2 = config.base_img_url3 + 'map/lby/{z}/{x}/{y}.png';
         this.kmap.addXYZLayer(xyz2, { minZoom: 12, maxZoom: 26 });
         this.kmap.addLayer(this.areaLayer.layer)

src/views/old_mini/task_condition/components/calendar.vue

@@ -2,11 +2,20 @@
     <div class="calendar">
         <div class="header-wrap">
             <div class="header-l">
-                <el-icon class="icon" color="#999999" size="11" @click="prevPeriod"><ArrowLeftBold /></el-icon>
-                <span class="header-text"
-                    >{{ dateRange.start }} <span class="center-line">-</span> {{ dateRange.end }}</span
-                >
-                <el-icon class="icon" color="#999999" size="11" @click="nextPeriod"><ArrowRightBold /></el-icon>
+                <div class="top-l">
+                    <el-icon class="icon icon-l" color="#999999" size="11" @click="prevPeriod"><ArrowLeftBold /></el-icon>
+                    <span class="top-tag red">3过期</span>
+                </div>
+                <div class="top-c">
+                    <span class="header-text">
+                        {{ dateRange.start }} <span class="center-line">-</span> {{ dateRange.end }}
+                    </span>
+                </div>
+                <div class="top-r">
+                    <span class="top-tag orange">5待执行</span>
+                    <el-icon class="icon icon-r" color="#999999" size="11" @click="nextPeriod"><ArrowRightBold /></el-icon>
+                </div>
+
             </div>
             <!-- <div class="header-r">
                 <span class="line"></span>
@@ -173,7 +182,27 @@ const selectedDate = ref(null);
                 border-radius: 50%;
                 text-align: center;
                 line-height: 20px;
-                margin-left: 6px;
+                &.icon-l {
+                    margin-right: 2px;
+                }
+                &.icon-r {
+                    margin-left: 2px;
+                }
+            }
+            .top-tag {
+                font-size: 12px;
+                padding: 0 8px;
+                height: 20px;
+                line-height: 20px;
+                border-radius: 20px;
+                &.red {
+                    color: #FF0000;
+                    background: rgba(255, 0, 0, 0.1);
+                }
+                &.orange {
+                    color: #FF790B;
+                    background: rgba(255, 149, 61, 0.2);
+                }
             }
         }
         .header-r {

src/views/old_mini/task_condition/components/task.vue

@@ -34,19 +34,26 @@
                     <task-item>
                         <template #footer>
                             <div class="item-footer">
-                                <div class="footer-l">
+                                <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>
                                 <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">
+                                    <div class="btn primary" v-if="item == 2 || item == 1">
                                         <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>
                                 </div>
                             </div>
                         </template>
@@ -187,20 +194,24 @@ function handleActiveFilter(i) {
         justify-content: space-between;
         font-size: 12px;
         .footer-l {
-            display: inline-flex;
-            align-items: center;
-            border: 1px solid #2199F8;
-            background: rgba(33, 153, 248, 0.1);
-            padding: 0 12px;
-            height: 32px;
-            box-sizing: border-box;
-            display: flex;
-            align-items: center;
-            border-radius: 20px;
-            color: #2199F8;
-            .share-icon {
-                width: 12px;
-                padding-right: 4px;
+            color: #8B8B8B;
+            font-size: 12px;
+            &.prrmary-btn {
+                display: inline-flex;
+                align-items: center;
+                border: 1px solid #2199F8;
+                background: rgba(33, 153, 248, 0.1);
+                padding: 0 12px;
+                height: 32px;
+                box-sizing: border-box;
+                display: flex;
+                align-items: center;
+                border-radius: 20px;
+                color: #2199F8;
+                .share-icon {
+                    width: 12px;
+                    padding-right: 4px;
+                }
             }
         }
         .footer-r {