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

src/views/old_mini/agri_services/components/farmDynamics.vue

@@ -90,7 +90,7 @@
     <review-upload-popup v-model="showUpload" :record-id="sectionId" @success="getContentData" />
 </template>
 <script setup>
-import { ref, onActivated } from "vue";
+import { ref, onActivated ,onMounted} from "vue";
 import recordItem from "@/components/recordItem.vue";
 import tabList from "@/components/pageComponents/TabList.vue";
 import { Popup, Empty } from "vant";
@@ -212,6 +212,10 @@ const handlePlanClick = (value) => {
     getContentData();
 };
 
+onMounted(() => {
+    getContentData();
+});
+
 onActivated(() => {
     getContentData();
 });

src/views/old_mini/chat_frame/index.vue

@@ -34,7 +34,7 @@ onActivated(() => {
 
 function headerCallBack() {
     const page = sessionStorage.getItem('chat_frame_page');
-    console.log("page", page);
+    console.log('page', page);
     if(page === 'messageList') {
         VE_API.bbs.readUpdate({ targetUserId: userIdVal.value, farmId: route.query.farmId }).then((res) => {
             if (res.code === 0) {

src/views/old_mini/mine/index.vue

@@ -170,7 +170,7 @@ const cellItems = computed(() => {
         return [
             {
                 title: "我的消息",
-                path: "/message_list",
+                path: "/message_list?from=mine",
             },
             {
                 title: "农事方案",

src/views/old_mini/modify_work/completedWork.vue

@@ -552,6 +552,7 @@ const handleConfirmComplete = () => {
 
 const handleRemindExecute = () => {
     onlyShare.value = true;
+    parmasPage.value.farmMiniUserId = orderObj.value.agriculturalUserId;
     setTimeout(() => {
         uploadExecuteRef.value.showPopup({ ...parmasPage.value, type: "remindExecute" });
     }, 10);
@@ -583,7 +584,10 @@ const showUploadExecutePopup = () => {
         onlyShare.value = false;
     }
     setTimeout(() => {
-        uploadExecuteRef.value.showPopup(parmasPage.value);
+        console.log('parmasPage.value', parmasPage.value);
+        if(parmasPage.value.farmMiniUserId){
+            uploadExecuteRef.value.showPopup(parmasPage.value);
+        }
     }, 10);
 };
 
@@ -599,6 +603,8 @@ const toList = (val) => {
     if (!val) return [];
     return JSON.parse(val);
 };
+const orderObj = ref({});
+
 const speciesList = computed(() => toList(quotationData.value.serviceSpecies));
 const equipmentList = computed(() => toList(quotationData.value.serviceEquipment));
 onActivated(async () => {
@@ -613,7 +619,6 @@ onActivated(async () => {
     }
     parmasPage.value = {
         farmMiniUserId: curRole.value == 2 ? detailData.value.farmMiniUserId : detailData.value.users[0]?.userId,
-        farmMiniUserName: curRole.value == 2 ? detailData.value.farmMiniUserName : detailData.value.expertUserName,
         farmWorkOrderId: detailData.value.orderId,
         farmId: detailData.value.farmId,
         executeEvidence: JSON.stringify(detailData.value.executeEvidence),
@@ -631,6 +636,7 @@ onActivated(async () => {
         } else {
             const { data } = await VE_API.z_farm_work_record_cost.listByOrderId({ farmWorkOrderId });
             priceDataObj = data[0];
+            orderObj.value = data[0];
         }
         if (priceDataObj && Object.keys(priceDataObj).length > 0) {
             // 合并外层字段

src/views/old_mini/monitor/index.vue

@@ -397,7 +397,7 @@ function handlePage(url) {
         farmId: gardenId.value,
     }
     if(url === '/message_list') {
-        query.from = 'monitor';
+        query.from = route.query.from || 'monitor';
     }
     router.push({
         path: url,