feat：修改bug

src/components/pageComponents/FarmInfoCard.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="farm-info-card" :class="{ 'has-footer': showFooter }" @click="handleClick">
         <div class="item-content">
-            <div class="item-left">
+            <div class="item-left" :style="{ width: data.maxWidth ? 'calc(100% - 80px)' : '100%' }">
                 <img class="map-img" :src="data.mapImage || '/map.png'" alt="地图" />
                 <div class="item-info">
                     <div class="item-header">

src/components/popup/activeUploadPopup.vue

@@ -18,6 +18,7 @@
                     style="width: 100%"
                     type="date"
                     placeholder="请选择日期"
+                    :editable="false"
                 />
             </div>
         </div>
@@ -154,6 +155,11 @@ onUnmounted(() => {
         }
         .date-input {
             margin: 12px 0;
+            ::v-deep {
+                .el-input__inner {
+                    caret-color: transparent;
+                }
+            }
         }
     }
     .tips-text {

src/views/old_mini/mine/pages/serviceRecords.vue

@@ -100,6 +100,8 @@ const areaOptions = [
     }
     .record-list {
         padding: 6px 12px;
+        height: calc(100vh - 100px);
+        overflow: auto;
     }
 }
 </style>

src/views/old_mini/monitor/index.vue

@@ -136,9 +136,8 @@ const weatherInfoRef = ref(null);
 onActivated(() => {
     // 用来接收小程序页面跳转的内容和逻辑
     if (route.query.miniJson) {
-        localStorage.setItem("showSuccess", true);
         const json = JSON.parse(route.query.miniJson);
-        if (json.showSuccess) {
+        if (json.showSuccess && json.receiveUserId!=null) {
             receiveFarm(json);
         }
     }
@@ -167,9 +166,12 @@ const receiveFarm = (json) => {
                 showFarmPopup.value = true;
                 textPopup.value = "农场领取成功";
                 defaultGardenId.value = json.farmId;
+                localStorage.setItem('isGarden', true);
             } else {
                 ElMessage.warning(res.msg);
             }
+            // 清空路由参数
+            router.replace({ path: route.path });
         });
 };
 
@@ -376,6 +378,7 @@ const weatherExpanded = (isExpandedValue) => {
 
 const gardenId = ref(store.state.home.gardenId);
 const changeGarden = ({ id }) => {
+    localStorage.setItem('isGarden', true);
     gardenId.value = id;
     // 更新 store 中的状态
     store.commit("home/SET_GARDEN_ID", id);

src/views/old_mini/user/farmDetails.vue

@@ -117,7 +117,7 @@
         </div>
         <div class="custom-bottom-fixed-btns">
             <div class="bottom-btn secondary-btn" @click="handleShareFarm">分享农场</div>
-            <div class="bottom-btn primary-btn">在线沟通</div>
+            <div class="bottom-btn primary-btn" @click="handleChatFarm">在线沟通</div>
         </div>
     </div>
     <fn-share-sheet v-model:show="showShare" @select="onSelect" :options="[{ name: '微信', icon: 'wechat' }]" />
@@ -139,6 +139,7 @@ import recordItem from "@/components/recordItem.vue";
 import farmInfoPopup from "../home/components/farmInfoPopup.vue";
 import FnShareSheet from "@/components/pageComponents/FnShareSheet.vue";
 import config from "@/api/config";
+import { ElMessage } from "element-plus";
 const router = useRouter();
 const route = useRoute();
 const activeTab = ref(0);
@@ -231,11 +232,21 @@ const handleShareFarm = () => {
     showShare.value = true;
 };
 
+const handleChatFarm = () => {
+    if(route.query.receiveUserId != 'null'){
+        router.push(`/chat_frame?userId=${route.query.receiveUserId}&name=${farmDetail.value.name}&farmId=${farmIdVal.value}`);
+    }else{
+        ElMessage.warning('尚未绑定用户,暂时无法沟通');
+    }
+};
+
 const onSelect = () => {
     const query = {
         agriculturalStoreId: route.query.agriculturalStoreId,
         farmId: route.query.farmId,
         speciesName: farmDetail.value.speciesName,
+        containerId: farmDetail.value.containerId,
+        receiveUserId: route.query.receiveUserId,
     };
     wx.miniProgram.navigateTo({
         url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=shareFarm`,

src/views/old_mini/user/index.vue

@@ -116,6 +116,7 @@ const onSelect = () => {
         agriculturalStoreId: shareData.value.agriculturalStoreId,
         farmId: shareData.value.id,
         speciesName: shareData.value.speciesName,
+        containerId: shareData.value.containerId,
     };
     wx.miniProgram.navigateTo({
         url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=shareFarm`,
@@ -135,7 +136,7 @@ const handleChat = (data) => {
 
 // 处理列表项点击
 const handleItemClick = (data) => {
-    router.push(`/farm_details?farmId=${data.id}&agriculturalStoreId=${data.agriculturalStoreId}`);
+    router.push(`/farm_details?farmId=${data.id}&agriculturalStoreId=${data.agriculturalStoreId}&receiveUserId=${data.receiveUserId}`);
 };
 </script>