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

src/components/popup/priceSheetPopup.vue

@@ -1,7 +1,7 @@
 <template>
     <popup class="price-sheet-popup" v-model:show="showPopup">
         <div class="price-sheet-content">
-            <div class="price-sheet-content-inner">
+            <div class="price-sheet-content-inner" ref="contentEl">
                 <!-- 顶部标题区域 -->
                 <div class="header-section">
                     <div class="header-left">
@@ -82,11 +82,11 @@
                                 <div class="detail-label">执行方式</div>
                             </div>
                             <div class="detail-item">
-                                <div class="detail-value">{{ (priceData?.farmWorkServiceCost + '元/亩') || '--元/亩' }}</div>
+                                <div class="detail-value">{{ (priceData?.farmWorkServiceCost ? priceData.farmWorkServiceCost + '元/亩' : '--') }}</div>
                                 <div class="detail-label">亩单价</div>
                             </div>
                             <div class="detail-item">
-                                <div class="detail-value">{{ quotationData?.area ? (quotationData?.area + '亩') : '--' }}</div>
+                                <div class="detail-value">{{ quotationData?.area ? (formatArea(quotationData?.area) + '亩') : '--' }}</div>
                                 <div class="detail-label">亩数</div>
                             </div>
                         </div>
@@ -112,7 +112,7 @@
                         </div>
                         <span class="btn-label">微信</span>
                     </div>
-                    <div class="action-btn orange-btn" @click.stop="handleSaveImage">
+                    <div class="action-btn orange-btn">
                         <div class="icon-circle">
                             <el-icon :size="24"><Download /></el-icon>
                         </div>
@@ -130,9 +130,11 @@ import { Popup } from "vant";
 import { ref, computed } from "vue";
 import { useRouter } from "vue-router";
 import wx from "weixin-js-sdk";
+import html2canvas from "html2canvas";
 
 const router = useRouter();
 const showPopup = ref(false);
+const contentEl = ref(null);
 
 // 报价数据
 const quotationData = ref({});
@@ -186,6 +188,12 @@ const processedPrescriptionList = computed(() => {
     return result;
 });
 
+function formatArea(val) {
+    const num = typeof val === 'number' ? val : parseFloat(val);
+    if (Number.isNaN(num)) return val;
+    return Number.isInteger(num) ? num : num.toFixed(2);
+}
+
 const handleShowPopup = (data) => {
     if (data) {
         quotationData.value = data;
@@ -217,15 +225,75 @@ const handleWechat = () => {
     //     path: "/completed_work",
     //     query: { id: quotationData.value.id, farmWorkOrderId: quotationData.value.orderId, isAssign: true },
     // });
-    const query = { 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 handleSaveImage = () => {
-    console.log("handleSaveImage");
+const handleSaveImage = async () => {
+    try {
+        if (!contentEl.value) return;
+        const element = contentEl.value;
+        const scroller = element.querySelector('.sheet-content');
+
+        // 记录原样式
+        const prev = {
+            elementOverflow: element.style.overflow,
+            elementMaxHeight: element.style.maxHeight,
+            elementHeight: element.style.height,
+            scrollerOverflow: scroller ? scroller.style.overflow : undefined,
+            scrollerMaxHeight: scroller ? scroller.style.maxHeight : undefined,
+            scrollerHeight: scroller ? scroller.style.height : undefined,
+        };
+
+        // 展开内容，去除滚动限制，确保截图包含全部内容
+        element.style.overflow = 'visible';
+        element.style.maxHeight = 'none';
+        element.style.height = 'auto';
+        if (scroller) {
+            scroller.style.overflow = 'visible';
+            scroller.style.maxHeight = 'none';
+            scroller.style.height = 'auto';
+        }
+
+        // 计算完整尺寸
+        const width = element.scrollWidth;
+        const height = element.scrollHeight;
+
+        const canvas = await html2canvas(element, {
+            backgroundColor: '#ffffff',
+            useCORS: true,
+            allowTaint: true,
+            scale: Math.min(2, window.devicePixelRatio || 2),
+            width,
+            height,
+            windowWidth: width,
+            windowHeight: height,
+            scrollX: 0,
+            scrollY: 0,
+        });
+        const dataUrl = canvas.toDataURL('image/png');
+        const link = document.createElement('a');
+        link.href = dataUrl;
+        link.download = '服务报价单.png';
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+
+        // 还原样式
+        element.style.overflow = prev.elementOverflow;
+        element.style.maxHeight = prev.elementMaxHeight;
+        element.style.height = prev.elementHeight;
+        if (scroller) {
+            scroller.style.overflow = prev.scrollerOverflow;
+            scroller.style.maxHeight = prev.scrollerMaxHeight;
+            scroller.style.height = prev.scrollerHeight;
+        }
+    } catch (e) {
+        console.error('保存图片失败', e);
+    }
 };
 
 const handleEdit = () => {

src/views/old_mini/price_detail/index.vue

@@ -243,13 +243,14 @@ const confirmPrice = () => {
         servicePrice: servicePricePerMu.value,
         executionMethod: executionMethod.value,
     };
-    console.log('confirmPrice payload =>', payload);
-    VE_API.z_farm_work_record.acceptFarmWorkRecord(payload).then(({ data }) => {
-        if (data) {
+    VE_API.z_farm_work_record.acceptFarmWorkRecord(payload).then(({ data, code, msg }) => {
+        if (code === 0) {
             ElMessage.success("确认报价成功");
             router.push({
                 path: "/task_condition",
             });
+        } else {
+            ElMessage.error(msg);
         }
     })
 }

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

@@ -80,7 +80,9 @@ const onSelect = ({type}) => {
             ElMessage.warning('尚未绑定用户,暂时无法分享')
         }
     } else {
-        const query = { shareText: farmData.value.farmWorkName + " 农事已完成，请您确认", id: farmData.value.id, farmWorkOrderId: farmData.value.orderId, postImg:  base_img_url2 + farmData.value.executeEvidence[farmData.value.executeEvidence.length - 1] }
+        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`,
         });