增加获取跟进记录

pages/orderDetailNew/components/orderDetailNewView.vue

@@ -5,7 +5,8 @@
             <pageOne @handleNextClick="handleNextClick" :orderDetail="detail" :orderId="orderId" />
         </view>
         <view class="page-item" v-show="activeIndex === 1">
-            <pageTwo @handleNextClick="handleNextClick" :orderDetail="detail" :orderId="orderId" />
+            <pageTwo @handleNextClick="handleNextClick" :orderDetail="detail" :orderId="orderId"
+                :followUpList="followUpList" />
         </view>
         <view class="page-item" v-show="activeIndex === 2">
             <pageThree @handleNextClick="handleNextClick" :orderDetail="detail" @handleNeedSave="handleNeedSave"
@@ -64,6 +65,10 @@ export default {
             fileIds: '',
             //收件信息page4
             receiptList: [],
+            //订单细节
+            orderDetail: {},
+            // 跟进记录
+            followUpList: {},
         }
     },
     name: 'OrderDetailNewView',
@@ -74,7 +79,17 @@ export default {
                     this.fetchReceiptList();
                 }
             }, immediate: true
+        },
+        detail: {
+            handler(newVal) {
+                if (newVal) {
+                    this.orderDetail = newVal;
+                    this.getFollowUpList();
+                }
+            },
+            deep: true,
         }
+
     },
     methods: {
         handleNextClick({ nowPage, form }) {
@@ -233,6 +248,18 @@ export default {
                 uni.$u.toast("获取收单列表失败");
             }
         },
+
+        //获取跟进记录
+        async getFollowUpList() {
+            try {
+                const res = await uni.$u.api.getDuplicateOrderFollowListByClueId({ clueId: this.orderDetail.clueId });
+                console.log('这里是跟进记录', res)
+                this.followUpList = res.data || [];
+            } catch (error) {
+                console.error("获取跟进记录失败:", error);
+                uni.$u.toast("获取跟进记录失败");
+            }
+        }
     },
 
 }

pages/orderDetailNew/components/pageTwo.vue

@@ -32,7 +32,7 @@
                             type="textarea" placeholder="请输入拍图技巧" rows="3" class="checklist-textarea" />
                         <!-- 上传图片按钮 -->
                         <view v-if="selectedCheckbox.includes('photo技巧')" class="upload-btn-container">
-                            <div class="upload-btn" @click="chooseImage('photoTips')">
+                            <div class="upload-btn" @click="getImageUrl('')">
                                 <u-icon name="camera" size="32rpx" color="#108cff"></u-icon>
                                 <text class="upload-btn-text">上传图片</text>
                             </div>
@@ -55,7 +55,7 @@
                             type="textarea" placeholder="请输入备注信息" rows="3" class="checklist-textarea" />
                         <!-- 上传图片按钮 -->
                         <view v-if="selectedCheckbox.includes('face2face')" class="upload-btn-container">
-                            <div class="upload-btn" @click="chooseImage('face2face')">
+                            <div class="upload-btn" @click="getImageUrl('')">
                                 <u-icon name="camera" size="32rpx" color="#108cff"></u-icon>
                                 <text class="upload-btn-text">上传图片</text>
                             </div>
@@ -141,6 +141,10 @@ export default {
         orderId: {
             type: String,
             default: '',
+        },
+        followUpList: {
+            type: Object,
+            default: () => { },
         }
     },
     watch: {
@@ -152,7 +156,8 @@ export default {
                 }
             },
             deep: true,
-        }
+        },
+
     },
 
     components: {
@@ -179,7 +184,7 @@ export default {
 
             detailImages: [],// 高清细节图数组
             // 绑定订单相关
-            bindList: [] // 待绑定的图片列表
+            bindList: [],// 待绑定的图片列表,
         };
     },
     methods: {
@@ -249,7 +254,6 @@ export default {
 
 
 
-
     }
 };
 </script>

pages/orderDetailNew/mixin/imgUploadAndDownLoad.js

@@ -85,7 +85,6 @@ export default {
                 console.log('当前上传的图片类型是', p)
                 const res = await Promise.all(filePaths.map(filePath => this.uploadFile(filePath, p)));
 
-                // 绑定
                 this.bindOrder(p);
 
                 this.getList('2', '1');
@@ -138,5 +137,30 @@ export default {
             // 清空待绑定的图片列表
             this.bindList = [];
         },
+        //选择图图片》上传》返回路径,适用于page2选项里面的上传图片
+        // getImageUrl() {
+        //     uni.chooseImage({
+        //         count: 9, // 最多选择1张
+        //         sizeType: ['compressed'], // 压缩图片
+        //         sourceType: ['album', 'camera'], // 从相册选择或拍照
+        //         success: async (res) => {
+        //             const tempFilePath = res.tempFilePaths
+        //             console.log('上传的图片路径:', tempFilePath)
+        //             // 把blob数组上传到服务器，然后返回路径
+        //             try {
+        //                 const res = await Promise.all(tempFilePath.map(filePath => uni.$u.api.uploadFile(filePath)));
+        //                 console.log('上传的图片路径数组是:', res.map(item => item.data.fileUrl))
+        //                 // 把数组返回给调用者
+        //                 return res.map(item => item.data.fileUrl)
+        //             } catch (error) {
+        //                 console.error('上传失败:', error);
+        //                 uni.$u.toast('上传失败');
+        //             }
+        //         },
+        //         fail: (err) => {
+        //             console.error('选择图片失败:', err)
+        //         }
+        //     })
+        // }
     }
 }