wangsisi 1 неделя назад
Родитель
Сommit
8163803980

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

@@ -27,7 +27,7 @@ import customHeader from "@/components/customHeader.vue";
 const route = useRoute();
 const store = useStore();
 const tabBarHeight = computed(() => store.state.home.tabBarHeight);
-const active = ref(0);
+const active = ref(route.query.active ? 1 : 0);
 
 const type = ref(route.query.type);
 

+ 18 - 16
src/views/old_mini/home/index.vue

@@ -122,24 +122,26 @@ const handleCardClick = (card) => {
         }
     }
     if (card.route === "/pest") {
-        if (curRole == 2) {
-            ElMessage.warning("该功能正在升级中,敬请期待");
-        } else {
-            const dropdownGardenItem = ref({
-                organId: 766,
-                periodId: 1,
-                wktVal: "wktVal",
-                address: "address",
-                district: "district",
-                name: "荔博园",
-            });
-            wx.miniProgram.navigateTo({
-                url: `/pages/subPages/new_recognize/index?gardenData=${JSON.stringify(dropdownGardenItem.value)}`,
-            });
-        }
+        ElMessage.warning("该功能正在升级中,敬请期待");
+        // if (curRole == 2) {
+        //     ElMessage.warning("该功能正在升级中,敬请期待");
+        // } else {
+        //     const dropdownGardenItem = ref({
+        //         organId: 766,
+        //         periodId: 1,
+        //         wktVal: "wktVal",
+        //         address: "address",
+        //         district: "district",
+        //         name: "荔博园",
+        //     });
+        //     wx.miniProgram.navigateTo({
+        //         url: `/pages/subPages/new_recognize/index?gardenData=${JSON.stringify(dropdownGardenItem.value)}`,
+        //     });
+        // }
     } else {
         if (card.route === "/chat_frame") {
-            router.push(`/chat_frame?userId=${expertInfo.value.appUserId}`);
+            router.push("/agri_services?active=1");
+            // router.push(`/chat_frame?userId=${expertInfo.value.appUserId}`);
         } else {
             router.push(card.route);
         }

+ 6 - 4
src/views/old_mini/monitor/subPages/plan.vue

@@ -116,6 +116,7 @@ import { useRouter, useRoute } from "vue-router";
 import detailDialog from "@/components/detailDialog.vue";
 import eventBus from "@/api/eventBus";
 import activeUploadPopup from "@/components/popup/activeUploadPopup.vue";
+import { ElMessage } from "element-plus";
 import { SuccessFilled, WarningFilled } from "@element-plus/icons-vue";
 const router = useRouter();
 const route = useRoute();
@@ -221,10 +222,11 @@ const getFarmWorkPlan = () => {
 const isDefaultEnabled = ref(true);
 // 新增农事
 const addNewTask = () => {
-    router.push({
-        path: "/modify_work",
-        query: { data: JSON.stringify(["生长异常"]), gardenId: 766, isAdd: true },
-    });
+    ElMessage.warning("该功能正在升级中,敬请期待");
+    // router.push({
+    //     path: "/modify_work",
+    //     query: { data: JSON.stringify(["生长异常"]), gardenId: 766, isAdd: true },
+    // });
 };
 
 const triggerFarmWork = () => {