增加page2师傅拍图技巧练习师傅等和page4的物流图片上传和回写

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" :followUpList="followUpList" />
+            <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"
@@ -182,8 +183,8 @@ export default {
             }
         },
         //确认入库
-        confirmInterStore({ warehouseInfo, profitSharingList }) {
-            console.log(warehouseInfo, profitSharingList)
+        confirmInterStore({ warehouseInfo }) {
+            console.log(warehouseInfo)
             const paramsInterStore = {
                 "searchValue": this.detail.searchValue,
                 "createBy": this.detail.createBy,
@@ -208,10 +209,10 @@ export default {
                 // "totalCost": "60230.00",   // 成本合计 =   运费 + 好处费 + 查码费 + 表款(支付总额) + 维修费。
                 "sellingPrice": this.topInfo.price.replace(/,/g, ''),   //实际价格（售价）顶上tab里面的第三栏
                 // "performance": "29772.00",  //sellingPrice - totalCost
-                "receiptRemark": warehouseInfo.remarks,//"收单之后还需再跟进", 先不传
+                "receiptRemark": warehouseInfo.remarks + ';' + warehouseInfo.uploadedImage || '',//"收单之后还需再跟进", 先不传
                 "repairAmount": warehouseInfo.repairAmount || '', //维修总金额 ，先不传
                 "grossPerformance": warehouseInfo.grossPerformance || '',   //毛利 performance*splitRatio
-                "expressOrderNo": warehouseInfo.expressOrderNo || '',   //快递单号+后续加上一个键加上图url
+                "expressOrderNo": warehouseInfo.expressOrderNo,   //快递单号+后续加上一个键加上图url
                 "fileIds": this.fileIds,  //传第三部里面排序完成之后的id的数组，参考编辑收单里面的附件传的方法
                 "model": this.detail.model,
                 // "splitRatio": "25",   //分成比例，先不传

pages/orderDetailNew/components/pageFour.vue

@@ -260,7 +260,7 @@ export default {
                     this.warehouseInfo = {
                         codeStorage: data.code,//编码
                         expressOrderNo: data.expressOrderNo || '',//快递单号
-                        // uploadedImage: '',//物流图片
+                        uploadedImage: data.receiptRemark.split(';')[1] || '',//物流图片 截取备注第二部分
                         item: data.item || '',//收单物品
                         checkCodeFee: data.checkCodeFee || '',//查码费
                         watchPrice: data.tableFee || '',//表款
@@ -268,7 +268,7 @@ export default {
                         freight: data.freight || '',//运费
                         repairAmount: data.repairAmount || '',//维修金额
                         grossPerformance: data.grossPerformance || '',//毛业绩
-                        remarks: data.receiptRemark || '',//收单备注
+                        remarks: data.receiptRemark.split(';')[0] || '',//收单备注  截取备注第一部分
                     }
                     this.getList()
                 }
@@ -309,15 +309,20 @@ export default {
     },
 
     methods: {
-        // 选择图片
+        // 选择物流图片
         selectImage() {
             uni.chooseImage({
                 count: 1,
-                sizeType: ['original', 'compressed'],
+                sizeType: ['compressed'],
                 sourceType: ['album', 'camera'],
-                success: (res) => {
+                success: async (res) => {
                     const tempFilePath = res.tempFilePaths[0];
-                    this.warehouseInfo.uploadedImage = tempFilePath;
+                    //把选择的图片上传给服务器，然后获取返回路径
+                    const rep = await uni.$u.api.uploadFile(tempFilePath)
+                    if (rep.code == 200) {
+                        console.log('上传成功=====>', rep.data.url)
+                        this.warehouseInfo.uploadedImage = rep.data.url
+                    }
                 }
             });
         },
@@ -402,11 +407,13 @@ export default {
 
             if (this.validateProfitSharing()) {
 
+                //上传表单数据
                 this.$emit('confirmInterStore', {
                     warehouseInfo: this.warehouseInfo,
                 })
 
-                this.addShare()
+                //上传分成数据
+                // this.addShare()
 
             }
 

pages/orderDetailNew/components/pageThree.vue

@@ -637,6 +637,8 @@ export default {
     font-family: Consolas, 'Courier New', monospace, -apple-system, BlinkMacSystemFont;
     width: auto;
     min-width: 150rpx;
+    border: none;
+    text-align: right !important;
 }
 
 .payment-amount .u-input__input {

pages/orderDetailNew/components/pageTwo.vue

@@ -40,8 +40,7 @@
                         <!-- 图片显示区域 -->
                         <view v-if="selectedCheckbox.includes('photo技巧') && photoTipsImages.length > 0"
                             class="image-list">
-                            <view v-for="(image, index) in photoTipsImages" :key="index" class="image-item"
-                                @click="previewImageHandler(image, 'photoTips')">
+                            <view v-for="(image, index) in photoTipsImages" :key="index" class="image-item">
                                 <image :src="image" mode="aspectFill" class="image-thumb"></image>
                             </view>
                         </view>
@@ -63,8 +62,7 @@
                         <!-- 图片显示区域 -->
                         <view v-if="selectedCheckbox.includes('face2face') && face2faceImages.length > 0"
                             class="image-list">
-                            <view v-for="(image, index) in face2faceImages" :key="index" class="image-item"
-                                @click="previewImageHandler(image, 'face2face')">
+                            <view v-for="(image, index) in face2faceImages" :key="index" class="image-item">
                                 <image :src="image" mode="aspectFill" class="image-thumb"></image>
                             </view>
                         </view>
@@ -224,7 +222,7 @@ export default {
         },
 
         // 下一步按钮点击事件
-        handleNextClick() {
+        async handleNextClick() {
             // 创建一个只包含被勾选checkbox对应数据的对象
             const result = {};
 
@@ -257,6 +255,49 @@ export default {
                 nowPage: 'formTwo',
                 form: result,
             })
+
+            // 下一步的时候要通过判断是否有联系师傅，师傅拍图技巧，到达客户面对面，如果有的话调uni.$u.api.addOrderFollow(orderFormData);接口按照    联系师傅;内容;url1,url2,url3,的格式上传
+            //先判断有没有联系师傅
+            if (this.selectedCheckbox.includes('contact师傅')) {
+                console.log('触发联系师傅')
+                // 联系师傅的手机号，已：为分割，取后面的内容
+                const phone = this.formData.contactPhone || '';
+                const data = `联系师傅;${phone}`;
+                // 调用接口上传
+                await uni.$u.api.addOrderFollow({
+                    orderId: this.orderId,
+                    content: data,
+                })
+            }
+            if (this.selectedCheckbox.includes('photo技巧')) {
+                console.log('触发师傅拍图技巧')
+                // 师傅拍图技巧的内容，已：为分割，取后面的内容
+                const photoTips = this.formData.photoTips || '';
+                const urls = this.photoTipsImages.join(',');
+
+                const data = `师傅拍图技巧;${photoTips};${urls}`;
+                console.log('urls9999999', data)
+
+                // 调用接口上传
+                await uni.$u.api.addOrderFollow({
+                    orderId: this.orderId,
+                    content: data,
+                })
+            }
+            if (this.selectedCheckbox.includes('face2face')) {
+                // 到达客户面对面的内容，已：为分割，取后面的内容
+                const face2faceNotes = this.formData.face2faceNotes || '';
+                const urls = this.face2faceImages.join(',');
+
+
+                const data = `到达客户面对面;${face2faceNotes};${urls}`;
+                // 调用接口上传
+
+                await uni.$u.api.addOrderFollow({
+                    orderId: this.orderId,
+                    content: data,
+                })
+            }
         },
         checkFollowUpContent() {
             // 检查跟进记录是否包含上面的三个选择
@@ -266,20 +307,30 @@ export default {
                 if (item.includes('联系师傅')) {
                     this.selectedCheckbox.push('contact师傅');
                     // 联系师傅的手机号，已：为分割，取后面的内容
-                    const phone = item.split('联系师傅：')[1] || '';
+                    const phone = item.split(';')[1] || '';
+                    console.log('联系师傅的手机号111111', phone)
                     this.formData.contactPhone = phone;
                 }
                 if (item.includes('师傅拍图技巧')) {
                     this.selectedCheckbox.push('photo技巧');
                     // 师傅拍图技巧的内容，已：为分割，取后面的内容
-                    const photoTips = item.split('师傅拍图技巧：')[1] || '';
+                    const photoTips = item.split(';')[1] || '';
                     this.formData.photoTips = photoTips;
+                    const urls = item.split(';')[2] || ''
+                    //把url转为数组
+                    const urlArray = urls.split(',').map(url => url.trim());
+                    this.photoTipsImages = [...this.photoTipsImages, ...urlArray];
+
                 }
                 if (item.includes('到达客户面对面')) {
                     this.selectedCheckbox.push('face2face');
                     // 到达客户面对面的内容，已：为分割，取后面的内容
-                    const face2faceNotes = item.split('到达客户面对面：')[1] || '';
+                    const face2faceNotes = item.split(';')[1] || '';
                     this.formData.face2faceNotes = face2faceNotes;
+                    const urls = item.split(';')[2] || ''
+                    //把url转为数组
+                    const urlArray = urls.split(',').map(url => url.trim());
+                    this.face2faceImages = [...this.face2faceImages, ...urlArray];
                 }
             })
         },
@@ -296,13 +347,14 @@ export default {
                     // 把blob数组上传到服务器，然后返回路径
                     try {
                         const res = await Promise.all(tempFilePath.map(filePath => uni.$u.api.uploadFile(filePath)));
-                        console.log('上传的图片路径数组是:', res.map(item => item.data.fileUrl))
+                        console.log('上传的图片路径数组是:', res.forEach(item => console.log(item.data.url)))
                         // 把返回的路径赋值给对应的数组
                         if (field == 'photoTips') {
-                            this.photoTipsImages = [...this.photoTipsImages, ...res.map(item => item.data.fileUrl)];
-                        } else if (field == 'face2face') {
-                            this.face2faceImages = [...this.face2faceImages, ...res.map(item => item.data.fileUrl)];
-                        } 
+                            this.photoTipsImages = [...this.photoTipsImages, ...res.map(item => item.data.url)];
+                        } else if (field == 'face2faceNotes') {
+                            console.log('1111')
+                            this.face2faceImages = [...this.face2faceImages, ...res.map(item => item.data.url)];
+                        }
                     } catch (error) {
                         console.error('上传失败:', error);
                         uni.$u.toast('上传失败');
@@ -720,7 +772,7 @@ u-checkbox {
     flex: 1;
     border-radius: 12rpx;
     font-size: 36rpx;
-    padding: 32rpx 0;
+    padding: 20rpx 0;
     min-width: 0;
     text-align: center;
     color: #ffffff;

pages/pagereceivecenter/pagereceivecenter.vue

@@ -82,7 +82,12 @@ export default {
                 console.log('待跟进', order)
             }
         },
-
+        // 跳转订单详情
+        toOrderDetail(order) {
+            uni.navigateTo({
+                url: `/pages/orderDetailNew/index?orderId=${order.id}&item=${order.item}&type=${this.type}&clueId=${order.clueId}`,
+            })
+        },
         
         //滑动加载
         scrolltolower() {
@@ -108,7 +113,7 @@ export default {
                     <!-- <orderCard v-for="item in orderList" :key="item.receiptId + item.id" :order="item"
                         @handleBtnClick="handleBtnClick">
                     </orderCard> -->
-                    <view class="orderCard" v-for="item in orderList"  :key="item.receiptId + item.id">
+                    <view class="orderCard" v-for="item in orderList"  :key="item.receiptId + item.id" @click.stop="toOrderDetail(item)">
                         <view class="bandAndPrice">
                             <view class="bandName">{{ item.itemBrand || '暂无品牌' }}</view>
                             <view class="price">￥{{ item.priceRange }}</view>
@@ -136,25 +141,25 @@ export default {
 
                             <view class="btnGroup"
                                 v-if="item && (item.status == '1' || item.status == null || item.status === undefined)">
-                                <view class="card-button" @click="handleBtnClick('acceptOrder', item)">立即接单</view>
-                                <view class=" card-button isBusy" @click="handleBtnClick('isBusy', item)">在忙</view>
+                                <view class="card-button" @click.stop="handleBtnClick('acceptOrder', item)">立即接单</view>
+                                <view class=" card-button isBusy" @click.stop="handleBtnClick('isBusy', item)">在忙</view>
                             </view>
 
                             <view class="btnGroup"
                                 v-if="item && (item.status == '2' || item.status == null || item.status === undefined)">
-                                <view class="card-button willFollow" @click="handleBtnClick('willFollow', item)">待跟进
+                                <view class="card-button willFollow" @click.stop="handleBtnClick('willFollow', item)">待跟进
                                 </view>
-                                <view class="card-button isBusy" @click="handleBtnClick('tag', item)">打标签</view>
+                                <view class="card-button isBusy" @click.stop="handleBtnClick('tag', item)">打标签</view>
                             </view>
 
                             <view class="btnGroup"
                                 v-if="item && (item.status == '3' || item.status == null || item.status === undefined)">
-                                <view class="card-button share" @click="handleBtnClick('share', item)">一键分享</view>
+                                <view class="card-button share" @click.stop="handleBtnClick('share', item)">一键分享</view>
                             </view>
 
                             <view class="btnGroup"
                                 v-if="item && (item.status == '4' || item.status == null || item.status === undefined)">
-                                <view class="card-button oneFollow" @click="handleBtnClick('oneFollow', item)">待跟进
+                                <view class="card-button oneFollow" @click.stop="handleBtnClick('oneFollow', item)">待跟进
                                 </view>
                             </view>