瀏覽代碼

fix: 转发

lxf 2 天之前
父節點
當前提交
13520399fb

+ 5 - 1
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
     }
 })
 

+ 1 - 1
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" />

+ 14 - 6
src/views/old_mini/task_condition/components/uploadExecute.vue

@@ -76,12 +76,20 @@ const onSelect = ({type}) => {
     if(type === 'birdseye') {
         router.push(`/chat_frame?userId=${farmData.value.farmMiniUserId}&name=${farmData.value.farmMiniUserName}&farmId=${farmData.value.farmId}&pageParams=${JSON.stringify(farmData.value)}`);
     } 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 {
+            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 }
+            alert('qqq', query)
+            wx.miniProgram.navigateTo({
+                url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=priceSheet`,
+            });
+        }
     }
 };