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

src/components/customHeader.vue

@@ -3,7 +3,7 @@
         <div class="back" @click="goback" v-if="!isClose">
             <el-icon class="icon" color="rgba(0, 0, 0, 0.9)"><ArrowLeftBold /></el-icon>
         </div>
-        <div class="close" @click="close" v-else>
+        <div class="close" @click="close" v-if="isClose && showClose">
             <el-icon class="icon" color="rgba(0, 0, 0, 0.9)"><CloseBold /></el-icon>
         </div>
         <div class="title">{{name}}</div>
@@ -31,6 +31,10 @@ const props = defineProps({
     isClose:{
         type:Boolean,
         defalut:false
+    },
+    showClose:{
+        type:Boolean,
+        defalut: true
     }
 })
 

src/components/popup/priceSheetPopup.vue

@@ -127,7 +127,7 @@
 
 <script setup>
 import { Popup } from "vant";
-import { ref, computed } from "vue";
+import { ref, computed, onActivated } from "vue";
 import { useRouter } from "vue-router";
 import wx from "weixin-js-sdk";
 import html2canvas from "html2canvas";
@@ -140,6 +140,11 @@ const contentEl = ref(null);
 const quotationData = ref({});
 const priceData = ref({});
 
+onActivated(() => {
+    console.log('onActivated', quotationData.value);
+    fetchPriceData()
+})
+
 // 处理后的处方列表（展平并匹配价格）
 const processedPrescriptionList = computed(() => {
     if (!quotationData.value?.prescriptionList || !Array.isArray(quotationData.value.prescriptionList)) {

src/views/old_mini/modify_work/completedWork.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="completed-work">
-        <custom-header name="农事详情"></custom-header>
+        <custom-header name="农事详情" :isClose="query?.hideBack ? true : false" :showClose="false"></custom-header>
         <div class="work-content">
             <div class="step-wrap" v-show="query.status !== 'warning'">
                 <farm-steps :currentStep="currentStep" />
@@ -260,7 +260,7 @@
                 <!-- <div class="fixed-btn expert">提醒农事确认</div> -->
                 
                 <div class="fixed-btn expert" v-if="detailData?.flowStatus == 4 && curRole == 0 && detailData?.executeEvidence?.length" @click="handleConfirmComplete">确认对方完成</div>
-                <div class="fixed-btn expert" v-if="detailData?.flowStatus == 4 && curRole == 0 && !detailData?.executeEvidence?.length">提醒对方执行</div>
+                <div class="fixed-btn expert" v-if="detailData?.flowStatus == 4 && curRole == 0 && !detailData?.executeEvidence?.length" @click="handleRemindExecute">提醒对方执行</div>
                 <div class="fixed-btn orange" v-if="detailData?.flowStatus == 1 && curRole == 0 && !query?.isAssign" @click="handleDemand">发起需求</div>
                 <div class="fixed-btn orange" v-if="detailData?.flowStatus == 2 && !(query?.farmWorkOrderId) && curRole == 0" @click="cancelDemand">取消发起</div>
                 <div class="fixed-btn" v-if="detailData?.flowStatus == 1 && curRole == 0 && !query?.isAssign" @click="handleOk">我已完成</div>
@@ -429,6 +429,13 @@ const handleConfirmComplete = () => {
     })
 };
 
+const handleRemindExecute = () => {
+    onlyShare.value = true;
+    setTimeout(() => {
+        uploadExecuteRef.value.showPopup({...parmasPage.value, type:'remindExecute'});
+    }, 10);
+}
+
 const handleForward = () => {
     onlyShare.value = true;
     setTimeout(() => {

src/views/old_mini/task_condition/components/task.vue

@@ -270,7 +270,7 @@ function toDetail(item) {
     if (activeIndex.value === 0) {
         router.push({
             path: "/modify_work",
-            query: { json: JSON.stringify({ id: item.id }) }
+            query: { id: item.id }
         });
     } else {
         router.push({

src/views/old_mini/task_condition/components/uploadExecute.vue

@@ -80,12 +80,24 @@ const onSelect = ({type}) => {
             ElMessage.warning('尚未绑定用户,暂时无法分享')
         }
     } else {
-        const img = JSON.parse(farmData.value.executeEvidence);
-        const imgUrl = base_img_url2 + img[img.length - 1];
-        const query = { askInfo: {title: "农事确认单", content: "是否分享该农事确认单给好友"}, shareText: farmData.value.farmWorkName + " 农事已完成，请您确认", id: farmData.value.id, farmWorkOrderId: farmData.value.orderId, postImg: imgUrl }
-        wx.miniProgram.navigateTo({
-            url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=priceSheet`,
-        });
+        if (farmData.value.type === 'quotation') {
+            const query = { askInfo: {title: "服务报价单", content: "是否分享该服务报价单给好友"}, shareText: "向您发送了一张 服务报价单", id: farmData.value.id, farmWorkOrderId: farmData.value.orderId, isAssign: true }
+            wx.miniProgram.navigateTo({
+                url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=priceSheet`,
+            });
+        } else if (farmData.value.type === 'remindExecute') {
+            const query = { askInfo: {title: "提醒执行", content: "是否分享该提示给好友"}, shareText: " 请您尽快执行" + farmData.value.farmWorkName + "农事", id: farmData.value.id, farmWorkOrderId: farmData.value.orderId }
+            wx.miniProgram.navigateTo({
+                url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=priceSheet`,
+            });
+        } else {
+            const img = JSON.parse(farmData.value.executeEvidence);
+            const imgUrl = base_img_url2 + img[img.length - 1];
+            const query = { askInfo: {title: "农事确认单", content: "是否分享该农事确认单给好友"}, shareText: farmData.value.farmWorkName + " 农事已完成，请您确认", id: farmData.value.id, farmWorkOrderId: farmData.value.orderId, postImg: imgUrl }
+            wx.miniProgram.navigateTo({
+                url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=priceSheet`,
+            });
+        }
     }
 };