4
0

2 Commits 6c4434091b ... af5459d556

Autor SHA1 Nachricht Datum
  刘秀芳 af5459d556 Merge branch 'supplies' of http://www.sysuimars.cn:3000/feiniao/feiniao-farm-h5 into supplies vor 9 Stunden
  刘秀芳 8401044cee fix: 农事详情 vor 9 Stunden
2 geänderte Dateien mit 111 neuen und 93 gelöschten Zeilen
  1. 20 2
      src/views/old_mini/home/index.vue
  2. 91 91
      src/views/old_mini/work_detail/index.vue

+ 20 - 2
src/views/old_mini/home/index.vue

@@ -24,7 +24,7 @@
                 <div class="farm-header-left">
                     <div class="farm-title">
                         <span>{{ farmInfo.name }}</span>
-                        <div class="title-tags">
+                        <div class="title-tags" @click="handleTitleTagClick(farmInfo.id)">
                             <div class="title-tag tag-danger">
                                 <span>干旱预警</span>
                                 <el-icon>
@@ -46,7 +46,7 @@
                         <div class="title-tag">水稻</div>
                     </div>
                 </div>
-                <div class="farm-invite">邀请互动</div>
+                <div class="farm-invite" @click="handleInviteClick(farmInfo.id)">邀请互动</div>
             </div>
             <div v-else class="farm-content-grid">
                 <div class="title-tags">
@@ -151,6 +151,7 @@ const options = [
 ]
 
 const farmInfo = ref({
+    id: 98113,
     name: "从化荔博园合作社",
     address: "广东省广州市从化区某某街道",
 });
@@ -219,6 +220,23 @@ const handleBlockClick = (block,label) => {
 const handleMoreClick = () => {
     router.push("/farm_details");
 };
+
+const handleTitleTagClick = (farmId) => {
+    router.push(`/weather_detail?farmId=${farmId}`);
+};
+
+const handleInviteClick = (farmId) => {
+    const query = {
+        askInfo: { title: "农情互动", content: "是否分享该互动给好友" },
+        shareText: '邀请您农情互动,精准匹配种植方案',
+        targetUrl: `interaction`,
+        paramsPage: JSON.stringify({ farmId: farmId }),
+        imageUrl: 'https://birdseye-img.sysuimars.com/birdseye-look-mini/work_cover.png',
+    };
+    wx.miniProgram.navigateTo({
+        url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,
+    });
+};
 </script>
 
 <style scoped lang="scss">

+ 91 - 91
src/views/old_mini/work_detail/index.vue

@@ -245,95 +245,95 @@ const detail = ref({
     "isPublic": null,
     "users": [],
     "groupList": [
-        {
-            "name": "蒂蛀虫防治",
-            "tagType": 1,
-            "cropAlbum": [
-                {
-                    "filename": "6e707c1f-7095-409e-8b3a-2633e7b36bd5/1e2dc0e7-6f8b-4952-a574-8e8e0713529c/DJI_202601251415_001_1e2dc0e7-6f8b-4952-a574-8e8e0713529c/DJI_20260125141713_0003_V_code-ws0gefwtn5n4.jpeg"
-                },
-                {
-                    "filename": "dfb387fa-e7d3-4f49-a40c-fcbb9be2baf9/c727d4e9-f5bb-4e40-be2d-efdec3b91702/DJI_202511270800_001_c727d4e9-f5bb-4e40-be2d-efdec3b91702/DJI_20251127080720_0056_V_code-ws0gefyb37kp.jpeg"
-                }
-            ],
-            "pesticideList": [
-                {
-                    "code": "1009",
-                    "name": "化学水溶肥",
-                    "typeName": "氮肥",
-                    "params": [
-                        {
-                            "dosage": "50",
-                            "executionMethod": 1,
-                            "ratio": "30000",
-                            "remark": "飞行参数设置为***,飞行速度设置为飞行参数设置为***,飞行速度设置为"
-                        },
-                        {
-                            "dosage": "21",
-                            "executionMethod": 2,
-                            "ratio": "221",
-                            "remark": "rengong"
-                        },
-                        {
-                            "dosage": "11",
-                            "executionMethod": 3,
-                            "ratio": "111",
-                            "remark": "dimian"
-                        }
-                    ]
-                },
-                {
-                    "code": "1010",
-                    "name": "化学水溶肥2",
-                    "typeName": "营养",
-                    "params": [
-                        {
-                            "dosage": "0.5",
-                            "executionMethod": 1,
-                            "ratio": "30000",
-                            "remark": "zhibaoji"
-                        },
-                        {
-                            "dosage": "22",
-                            "executionMethod": 2,
-                            "ratio": "222",
-                            "remark": "rengong"
-                        },
-                        {
-                            "dosage": "12",
-                            "executionMethod": 3,
-                            "ratio": "112",
-                            "remark": "dimian"
-                        }
-                    ]
-                },
-                {
-                    "code": "1011",
-                    "name": "化学水溶肥3",
-                    "typeName": "营养",
-                    "params": [
-                        {
-                            "dosage": "60",
-                            "executionMethod": 1,
-                            "ratio": "30000",
-                            "remark": "zhibaoji"
-                        },
-                        {
-                            "dosage": "23",
-                            "executionMethod": 2,
-                            "ratio": "223",
-                            "remark": "rengong"
-                        },
-                        {
-                            "dosage": "13",
-                            "executionMethod": 3,
-                            "ratio": "113",
-                            "remark": "dimian"
-                        }
-                    ]
-                }
-            ],
-        },
+        // {
+        //     "name": "蒂蛀虫防治",
+        //     "tagType": 1,
+        //     "cropAlbum": [
+        //         {
+        //             "filename": "6e707c1f-7095-409e-8b3a-2633e7b36bd5/1e2dc0e7-6f8b-4952-a574-8e8e0713529c/DJI_202601251415_001_1e2dc0e7-6f8b-4952-a574-8e8e0713529c/DJI_20260125141713_0003_V_code-ws0gefwtn5n4.jpeg"
+        //         },
+        //         {
+        //             "filename": "dfb387fa-e7d3-4f49-a40c-fcbb9be2baf9/c727d4e9-f5bb-4e40-be2d-efdec3b91702/DJI_202511270800_001_c727d4e9-f5bb-4e40-be2d-efdec3b91702/DJI_20251127080720_0056_V_code-ws0gefyb37kp.jpeg"
+        //         }
+        //     ],
+        //     "pesticideList": [
+        //         {
+        //             "code": "1009",
+        //             "name": "化学水溶肥",
+        //             "typeName": "氮肥",
+        //             "params": [
+        //                 {
+        //                     "dosage": "50",
+        //                     "executionMethod": 1,
+        //                     "ratio": "30000",
+        //                     "remark": "飞行参数设置为***,飞行速度设置为飞行参数设置为***,飞行速度设置为"
+        //                 },
+        //                 {
+        //                     "dosage": "21",
+        //                     "executionMethod": 2,
+        //                     "ratio": "221",
+        //                     "remark": "rengong"
+        //                 },
+        //                 {
+        //                     "dosage": "11",
+        //                     "executionMethod": 3,
+        //                     "ratio": "111",
+        //                     "remark": "dimian"
+        //                 }
+        //             ]
+        //         },
+        //         {
+        //             "code": "1010",
+        //             "name": "化学水溶肥2",
+        //             "typeName": "营养",
+        //             "params": [
+        //                 {
+        //                     "dosage": "0.5",
+        //                     "executionMethod": 1,
+        //                     "ratio": "30000",
+        //                     "remark": "zhibaoji"
+        //                 },
+        //                 {
+        //                     "dosage": "22",
+        //                     "executionMethod": 2,
+        //                     "ratio": "222",
+        //                     "remark": "rengong"
+        //                 },
+        //                 {
+        //                     "dosage": "12",
+        //                     "executionMethod": 3,
+        //                     "ratio": "112",
+        //                     "remark": "dimian"
+        //                 }
+        //             ]
+        //         },
+        //         {
+        //             "code": "1011",
+        //             "name": "化学水溶肥3",
+        //             "typeName": "营养",
+        //             "params": [
+        //                 {
+        //                     "dosage": "60",
+        //                     "executionMethod": 1,
+        //                     "ratio": "30000",
+        //                     "remark": "zhibaoji"
+        //                 },
+        //                 {
+        //                     "dosage": "23",
+        //                     "executionMethod": 2,
+        //                     "ratio": "223",
+        //                     "remark": "rengong"
+        //                 },
+        //                 {
+        //                     "dosage": "13",
+        //                     "executionMethod": 3,
+        //                     "ratio": "113",
+        //                     "remark": "dimian"
+        //                 }
+        //             ]
+        //         }
+        //     ],
+        // },
         {
             "name": "蒂蛀虫防治",
             "tagType": 0,
@@ -499,9 +499,9 @@ const handleConvert = () => {
     const query = {
         askInfo: { title: "农情互动", content: "是否分享该互动给好友" },
         shareText: '邀请您农情互动,精准匹配种植方案',
-        targetUrl: `interaction`,
+        targetUrl: `work_detail`,
         paramsPage: JSON.stringify({ id: detail.value.id }),
-        imageUrl: 'https://birdseye-img.sysuimars.com/birdseye-look-mini/work_cover.png',
+        imageUrl: 'https://birdseye-img.sysuimars.com/birdseye-look-mini/work_img.png',
     };
     wx.miniProgram.navigateTo({
         url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,