lxf пре 4 дана
родитељ
комит
afd173b0bb

BIN
src/assets/img/home/qrcode.png


+ 16 - 5
src/components/popup/priceSheetPopup.vue

@@ -162,11 +162,12 @@ const pageImg = ref(null);
 // 报价数据
 const quotationData = ref({});
 const priceData = ref({});
-
+const queryData = ref({});
 onActivated(() => {
     if (ids.value?.id) {
         getDetail();
     }
+    queryData.value = route.query?.miniJson ? JSON.parse(route.query?.miniJson) : {};
 })
 
 const getTotal = (item) => {
@@ -312,10 +313,21 @@ const handleWechat = async () => {
     //     path: "/completed_work",
     //     query: { id: quotationData.value.id, farmWorkOrderId: quotationData.value.orderId, isAssign: true },
     // });
-    const query = { askInfo: {title: "服务报价单", content: "是否分享该服务报价单给好友"}, shareText: "向您发送了一张 服务报价单", id: quotationData.value.id, farmWorkOrderId: quotationData.value.orderId, isAssign: true }
+    // const query = { askInfo: {title: "服务报价单", content: "是否分享该服务报价单给好友"}, shareText: "向您发送了一张 服务报价单", id: quotationData.value.id, farmWorkOrderId: quotationData.value.orderId, isAssign: true }
+
+    // wx.miniProgram.navigateTo({
+    //     url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=priceSheet`,
+    // });
 
+    const query = {
+        askInfo: { title: "服务报价单", content: "是否分享该服务报价单给好友" },
+        shareText: "向您发送了一张 服务报价单",
+        targetUrl: `detail_work`,
+        paramsPage: JSON.stringify({ id: ids.value.id, arrangeId: queryData.value.arrangeId, farmId: ids.value.farmId, goBack: true }),
+        imageUrl: 'https://birdseye-img.sysuimars.com/temp/price.png',
+    };
     wx.miniProgram.navigateTo({
-        url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=priceSheet`,
+        url: `/pages/subPages/share_page/index?pageParams=${JSON.stringify(query)}&type=sharePage`,
     });
 };
 
@@ -423,14 +435,13 @@ const handleEdit = () => {
     }
     // 编辑报价逻辑
     // 可以触发编辑事件或打开编辑页面
-    const queryData = route.query?.miniJson ? JSON.parse(route.query?.miniJson) : {};
     router.push({
         path: "/modify",
         query: {
             isEdit: true,
             onlyPrice: true,
             farmId: priceData.value.farm.id,
-            arrangeId: queryData.arrangeId,
+            arrangeId: queryData.value.arrangeId,
             farmWorkId: priceData.value.id,
         },
     });

+ 22 - 4
src/views/old_mini/modify_work/detailWork.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="completed-work">
-        <custom-header name="农事详情" :isClose="query?.hideBack ? true : false" :showClose="false"></custom-header>
+        <custom-header name="农事详情" :showClose="false" isGoBack @goback="handleClose"></custom-header>
         <div class="work-content">
             <div
                 class="content-status"
@@ -117,7 +117,7 @@
                                                         {{ totalCost ? formatArea(totalCost) : "--" }}</span
                                                     >元
                                                 </div>
-                                                <div class="show-price-btn" @click="showPriceSheetPopup">生成报价单</div>
+                                                <div class="show-price-btn" v-if="curRole == 2" @click="showPriceSheetPopup">生成报价单</div>
                                             </div>
                                         </div>
                                     </template>
@@ -131,7 +131,7 @@
                     </div>
                 </div>
             </div>
-            <div class="work-wrap info-wrap">
+            <div class="work-wrap" :class="{ 'info-wrap': curRole == 2 }">
 
                 <div class="box-wrap farm-data">
                     <div class="card-title">
@@ -223,7 +223,7 @@
 
 
             <!-- 农资,步骤:农事已确认 -->
-            <div class="fixed-btn-wrap">
+            <div class="fixed-btn-wrap" v-if="curRole == 2">
                 <div class="fixed-btn second" @click="editPrice">编辑报价</div>
                 <div class="fixed-btn" @click="handleTimelineAction">转入农事任务</div>
             </div>
@@ -394,6 +394,13 @@ const speciesList = computed(() => toList(detailData.value?.agricultural?.servic
 const equipmentList = computed(() => toList(detailData.value?.agricultural?.serviceEquipment));
 onActivated(async () => {
     query.value = useRoute().query?.miniJson ? JSON.parse(useRoute().query?.miniJson) : {};
+    if (query.value?.paramsPage) {
+        const data = JSON.parse(query.value.paramsPage);
+        query.value.id = data.id;
+        query.value.farmId = data.farmId;
+        query.value.arrangeId = data.arrangeId;
+        query.value.goBack = true;
+    }
     const id = query.value?.id;
     if (id) {
         await getDetail();
@@ -497,6 +504,17 @@ const getPriceList = async (schemeId, pesticideFertilizerCodes) => {
         item.brand = priceInfo.brand ?? item.brand;
     });
 };
+
+const handleClose = () => {
+    if(query.value.goBack){
+        router.replace({
+            path: "/home",
+        });
+    }else{
+        router.back();
+    }
+};
+
 </script>
 
 <style lang="scss" scoped>