Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-farm-h5

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);
 

src/views/old_mini/home/components/AgriculturalDynamics.vue

@@ -26,7 +26,7 @@
                     </div>
                     <div class="item-content">
                         <div class="item-text van-multi-ellipsis--l2">{{ item.title }}</div>
-                        <div class="item-date">{{ item.createTime.slice(0, 10)  }}</div>
+                        <div class="item-date">{{ item.createTime && item.createTime.slice(0, 10)  }}</div>
                     </div>
                 </div>
             </div>
@@ -43,7 +43,7 @@
                         <div class="expert-details">
                             <span class="expert-name">{{ item.name }}</span>
                             <span class="expert-title">{{ item.belongEnterprise }}</span>
-                            <span class="qa-date">{{ item.createTime.slice(0, 10) }}</span>
+                            <span class="qa-date">{{ item.createTime && item.createTime.slice(0, 10) }}</span>
                         </div>
                     </div>
                     <div class="answer-content" v-html="item.content"></div>

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);
         }

src/views/old_mini/mine/index.vue

@@ -13,7 +13,7 @@
                         <span v-else>{{ userInfo?.name }}</span>
                         <span class="score" v-if="curRole !== 0">5.0分</span>
                     </div>
-                    <div class="user-day">这是您使用飞鸟有味的第15天</div>
+                    <div class="user-day">这是您使用飞鸟管家的第15天</div>
                 </div>
             </div>
             <div class="code-icon" v-if="curRole === 1">

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 = () => {

src/views/old_mini/report_detail/index.vue

@@ -207,7 +207,7 @@ const shareReport = () => {
         farmId: farmId.value,
         targetUrl: `farm_report`,
         goBack: true,
-        imageUrl: 'https://birdseye-img.sysuimars.com/birdseye-look-mini/share-lz-bg.png',
+        imageUrl: 'https://birdseye-img.sysuimars.com/birdseye-look-mini/share-report-bg.png',
     };
     wx.miniProgram.navigateTo({
         url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,