Merge branch 'master' of http://106.52.242.177:3000/askqvn/crm-app into permission

pages/orderDetailNew/components/orderDetailNewView.vue

@@ -20,7 +20,8 @@
         </view>
 
         <ul class="page">
-            <li v-for="(tab, index) in tabs" :key="index" :class="{ 'active': activeIndex === index }">{{ tab }}</li>
+            <li @click="handleTabClick(index)" v-for="(tab, index) in tabs" :key="index"
+                :class="{ 'active': activeIndex === index }">{{ tab }}</li>
         </ul>
     </view>
 </template>
@@ -113,7 +114,6 @@ export default {
             console.log("all page data:", this.allFroms[nowPage])
             // 当点击到第三页时，更新第三页的图片列表
             if (nowPage === 'formTwo') {
-                console.log('品牌', this.detail.brand)
                 this.$refs.pageThreeComp.getList('2', '3', this.currentReceiptInner.id, this.detail.itemBrand);
             }
         },
@@ -142,7 +142,7 @@ export default {
                 "sendFormId": this.orderId, //接单中心的id，就是接单中心列表的id（发单id）
                 "clueId": this.detail.clueId,
                 "item": this.detail.item,
-                "brand": this.detail.brand,
+                // "brand": this.topInfo.brand,
                 // "needCheckCode": 1,   //先不传
                 // "code": null,         //先不传
                 // "paymentAmount": null, //支付总额page3 先不传
@@ -159,7 +159,7 @@ export default {
                 // "grossPerformance": "7443.00",   //毛利 performance*splitRatio
                 // "expressOrderNo": null,   //快递单号+后续加上一个键加上图url
                 "fileIds": this.fileIds,  //传第三部里面排序完成之后的id的数组，参考编辑收单里面的附件传的方法
-                "model": this.detail.model,
+                // "model": this.detail.model,
                 // "splitRatio": "25",   //分成比例，先不传
                 "customerServiceName": "1", //默认传1，判断入库的类型，回收类入库，销售类入库，维保类入库，第四步传，增加选项下拉
                 "deptId": this.detail.deptId,
@@ -172,12 +172,12 @@ export default {
                 "customName": this.pageThreeForm.customName,
             }
 
-            //调用接口保存收单表单
-            if (this.detail.receiptId) {
-                this.updateData(params);
-            } else {
-                this.saveData(params);
-            }
+            // //调用接口保存收单表单
+            // if (this.detail.receiptId) {
+            //     this.updateData(params);
+            // } else {
+            //     this.saveData(params);
+            // }
         },
         // 确认支付
         handleConfirmPay() {
@@ -195,7 +195,7 @@ export default {
                 })
                 uni.$u.toast(response.msg || '支付成功')
             } catch (error) {
-                uni.$u.toast(`支付失败：${response.msg}`)
+                uni.$u.toast(`支付失败：${error}`)
             }
         },
         //确认入库
@@ -213,7 +213,7 @@ export default {
                 "sendFormId": this.orderId, //接单中心的id，就是接单中心列表的id（发单id）
                 "clueId": this.detail.clueId,
                 "item": warehouseInfo.item || '',
-                "brand": this.detail.brand,
+                // "brand": this.detail.brand,
                 // "needCheckCode": 1,   //先不传
                 "code": warehouseInfo.codeStorage || '',         //先不传
                 // "paymentAmount": null, //支付总额page3 先不传
@@ -223,14 +223,14 @@ export default {
                 "freight": warehouseInfo.freight || '',         //运费page4加上
                 "checkCodeFee": warehouseInfo.checkCodeFee || '',  //查码费
                 // "totalCost": "60230.00",   // 成本合计 =   运费 + 好处费 + 查码费 + 表款(支付总额) + 维修费。
-                "sellingPrice": this.topInfo.price,   //实际价格（售价）顶上tab里面的第三栏
+                // "sellingPrice": this.topInfo.price,   //实际价格（售价）顶上tab里面的第三栏
                 // "performance": "29772.00",  //sellingPrice - totalCost
                 "receiptRemark": warehouseInfo.remarks + ';' + warehouseInfo.uploadedImage || '',//"收单之后还需再跟进", 先不传
                 "repairAmount": warehouseInfo.repairAmount || '', //维修总金额 ，先不传
                 "grossPerformance": warehouseInfo.grossPerformance || '',   //毛利 performance*splitRatio
                 "expressOrderNo": warehouseInfo.expressOrderNo,   //快递单号+后续加上一个键加上图url
                 "fileIds": this.fileIds,  //传第三部里面排序完成之后的id的数组，参考编辑收单里面的附件传的方法
-                "model": this.detail.model,
+                // "model": this.detail.model,
                 // "splitRatio": "25",   //分成比例，先不传
                 "customerServiceName": "1", //默认传1，判断入库的类型，回收类入库，销售类入库，维保类入库，第四步传，增加选项下拉
                 "deptId": this.detail.deptId,
@@ -284,6 +284,10 @@ export default {
                 console.error("获取跟进记录失败:", error);
                 uni.$u.toast("获取跟进记录失败");
             }
+        },
+        handleTabClick(index) {
+            this.activeIndex = index;
+            this.$refs.pageThreeComp.getList('2', '3', this.currentReceiptInner.id, this.detail.itemBrand);
         }
     },
 
@@ -321,9 +325,11 @@ export default {
         height: 70rpx;
         line-height: 80rpx;
         text-align: center;
-        margin-bottom: 10rpx;
+        margin-bottom: 20rpx;
         transition: all 0.3s ease-in-out;
         font-weight: 800;
+        /* 阴影 */
+        box-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
     }
 
     li.active {

pages/orderDetailNew/components/pageFour.vue

@@ -290,9 +290,7 @@ export default {
                         grossPerformance: data.grossPerformance || '',//毛业绩
                         remarks: data.receiptRemark?.split(';')[0] || '',//收单备注  截取备注第一部分
                     }
-                    this.$nextTick(() => {
-                        this.getShareList()
-                    })
+                    this.getShareList()
                 }
             },
         }
@@ -326,6 +324,7 @@ export default {
             showPersonPicker: false,
 
             columnsOrgList: [],
+            //传入的分成人名单
             columnsPersonList: [],
 
         };
@@ -362,21 +361,41 @@ export default {
                 deptId: '',
                 accountType: '1',
                 userId: '',
-                percentage: 0,
+                commissionRate: 0,
                 isCompanyPerformance: '2',
                 orgName: '',
                 userName: '',
                 id: '',
                 uuid: Math.random()//唯一标识，仅vfor使用
             });
-            // 重新计算所有行的比例
+            //重新计算全部行的分成比例
+            this.calculateTotalPercentage();
+        },
+        // 重新计算全部行的分成比例
+        calculateTotalPercentage() {
+            //获取选择前端的行的数量
+            const frontItems = this.profitSharingList.filter(item => item.accountType == '1');
+            const backItems = this.profitSharingList.filter(item => item.accountType == '2');
+            const totalFrontItems = frontItems.length;
+            const totalBackItems = backItems.length;
+            console.log('选择前端的行的数量====>', totalFrontItems)
+            console.log('选择后端的行的数量====>', totalBackItems)
+            //把profitSharingList中的前端行的分成比例按照 100/数量 重新计算
+            this.profitSharingList.map(item => {
+                if (item.accountType == '1') {
+                    item.commissionRate = (100 / totalFrontItems).toFixed()
+                }
+                if (item.accountType == '2') {
+                    item.commissionRate = (100 / totalBackItems).toFixed()
+                }
+            })
         },
-
 
         // 切换账户类型
         toggleAccountType(item) {
             item.accountType = item.accountType == '1' ? '2' : '1';
             // 重新计算分成比例
+            this.calculateTotalPercentage();
         },
         // 处理百分比输入
         handlePercentageInput(item) {
@@ -401,7 +420,8 @@ export default {
         },
 
         // 确认入库方法
-        confirmWarehouseEntry() {
+        async confirmWarehouseEntry() {
+
 
             console.log('确认入库', this.orderDetail.id)
 
@@ -410,15 +430,32 @@ export default {
                 content: `是否确认入库改订单：${this.orderDetail.item}？`,
                 success: async (res) => {
                     if (res.confirm) {
+                        //修改状态
                         await uni.$u.api.oderForm({
                             status: "3",
                             id: this.orderDetail.id,
                         });
 
+                        await uni.$u.api.updateReceiptForm({
+                            id: this.currentReceipt.id,
+                            code: this.warehouseInfo.codeStorage || '',//编码
+                            expressOrderNo: this.warehouseInfo.expressOrderNo || '',//快递单号
+                            item: this.warehouseInfo.item || '',//收单物品
+                            checkCodeFee: this.warehouseInfo.checkCodeFee || '',//查码费
+                            tableFee: this.warehouseInfo.watchPrice || '',//表款
+                            benefitFee: this.warehouseInfo.benefitFee || '',//好处费
+                            freight: this.warehouseInfo.freight || '',//运费
+                            repairAmount: this.warehouseInfo.repairAmount || '',//维修金额
+                            grossPerformance: this.warehouseInfo.grossPerformance || '',//毛业绩
+                            receiptRemark: this.warehouseInfo.remarks + ';' + this.warehouseInfo.uploadedImage || '',//收单备注
+                        });
+
                         //上传物流表单数据
-                        this.$emit('confirmInterStore', {
-                            warehouseInfo: this.warehouseInfo,
-                        })
+                        // this.$emit('confirmInterStore', {
+                        //     warehouseInfo: this.warehouseInfo,
+                        // })
+                        //保存入库信息
+
 
                         //上传分成数据
                         await this.addShare()
@@ -452,15 +489,18 @@ export default {
 
         //初始化分成比例
         async getShareList() {
+
+            console.log('当前收单信息', this.currentReceipt.id)
             const { rows, total } = await uni.$u.api.selectCommissionList({
                 pageSize: 9999,
                 pageNum: 1,
             }, { sendFormId: this.currentReceipt.sendFormId, });
             console.log('分成比例表格数据', rows)
-            rows.map(item => {
+            const newRows = rows.filter(item => item.receiptFormId == this.currentReceipt.id)
+            newRows.map(item => {
                 item.uuid = Math.random()//唯一标识
             })
-            this.profitSharingList = rows
+            this.profitSharingList = newRows
         },
 
 
@@ -481,6 +521,7 @@ export default {
                     sendFormId: this.currentReceipt.sendFormId,
                     userId: item.userId,
                     userName: item.userName,
+                    receiptFormId: this.currentReceipt.id,//关联的收单id
                 }
                 if (item.id) {
                     //更新
@@ -495,26 +536,44 @@ export default {
         //删除分成
         async deleteRow(id, uuid) {
             console.log(id, 'id', uuid, 'uuid')
-            //如果没有id说明是新增的，直接删除数组中的项
-            if (!id) {
-                this.profitSharingList = this.profitSharingList.filter(item => item.uuid != uuid)
-                uni.$u.toast('删除成功')
-                return
-            }
-            try {
-                await uni.$u.api.deleteClueCommissionForm(id)
-                uni.$u.toast('删除成功')
-                this.getShareList()
-            } catch (error) {
-                uni.$u.toast('删除失败，请稍后重试')
-            }
+            // 确认删除
+            uni.showModal({
+                title: '确认删除',
+                content: '是否确认删除当前行分成比例？',
+                success: async (res) => {
+                    if (res.confirm) {
+                        //如果没有id说明是新增的，直接删除数组中的项
+                        if (!id) {
+                            this.profitSharingList = this.profitSharingList.filter(item => item.uuid != uuid)
+                            uni.$u.toast('删除成功')
+                            this.calculateTotalPercentage();
+
+                            return
+                        }
+                        try {
+                            await uni.$u.api.deleteClueCommissionForm(id)
+                            uni.$u.toast('删除成功')
+                            this.getShareList()
+                        } catch (error) {
+                            uni.$u.toast('删除失败，请稍后重试')
+                        }
+                        //重新计算全部行的分成比例
+                        this.calculateTotalPercentage();
+                    } else {
+                        uni.$u.toast('已取消删除')
+                    }
+                }
+            })
         },
 
         //打开选择框
         handleSelectOrg(item) {
             console.log(item.uuid, '当前选择的行的uuid')
             this.currentEditItem = item.uuid
-            this.showOrgPicker = true
+            // this.showOrgPicker = true
+            this.showPersonPicker = true
+            //把当前的组织赋值给当前的组件
+            this.columnsPersonList = this.columnsOrgList//获取到的分成人名单
         },
         //选择当前的分成人
         handleSelectPerson(item) {
@@ -523,15 +582,31 @@ export default {
             //获取当前选择组织的分成人名单
             // 获取当前行的关联id
             const deptId = item.deptId
-            const org = this.columnsOrgList[0].find(org => org.id == deptId)
-            console.log(org, '当前选择的行的组织')
+            //递归查找当前选择的组织
+            const org = this.findOrg(this.columnsOrgList[0], deptId)
+            // const org = this.columnsOrgList[0].find(org => org.id == deptId)
+            console.log(org, '当前选择的组织')
             if (org) {
                 this.columnsPersonList = [org.children]
             }
             // 把当前选择组织的分成人名单赋值给当前行的分成人选项列表
-
             this.showPersonPicker = true
         },
+        //递归查找当前选择的组织
+        findOrg(orgList, deptId) {
+            for (const org of orgList) {
+                if (org.id == deptId) {
+                    return org
+                }
+                if (org.children && org.children.length > 0) {
+                    const found = this.findOrg(org.children, deptId)
+                    if (found) {
+                        return found
+                    }
+                }
+            }
+            return null
+        },
 
         //确认选择组织
         handleOrgConfirmOrg({ columnIndex, value, values },) {
@@ -554,16 +629,33 @@ export default {
 
         //确认选择人
         handleConfirmPerson({ columnIndex, value, values },) {
-            console.log(value, '选择的人')
+            console.log(value[0], '选择的人')
+            console.log(value[0].isUser, '是否是用户')
             //把值赋值给当前行
-            this.profitSharingList.forEach(item => {
-                if (item.uuid == this.currentEditItem) {
-                    item.userName = value[0].label
-                    item.userId = value[0].id
-                }
-            })
-            this.columnsPersonList = []
-            this.showPersonPicker = false
+            if (value[0].isUser) {
+                //当前选择是用户
+                this.profitSharingList.forEach(item => {
+                    if (item.uuid == this.currentEditItem) {
+                        item.userName = value[0].label
+                        item.userId = value[0].id
+                    }
+                })
+                this.columnsPersonList = []
+                this.showPersonPicker = false
+            } else {
+                //当前选择是组织
+                // 把组织的label赋值给当前的行的关联
+                this.profitSharingList.forEach(item => {
+                    if (item.uuid == this.currentEditItem) {
+                        item.orgName = value[0].label
+                        item.deptId = value[0].id
+                    }
+                })
+                const childrens = value[0].children
+                console.log('当前分公司的内部分成人', childrens)
+
+                this.columnsPersonList = [childrens]
+            }
         },
         // 取消选择人
         handleCancelPerson() {

pages/orderDetailNew/components/pageOne.vue

@@ -6,7 +6,7 @@
             </u-col>
             <u-col span="3.5">
                 <u-button size="small" @click="copyAllImages"
-                    style="border-radius: 20rpx;border-color: #007AFF;color: #007AFF;">复制全部图片</u-button>
+                    style="border-radius: 20rpx;border-color: #007AFF;color: #007AFF;">保存全部图片</u-button>
             </u-col>
         </u-row>
 
@@ -133,45 +133,35 @@ export default {
                 console.log('currentReceipt 变化了', newVal);
                 if (newVal) {
                     //刷新图片列表
-                    this.getList('2', '1', newVal.id, this.orderDetail.itemBrand);
-                    this.getList('2', '2', newVal.id, this.orderDetail.itemBrand);
+                    setTimeout(() => {
+                        this.getList('2', '1', newVal.id, this.orderDetail.itemBrand);
+                        this.getList('2', '2', newVal.id, this.orderDetail.itemBrand);
+                    }, 100)
+
                 }
             }
         },
     },
     methods: {
 
-
-
-
-
-
-
         // 电话卡片点击事件
         handlePhoneClick() {
             console.log('电话卡片被点击', '电话号码:', this.orderDetail.phone)
             if (this.orderDetail.phone) {
                 //拨打电话
-                // uni.makePhoneCall({
-                //     phoneNumber: this.orderDetail.phone,
-                //     success: () => {
-                //         this.$store.commit("call/SET_FORM", {
-                //             clueId: this.orderDetail.clueId,
-                //             type: "3",
-                //             callee: this.orderDetail.phone,
-                //         });
-                //     },
-                // });
+                uni.makePhoneCall({
+                    phoneNumber: this.orderDetail.phone
+                });
                 //先暂时复制电话号码
-                uni.setClipboardData({
-                    data: this.orderDetail.phone,
-                    success: () => {
-                        uni.showToast({
-                            title: '电话号码已复制',
-                            icon: 'none'
-                        })
-                    }
-                })
+                // uni.setClipboardData({
+                //     data: this.orderDetail.phone,
+                //     success: () => {
+                //         uni.showToast({
+                //             title: '电话号码已复制',
+                //             icon: 'none'
+                //         })
+                //     }
+                // })
             } else {
                 uni.showToast({
                     title: '该订单暂时没有电话号码',
@@ -226,30 +216,155 @@ export default {
         //一键复制
         copyAllImages() {
             // 合并所有图片
-            const allImages = [...this.trueUploadList, ...this.chatRecordsUploadList];
+            const allImages = [...this.trueUploadList];
             //取出所有图的url
             const allUrls = allImages.map(item => item.fileUrl);
-            console.log('所有图片:', allUrls)
-            console.log('合并后的图片列表:', allUrls)
             if (allUrls.length > 0) {
-                // 复制到剪贴板
-                uni.setClipboardData({
-                    data: JSON.stringify(allUrls),
-                    success: () => {
-                        uni.showToast({
-                            title: '所有图片已复制',
-                            icon: 'none'
-                        })
+                // 显示保存图片确认弹窗
+                uni.showModal({
+                    title: '保存图片',
+                    content: `是否将 ${allUrls.length} 张图片保存到本地相册？`,
+                    confirmText: '保存',
+                    // cancelText: '仅复制链接',
+                    success: (res) => {
+                        if (res.confirm) {
+                            // 用户选择保存图片
+                            this.saveImagesToLocal(allUrls);
+                        } else if (res.cancel) {
+                            // 用户选择仅复制链接
+                            this.copyImageUrls(allUrls);
+                        }
                     }
                 })
             } else {
                 uni.showToast({
-                    title: '没有图片可复制',
+                    title: '没有图片可保存',
                     icon: 'none'
                 })
             }
         },
 
+        // 保存图片到本地相册
+        async saveImagesToLocal(imageUrls) {
+            try {
+                uni.showLoading({
+                    title: '正在保存图片...',
+                    mask: true
+                });
+
+                const savedImages = [];
+                const failedImages = [];
+
+                // 逐个保存图片
+                for (let i = 0; i < imageUrls.length; i++) {
+                    const url = imageUrls[i];
+                    try {
+                        await this.saveSingleImage(url);
+                        savedImages.push(url);
+                    } catch (error) {
+                        console.error(`保存图片失败: ${url}`, error);
+                        failedImages.push(url);
+                    }
+
+                    // 更新进度
+                    uni.showLoading({
+                        title: `正在保存图片... (${i + 1}/${imageUrls.length})`,
+                        mask: true
+                    });
+                }
+
+                uni.hideLoading();
+
+                // 显示结果
+                let message = `成功保存 ${savedImages.length} 张图片`;
+                if (failedImages.length > 0) {
+                    message += `，${failedImages.length} 张保存失败`;
+                }
+
+                uni.showToast({
+                    title: message,
+                    icon: 'none',
+                    duration: 3000
+                });
+
+                // 如果有失败的图片，也复制链接作为备选
+                if (failedImages.length > 0) {
+                    const allUrls = [...savedImages, ...failedImages];
+                    this.copyImageUrls(allUrls);
+                }
+
+            } catch (error) {
+                uni.hideLoading();
+                console.error('保存图片过程中发生错误:', error);
+                uni.showToast({
+                    title: '保存图片失败',
+                    icon: 'error'
+                });
+            }
+        },
+
+        // 保存单张图片
+        saveSingleImage(url) {
+            return new Promise((resolve, reject) => {
+                // 先下载图片
+                uni.downloadFile({
+                    url: url,
+                    success: (res) => {
+                        if (res.statusCode === 200) {
+                            // 保存到相册
+                            uni.saveImageToPhotosAlbum({
+                                filePath: res.tempFilePath,
+                                success: () => {
+                                    console.log('图片保存成功:', url);
+                                    resolve();
+                                },
+                                fail: (err) => {
+                                    console.error('保存到相册失败:', err);
+                                    // 如果是权限问题，尝试请求权限
+                                    if (err.errMsg.includes('auth denied')) {
+                                        uni.showModal({
+                                            title: '权限不足',
+                                            content: '需要访问相册权限来保存图片，是否去设置？',
+                                            success: (modalRes) => {
+                                                if (modalRes.confirm) {
+                                                    // 打开设置页面
+                                                    uni.openSetting({
+                                                        success: (settingRes) => {
+                                                            console.log('设置页面结果:', settingRes);
+                                                        }
+                                                    });
+                                                }
+                                            }
+                                        });
+                                    }
+                                    reject(err);
+                                }
+                            });
+                        } else {
+                            reject(new Error('下载失败'));
+                        }
+                    },
+                    fail: (err) => {
+                        console.error('下载图片失败:', err);
+                        reject(err);
+                    }
+                });
+            });
+        },
+
+        // 复制图片链接
+        copyImageUrls(urls) {
+            uni.setClipboardData({
+                data: JSON.stringify(urls),
+                success: () => {
+                    uni.showToast({
+                        title: '图片链接已复制',
+                        icon: 'none'
+                    })
+                }
+            })
+        },
+
     },
 
 }

pages/orderDetailNew/components/pageThree.vue

@@ -38,21 +38,21 @@
                 <view class="detail-image-content">
                     <view class="detail-image-list">
                         <!-- 占位符元素 -->
-                        <view v-show="placeholderIndex !== -1" class="detail-image-placeholder"
+                        <!-- <view v-show="placeholderIndex !== -1" class="detail-image-placeholder"
                             :style="{ transform: placeholderStyle }">
                             <u-icon name="arrow-right" size="40rpx" color="#108cff"></u-icon>
-                        </view>
+                        </view> -->
 
                         <!-- 图片列表 -->
-                        <view class="detail-image-item" v-for="(item, index) in detailImages" :key="'detail-' + index"
-                            :class="{
+                        <view class="detail-image-item" v-for="(item, index) in detailImages.slice(0, 6)"
+                            :key="'detail-' + index" :class="{
                                 'dragging': draggingIndex === index,
                                 'can-drop': canDropIndex === index
                             }" @touchstart.stop="onTouchStart($event, index)" @touchmove.stop="onTouchMove($event)"
                             @touchend.stop="onTouchEnd" @touchcancel.stop="onTouchEnd">
                             <pic-comp :src="item.fileUrl"></pic-comp>
                             <view class="image-type-tag">{{ getImageType(index) }}</view>
-                            <view class="detail-delete-btn" @click.stop="deleteImage(item)">×</view>
+                            <view class="detail-delete-btn" @click.stop="handleYinCang(item, index)">×</view>
                         </view>
 
                         <!-- 上传按钮 -->
@@ -130,6 +130,9 @@
                 <!-- 确认转账按钮 -->
                 <u-button type="primary" size="large" @click="confirmTransfer"
                     style="margin-top: 40rpx;">确认转账</u-button>
+                <u-button type="primary" :plain="true" @click="payNowModelShow = false" size="large"
+                    style="margin-top: 40rpx;">取消</u-button>
+
             </view>
         </u-modal>
     </view>
@@ -163,7 +166,7 @@ export default {
                     this.paymentInfo.bankName = newVal.bankName || ''
                     this.paymentInfo.bankAccount = newVal.bankCardNumber || ''
                     this.paymentInfo.idNumber = newVal.idCard || ''
-                    this.paymentAmount = newVal.tableFee || '0.00'
+                    // this.paymentAmount = newVal.tableFee || '0.00'
                 }
             },
             deep: true,
@@ -173,7 +176,9 @@ export default {
                 if (newVal) {
                     console.log('这里是page3的', newVal.tableFee)
                     this.paymentAmount = newVal.tableFee || '0.00'
-                    this.getList('2', '3', newVal.id, this.orderDetail.itemBrand);
+                    setTimeout(() => {
+                        this.getList('2', '3', newVal.id, this.orderDetail.itemBrand);
+                    }, 100);
                 }
             },
             deep: true,
@@ -349,19 +354,35 @@ export default {
         },
 
         // 立即支付按钮点击事件
-        handlePayNowClick() {
+        async handlePayNowClick() {
+            //保存
+            await uni.$u.api.updateReceiptForm({
+                id: this.currentReceipt.id,
+                tableFee: this.paymentAmount,
+                fileIds: this.detailImages.map(item => item.id).join(',')
+            });
+
+            //保存上面的支付信息
+            await uni.$u.api.updateClueOrderForm({
+                id: this.orderDetail.id,
+                customName: this.paymentInfo.customName || '',
+                bankName: this.paymentInfo.bankName || '',
+                bankCardNumber: this.paymentInfo.bankAccount || '',
+                idCard: this.paymentInfo.idNumber || '',
+            });
+
             console.log('点击了立即支付按钮');
             this.payNowModelShow = true;
 
             //让父组件保存数据
-            this.$emit('handleNeedSave', {
-                fileIds: this.detailImages.map(item => item.id).join(','),
-                nowPage: 'formThree',
-                form: {
-                    ...this.paymentInfo,
-                    paymentAmount: this.paymentAmount
-                }
-            });
+            // this.$emit('handleNeedSave', {
+            //     fileIds: this.detailImages.map(item => item.id).join(','),
+            //     nowPage: 'formThree',
+            //     form: {
+            //         ...this.paymentInfo,
+            //         paymentAmount: this.paymentAmount
+            //     }
+            // });
         },
 
 
@@ -375,14 +396,28 @@ export default {
             this.$emit('handleConfirmPay');
         },
         // 下一步按钮点击事件
-        handleNextClick() {
-            console.log('page3点击了下一步按钮', this.detailImages);
-            this.$emit('handleNextClick', {
-                nowPage: 'formThree',
-                form: {
-                    ...this.paymentInfo
-                }
+        async handleNextClick() {
+            await uni.$u.api.updateReceiptForm({
+                id: this.currentReceipt.id,
+                tableFee: this.paymentAmount,
+                fileIds: this.detailImages.map(item => item.id).join(',')
             });
+
+            await uni.$u.api.updateClueOrderForm({
+                id: this.orderDetail.id,
+                customName: this.paymentInfo.customName || '',
+                bankName: this.paymentInfo.bankName || '',
+                bankCardNumber: this.paymentInfo.bankAccount || '',
+                idCard: this.paymentInfo.idNumber || '',
+            });
+
+            console.log('page3点击了下一步按钮', this.detailImages);
+            // this.$emit('handleNextClick', {
+            //     nowPage: 'formThree',
+            //     form: {
+            //         ...this.paymentInfo
+            //     }
+            // });
         },
 
         // 确认未收按钮点击事件
@@ -419,6 +454,15 @@ export default {
                 uni.$u.toast('提交待跟进记录成功');
             }
         },
+        handleYinCang(item, index) {
+            console.log('删除图片:', item, '索引:', index);
+            // 从detailImages数组中移除当前项，后续图片会自动前移
+            const itemIndex = this.detailImages.findIndex(img => img.fileUrl === item.fileUrl);
+            if (itemIndex !== -1) {
+                this.detailImages.splice(itemIndex, 1);
+                uni.$u.toast('图片已隐藏');
+            }
+        }
     }
 }
 </script>
@@ -457,6 +501,7 @@ export default {
         display: flex;
         flex-wrap: wrap;
         gap: 20rpx;
+        position: relative;
     }
 
     .detail-image-item {
@@ -490,7 +535,7 @@ export default {
         position: absolute;
         width: 200rpx;
         height: 200rpx;
-        border: 2rpx dashed #108cff;
+        border: 2rpx dashed red;
         background-color: rgba(16, 140, 255, 0.1);
         border-radius: 8rpx;
         display: flex;

pages/orderDetailNew/components/pageTwo.vue

@@ -173,7 +173,9 @@ export default {
             handler(newVal) {
                 if (newVal) {
                     this.approvedPrice = Number(newVal.sellingPrice) || 0;
-                    this.getList('2', '3', newVal.id, this.orderDetail.itemBrand);
+                    setTimeout(() => {
+                        this.getList('2', '3', newVal.id, this.orderDetail.itemBrand);
+                    }, 100)
                 }
             },
             deep: true,
@@ -229,11 +231,145 @@ export default {
 
         // 复制所有高清细节图链接
         copyAllDetailImages() {
+            // 合并所有图片
+            const allImages = [...this.detailImages];
+            //取出所有图的url
+            const allUrls = allImages.map(item => item.fileUrl);
+            if (allUrls.length > 0) {
+                // 显示保存图片确认弹窗
+                uni.showModal({
+                    title: '保存图片',
+                    content: `是否将 ${allUrls.length} 张图片保存到本地相册？`,
+                    confirmText: '保存',
+                    success: (res) => {
+                        if (res.confirm) {
+                            // 用户选择保存图片
+                            this.saveImagesToLocal(allUrls);
+                        }
+                    }
+                })
+            } else {
+                uni.showToast({
+                    title: '没有图片可复制',
+                    icon: 'none'
+                })
+            }
+        },
+        // 保存图片到本地相册
+        async saveImagesToLocal(imageUrls) {
+            try {
+                uni.showLoading({
+                    title: '正在保存图片...',
+                    mask: true
+                });
+
+                const savedImages = [];
+                const failedImages = [];
+
+                // 逐个保存图片
+                for (let i = 0; i < imageUrls.length; i++) {
+                    const url = imageUrls[i];
+                    try {
+                        await this.saveSingleImage(url);
+                        savedImages.push(url);
+                    } catch (error) {
+                        console.error(`保存图片失败: ${url}`, error);
+                        failedImages.push(url);
+                    }
+                    
+                    // 更新进度
+                    uni.showLoading({
+                        title: `正在保存图片... (${i + 1}/${imageUrls.length})`,
+                        mask: true
+                    });
+                }
+
+                uni.hideLoading();
 
+                // 显示结果
+                let message = `成功保存 ${savedImages.length} 张图片`;
+                if (failedImages.length > 0) {
+                    message += `，${failedImages.length} 张保存失败`;
+                }
+
+                uni.showToast({
+                    title: message,
+                    icon: 'none',
+                    duration: 3000
+                });
+
+                // 如果有失败的图片，也复制链接作为备选
+                if (failedImages.length > 0) {
+                    const allUrls = [...savedImages, ...failedImages];
+                    this.copyImageUrls(allUrls);
+                }
+
+            } catch (error) {
+                uni.hideLoading();
+                console.error('保存图片过程中发生错误:', error);
+                uni.showToast({
+                    title: '保存图片失败',
+                    icon: 'error'
+                });
+            }
+        },
+        // 保存单张图片
+        saveSingleImage(url) {
+            return new Promise((resolve, reject) => {
+                // 先下载图片
+                uni.downloadFile({
+                    url: url,
+                    success: (res) => {
+                        if (res.statusCode === 200) {
+                            // 保存到相册
+                            uni.saveImageToPhotosAlbum({
+                                filePath: res.tempFilePath,
+                                success: () => {
+                                    console.log('图片保存成功:', url);
+                                    resolve();
+                                },
+                                fail: (err) => {
+                                    console.error('保存到相册失败:', err);
+                                    // 如果是权限问题，尝试请求权限
+                                    if (err.errMsg.includes('auth denied')) {
+                                        uni.showModal({
+                                            title: '权限不足',
+                                            content: '需要访问相册权限来保存图片，是否去设置？',
+                                            success: (modalRes) => {
+                                                if (modalRes.confirm) {
+                                                    // 打开设置页面
+                                                    uni.openSetting({
+                                                        success: (settingRes) => {
+                                                            console.log('设置页面结果:', settingRes);
+                                                        }
+                                                    });
+                                                }
+                                            }
+                                        });
+                                    }
+                                    reject(err);
+                                }
+                            });
+                        } else {
+                            reject(new Error('下载失败'));
+                        }
+                    },
+                    fail: (err) => {
+                        console.error('下载图片失败:', err);
+                        reject(err);
+                    }
+                });
+            });
         },
 
         // 下一步按钮点击事件
         async handleNextClick() {
+            //调接口保存当前的核准价
+            await uni.$u.api.updateReceiptForm({
+                id: this.currentReceipt.id,
+                sellingPrice: this.approvedPrice,
+            });
+
             // 创建一个只包含被勾选checkbox对应数据的对象
             const result = {};
 
@@ -310,17 +446,22 @@ export default {
         },
         checkFollowUpContent() {
             // 检查跟进记录是否包含上面的三个选择
+            //每个检查到一个就不继续检查了
+            let hasContactMaster = false;
+            let hasPhotoTips = false;
+            let hasFace2face = false;
             this.followUpListInner.forEach(item => {
                 console.log('这里是跟进记录', item)
                 // 判断内容是否含有联系师傅，师傅拍图技巧，到达客户面对面，如果包含的话就上面对应的box就打上对勾
-                if (item.includes('联系师傅')) {
+                if (item.includes('联系师傅') && !hasContactMaster) {
                     this.selectedCheckbox.push('contact师傅');
                     // 联系师傅的手机号，已：为分割，取后面的内容
                     const phone = item.split(';')[1] || '';
                     console.log('联系师傅的手机号111111', phone)
                     this.formData.contactPhone = phone;
+                    hasContactMaster = true;
                 }
-                if (item.includes('师傅拍图技巧')) {
+                if (item.includes('师傅拍图技巧') && !hasPhotoTips) {
                     this.selectedCheckbox.push('photo技巧');
                     // 师傅拍图技巧的内容，已：为分割，取后面的内容
                     const photoTips = item.split(';')[1] || '';
@@ -329,9 +470,9 @@ export default {
                     //把url转为数组
                     const urlArray = urls.split(',').map(url => url.trim());
                     this.photoTipsImages = [...this.photoTipsImages, ...urlArray];
-
+                    hasPhotoTips = true;
                 }
-                if (item.includes('到达客户面对面')) {
+                if (item.includes('到达客户面对面') && !hasFace2face) {
                     this.selectedCheckbox.push('face2face');
                     // 到达客户面对面的内容，已：为分割，取后面的内容
                     const face2faceNotes = item.split(';')[1] || '';
@@ -340,6 +481,7 @@ export default {
                     //把url转为数组
                     const urlArray = urls.split(',').map(url => url.trim());
                     this.face2faceImages = [...this.face2faceImages, ...urlArray];
+                    hasFace2face = true;
                 }
             })
         },

pages/orderDetailNew/mixin/imgUploadAndDownLoad.js

@@ -34,12 +34,12 @@ export default {
         },
         //获取文件列表
         async getList(type, orderFileType, receiptID, itemBrand) {
-            console.log('获取文件列表', type, receiptID)
+            console.log('获取文件列表', itemBrand, type, receiptID, orderFileType)
             // console.log('当前的订单id', this.orderDetail.id)
             // console.log('当前的收单id', this.currentReceipt.id)
             try {
                 const params = {
-                    clueId: this.orderDetail.clueId,
+                    clueId: this.currentReceipt.clueId,
                     sourceId: this.currentReceipt.id,//默认先用receiptID查,如果没有返回情况下用orderID查
                     type,
                     orderFileType,

pages/orderForm/index.vue

@@ -7,76 +7,73 @@
 		<view class="form_wrap">
 			<u--form labelPosition="top" labelWidth="100" :model="form" :rules="rules" ref="form" class="form_wrap"
 				:errorType="'toast'">
-				<u-form-item label="物品品牌" prop="brand">
+				<u-form-item label="品牌" prop="brand" class="brand_wrap">
 					<ld-select :list="brandDict" label-key="dictLabel" value-key="dictValue" placeholder="请选择物品品牌"
-						v-model="form.brand" :border="false"></ld-select>
+						v-model="form.brand" :border="false" border></ld-select>
 					<u-icon slot="right" name="arrow-right"></u-icon>
 				</u-form-item>
 
-				<u-row justify="space-between">
-					<u-form-item label="型号" prop="model">
-						<u-col span="6">
-							<u--input v-model="form.model" placeholder="请输入型号" border="none"></u--input>
-
-						</u-col>
-					</u-form-item>
-
-					<u-form-item label="实价" prop="price">
-						<u-col span="6">
-							<u--input v-model="form.price" placeholder="请输入实价" border="none"></u--input>
-						</u-col>
+				<u-row gutter="5" justify="space-between">
+					<u-col span="6">
+						<u-form-item label="型号" prop="model">
+							<u--input v-model="form.model" placeholder="例如:CF小号" border="surround"></u--input>
+						</u-form-item>
+					</u-col>
+					 <u-col span="6">
+                        <u-form-item label="实价" prop="price">
+							<u--input v-model="form.price" placeholder="0.00" border="surround"></u--input>
 					</u-form-item>
+                    </u-col>
 				</u-row>
 
-				<u-row justify="space-between">
-					<u-form-item label="客户电话" prop="phone">
-						<u-col span="6">
-							<u--input v-model="form.phone" placeholder="请输入客户电话" border="none"></u--input>
-
-						</u-col>
-					</u-form-item>
-
-					<u-form-item label="客户微信" prop="wechat">
-						<u-col span="6">
-							<u--input v-model="form.wechat" placeholder="请输入客户微信" border="none"></u--input>
-						</u-col>
-					</u-form-item>
+				<u-row gutter="5" justify="space-between">
+					<u-col span="6">
+						<u-form-item label="客户电话" prop="phone">
+							<u--input v-model="form.phone" placeholder="电话号" border="surround"></u--input>
+						</u-form-item>
+					</u-col>
+					 <u-col span="6">
+						<u-form-item label="客户微信" prop="wechat">
+							<u--input v-model="form.wechat" placeholder="微信号" border="surround"></u--input>
+						</u-form-item>
+					</u-col>
 				</u-row>
-
-				<u-form-item label="省市区">
-					<pick-regions :defaultRegion="defaultRegion" @getRegion="handleGetRegion">
-						<view class="region-picker">
-							<template v-if="form.province">
-								<u--input :value="form.province + '/' + form.city + '/' + form.area" placeholder="点击选择"
-									readonly suffixIcon="arrow-right" suffixIconStyle="color : #c0c4cc"></u--input>
-							</template>
-							<template v-else>
-								<u--input placeholder="点击选择" readonly suffixIcon="arrow-right"
-									suffixIconStyle="color : #c0c4cc"></u--input>
-							</template>
-						</view>
-					</pick-regions>
-				</u-form-item>
-
-				<u-form-item label="详细地址" prop="address" class='form_card'>
-					<u--textarea v-model="form.address" placeholder="请输入详细地址" count confirmType="done"></u--textarea>
-				</u-form-item>
-
-				<u-form-item label="上门时间" prop="visitTime">
+				<view class="address_wrap">
+					<view class="address_title">
+						<u-icon name="map" color="#3b82f6" size="16"></u-icon>
+						<view>地址信息</view>
+					</view>
+					<u-form-item label="详细地址" prop="address" class='form_card'>
+						<pick-regions :defaultRegion="defaultRegion" @getRegion="handleGetRegion" clearable class="region-picker">
+							<view>
+								<template v-if="form.province">
+									<u--input :value="form.province + '/' + form.city + '/' + form.area" placeholder="点击选择"
+										readonly suffixIcon="arrow-right" suffixIconStyle="color : #c0c4cc"></u--input>
+								</template>
+								<template v-else>
+									<u--input placeholder="点击选择" readonly suffixIcon="arrow-right"
+										suffixIconStyle="color : #c0c4cc"></u--input>
+								</template>
+							</view>
+						</pick-regions>
+					</u-form-item>
+					<u--textarea v-model="form.address" placeholder="粘贴地址自动识别(例如：浙江省杭州市...)" confirmType="done" @blur="handleAddressBlur"></u--textarea>
+				</view>
+				<u-form-item label="上门时间" prop="visitTime" class="visit_time_wrap">
 					<date-time-picker v-model="form.visitTime" :value-format="'YYYY-MM-DD HH:mm:ss'" :type="'datetime'">
 					</date-time-picker>
 				</u-form-item>
 
-				<u-form-item label="类型" prop="category">
-					<ld-select :list="categoryDict" label-key="dictLabel" value-key="dictValue" placeholder="请选择类型"
-						v-model="form.category" :border="false"></ld-select>
-					<u-icon slot="right" name="arrow-right"></u-icon>
+				<u-form-item label="类型" prop="category" class="category_wrap">
+					<view class="category_select_wrap">
+						<ld-select :list="categoryDict" label-key="dictLabel" value-key="dictValue" placeholder="请选择类型"
+							v-model="form.category" :border="false"></ld-select>
+						<u-icon slot="right" name="arrow-right"></u-icon>
+					</view>
 				</u-form-item>
 
-
-
 				<u-form-item label="价格范围" prop="priceRange">
-					<u--input v-model="form.priceRange" placeholder="请输入价格范围" border="none"></u--input>
+					<u--input v-model="form.priceRange" placeholder="请输入价格范围" border="surround"></u--input>
 				</u-form-item>
 
 				<u-form-item label="战术选择" prop="tactic">
@@ -88,8 +85,8 @@
 					</view>
 				</u-form-item>
 
-				<u-form-item label="备注消息" prop="remarks">
-					<u--textarea v-model="form.remarks" placeholder="请输入备注消息" count confirmType="done"></u--textarea>
+				<u-form-item label="备注信息" prop="remarks" class="remarks_wrap">
+					<u--textarea v-model="form.remarks" placeholder="填写线索来源、客户特殊要求等..." count confirmType="done"></u--textarea>
 				</u-form-item>
 
 			</u--form>
@@ -263,12 +260,31 @@ export default {
 			this.form.province = provinceData.name;
 			this.form.city = cityData.name;
 			this.form.area = areaData.name;
-			// 只在详细地址为空时自动填充省市区
-			if (!this.form.address || this.form.address.trim() === '') {
-				this.form.address = this.form.province + this.form.city + this.form.area;
+			
+			// 构建完整的地区信息
+			const regionText = this.form.province + this.form.city + this.form.area;
+			
+			// 检查当前地址内容是否为纯地区信息（没有具体街道等）
+			const isPureRegion = !this.form.address || 
+								this.form.address.trim() === '' ||
+								this.form.address.trim().includes(this.form.province) ||
+								this.form.address.trim().includes(this.form.city) ||
+								this.form.address.trim().includes(this.form.area);
+			
+			// 如果是纯地区信息或者是空地址，则更新为选择的地区
+			if (isPureRegion) {
+				this.form.address = regionText;
+			} else {
+				// 如果有具体地址信息，保留原有地址，但更新地区部分
+				// 这里可以保持原有地址不变，让用户自己选择是否更新
+				// 或者可以选择性地更新地区信息
 			}
 		},
 
+		// 地址失焦时自动解析地址信息
+		handleAddressBlur() {
+		},
+
 		// 更新各类附件
 		updateChatFiles(fileList) {
 			this.form.chatAttachmentList = fileList;
@@ -385,21 +401,16 @@ export default {
 
 <style lang="scss" scoped>
 .oder_form_wrap {
-	background-color: #f5f5f5;
+	background-color: #f8f9fa;
 	min-height: 100vh;
-	padding-bottom: 100rpx;
+	padding-bottom: 10rpx;
 	padding-top: 10px;
 	padding-left: 20rpx;
 	padding-right: 20rpx;
 }
 
-.form_wrap {
-	/* 移除整体背景和边框，让每个form-item成为独立卡片 */
-}
-
 .upload_area {
-	padding: 0 0rpx;
-	margin: 20rpx 0;
+	padding: 0 10rpx;
 }
 
 .bottom_btn {
@@ -412,9 +423,7 @@ export default {
 	box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.1);
 }
 
-.region-picker {
-	width: 100%;
-}
+
 
 ::v-deep .u-form-item {
 	/* 移除底部边框 */
@@ -422,19 +431,96 @@ export default {
 	/* 添加卡片样式 */
 	// background-color: #fff;
 	border-radius: 16rpx;
-	/* 添加阴影效果 */
-	/* 添加外边距 */
-	margin-bottom: 20rpx;
 	/* 添加内边距 */
-	padding: 20rpx;
+	padding: 10rpx;
 	/* 确保内容不会溢出 */
 	overflow: hidden;
+	.u-input--square{
+		border-radius: 20rpx;
+	}
+	.u-input--square:focus-within,
+	.u-input--square.u-input--focus {
+		border: 2rpx solid #2563eb !important;
+		background-color: #fff !important;
+	}
 }
-
-.form_card {
+.brand_wrap{
+	::v-deep .u-form-item__body__right__content{
+		border:1px solid #dadbde;
+		padding:10rpx;
+		border-radius: 20rpx;
+		.inputWrap{
+			border:none;
+		}
+	}
+}
+.address_wrap {
+	border-radius: 20rpx;
+	padding:24rpx;
+	display: flex;
+	flex-direction: column;
 	background-color: #fff;
 	box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
+	margin: 0 10rpx;
+	.address_title {
+		display: flex;
+		align-items: center;
+		background-color: #fff;
+		padding-bottom: 12rpx;
+		gap:16rpx;
+		font-size:26rpx;
+		color: #6b7280;
+		font-weight: 600;
+	}
+	::v-deep .u-form-item{
+		margin-bottom:0 !important;
+		padding:0;
+		.u-input--square{
+			background-color: #f9fafb;
+		}
+	}
+	::v-deep .u-textarea--radius{
+		border-radius: 20rpx;
+	}
+	.region-picker {
+		width: 100%;
+	}
+	::v-deep .u-textarea{
+		background-color: #f9fafb;
+	}
+}
 
+.visit_time_wrap{
+	::v-deep .uni-date-x{
+		border-radius: 10px;
+		padding: 8rpx 10rpx;
+		border:1px solid #dadbde;
+		background-color: #f8f9fa;
+	}
+}
+.category_wrap{
+	.category_select_wrap{
+		border-radius: 20rpx;
+		border:1px solid #dadbde;
+		padding:6rpx;
+		width:100%;
+		::v-deep .ldSelectInput{
+			font-size: 28rpx !important;
+		}
+	}
+	.category_select_wrap:focus-within,
+	.category_select_wrap:focus {
+		border: 2rpx solid #2563eb !important;
+		background-color: #fff !important;
+	}
+}
+.remarks_wrap{
+	.u-textarea{
+		background-color: #fff;
+	}
+	::v-deep .u-textarea--radius{
+		border-radius: 20rpx;
+	}
 }
 
 ::v-deep .u-form-item__body {
@@ -444,20 +530,17 @@ export default {
 
 ::v-deep .u-form-item__body__left__content__label {
 	color: rgb(107 114 128 / 1) !important;
-	font-size: 0.75rem;
-	line-height: 1rem;
+	font-size: 28rpx;
 	font-weight: 700;
 }
 
-
 .u-button {
 	border-radius: 40rpx;
-	background-color: rgb(29 78 216 / var(--tw-bg-opacity, 1));
-	--tw-text-opacity: 1;
-	color: rgb(255 255 255 / var(--tw-text-opacity, 1));
+	background-color:#2563eb;
+	border:none;
+	color:#fff;
 	font-weight: 700;
-	font-size: 1rem;
-	line-height: 1.5rem;
+	font-size: 40rpx;
 	height: 100rpx;
 }
 
@@ -478,7 +561,7 @@ export default {
 	line-height: 80rpx;
 	text-align: center;
 	border-radius: 30rpx;
-	background-color: #f5f5f5;
+	background-color: #f9fafb;
 	color: rgb(107 114 128 / 1);
 	font-size: 28rpx;
 	transition: all 0.3s ease;
@@ -486,8 +569,9 @@ export default {
 }
 
 .tactic-button.active {
-	border-color: rgb(29 78 216 / 1);
-	color: rgb(29 78 216 / 1);
+	border-color: #3b82f6;
+	color: #3b82f6;
+	background-color: #eff6ff;
 }
 
 .tactic-button::after {
@@ -503,7 +587,7 @@ export default {
 	width: 25rpx;
 	height: 25rpx;
 	border-radius: 50%;
-	background-color: rgb(29 78 216 / 1);
+	background-color: #3b82f6;
 	opacity: 0;
 	transition: all 0.3s ease;
 }

pages/pagereceivecenter/pagereceivecenter.vue

@@ -19,16 +19,41 @@ export default {
             currentOrder: {},
             followUpModelShow: false,
             followUpNotes: '',
+            countdown: 300,
+            countdownIntervals: null
         }
     },
     onLoad() {
         //初始调用
         this.getOrderList();
+        this.countdownInterval()
         // uni.navigateTo({
         //     url: `/pages/orderDetailNew/index?orderId=5464&item=测试发单&type=undefined&clueId=1973381744953516033`,
         // })
     },
+    onUnload() {
+        clearInterval(this.countdownInterval);
+    },
+    watch: {
+        countdown: {
+            handler(newVal, oldVal) {
+                if (newVal <= 0) {
+                    this.orderList.forEach(order => {
+                        if (order.status == 1) {
+                            this.handleBtnClick('isBusy', order)
+                        }
+                    })
+                }
+            },
+            immediate: true
+        }
+    },
     methods: {
+        countdownInterval() {
+            this.countdownInterval = setInterval(() => {
+                this.countdown--
+            }, 1000);
+        },
         //获取列表数据
         async getOrderList() {
             try {
@@ -175,6 +200,7 @@ export default {
             if (res.code == 200) {
                 uni.$u.toast('提交待跟进记录成功');
             }
+            this.followUpNotes = '';
         },
     }
 }
@@ -201,10 +227,33 @@ export default {
                             <!-- <view class="mainLindImg">
                                 <image :src="'/static/acceptOrder/orderCardPic.jpg'" v-if="item.src" />
                             </view> -->
+                            <view class="itemName">{{ item.item || '暂无项目' }}</view>
+
                             <view class="mainLindInfo">
-                                <view class="itemName">{{ item.item || '暂无项目' }}</view>
-                                <view>发单人:{{ item.createNickName || '未知' }}</view>
-                                <view>{{ item.sendDate || '暂无时间' }}</view>
+                                <view class="infoItem">
+                                    <view class="infoItemTitle">发单人:</view>
+                                    <view>{{ item.createNickName || '未知' }}</view>
+                                </view>
+                                <view class="infoItem">
+                                    <view class="infoItemTitle">机构：</view>
+                                    <view>{{ item.orgName || '暂无机构' }}</view>
+                                </view>
+                                <view class="infoItem">
+                                    <view class="infoItemTitle">电话：</view>
+                                    <view>{{ item.phone || '暂无电话' }}</view>
+                                </view>
+                                <view class="infoItem">
+                                    <view class="infoItemTitle">接单人：</view>
+                                    <view>{{ item.identificationName || '暂无所属人' }}</view>
+                                </view>
+                                <view class="infoItem">
+                                    <view class="infoItemTitle">运营人：</view>
+                                    <view>{{ item.clueOperationName || '暂无运营人' }}</view>
+                                </view>
+                                <view class="infoItem">
+                                    <view class="infoItemTitle">发单日期：</view>
+                                    <view>{{ item.sendDate || '暂无时间' }}</view>
+                                </view>
                             </view>
                         </view>
 
@@ -217,27 +266,24 @@ export default {
 
                         <view class="Btns">
 
-                            <view class="btnGroup"
-                                v-if="item && (item.status == '1' || item.status == null || item.status === undefined)">
+                            <view class="btnGroup" v-if="item && (item.status == '1')">
                                 <view class="card-button" @click.stop="handleBtnClick('acceptOrder', item)">立即接单</view>
-                                <view class=" card-button isBusy" @click.stop="handleBtnClick('isBusy', item)">在忙</view>
+                                <view class=" card-button isBusy" @click.stop="handleBtnClick('isBusy', item)">
+                                    在忙（{{ countdown }}s）</view>
                             </view>
 
-                            <view class="btnGroup"
-                                v-if="item && (item.status == '2' || item.status == null || item.status === undefined)">
+                            <view class="btnGroup" v-if="item && (item.status == '2')">
                                 <view class="card-button willFollow" @click.stop="handleBtnClick('willFollow', 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="btnGroup" v-if="item && (item.status == '3')">
                                 <view class="card-button share" @click.stop="handleBtnClick('share', item)">一键分享</view>
-                            </view>
+                            </view> -->
 
-                            <view class="btnGroup"
-                                v-if="item && (item.status == '4' || item.status == null || item.status === undefined)">
+                            <view class="btnGroup" v-if="item && (item.status == '4')">
                                 <view class="card-button oneFollow" @click.stop="handleBtnClick('oneFollow', item)">待跟进
                                 </view>
                             </view>
@@ -255,9 +301,9 @@ export default {
 
 
         <!-- 打标签模态窗 -->
-        <u-modal :show="tagModalVisible" title="选择标签" @confirm="confirmTag" @cancel="cancelTag">
+        <u-modal showCancelButton :show="tagModalVisible" title="选择标签" @confirm="confirmTag" @cancel="cancelTag">
             <view class="slot-content">
-                <u-checkbox-group v-model="currentTags" placement="column">
+                <u-checkbox-group class="tagCheckboxGroup" v-model="currentTags" placement="column">
                     <u-checkbox :customStyle="{ marginBottom: '8px' }" v-for="(item, index) in tagList" :key="item.id"
                         :label="item.name" :name="item.id">
                     </u-checkbox>
@@ -265,12 +311,11 @@ export default {
             </view>
         </u-modal>
 
-        <u-modal :show="followUpModelShow" :title="'填写跟进细节'" :showConfirmButton="false">
+        <u-modal showCancelButton :show="followUpModelShow" :title="'填写跟进细节'" @confirm="confirmFollowUp"
+            @cancel="followUpModelShow = false">
             <view class="modal-content">
                 <u--textarea v-model="followUpNotes" placeholder="请输入情况" confirm-type="done"
                     style="width: 400rpx; margin-bottom: 30rpx;"></u--textarea>
-
-                <u-button type="primary" size="large" @click="confirmFollowUp">确认</u-button>
             </view>
         </u-modal>
     </view>
@@ -358,6 +403,7 @@ export default {
     justify-content: space-between;
     align-items: center;
     gap: 20rpx;
+    flex-direction: column;
 }
 
 /* 主要内容行图片容器 */
@@ -369,19 +415,30 @@ export default {
 
 /* 主要内容行信息容器 */
 .orderCard .mainLind .mainLindInfo {
-    flex: 1;
-    display: flex;
+    display: grid;
+    grid-template-columns: 1fr 1fr;
     flex-direction: column;
     gap: 10rpx;
     font-size: 24rpx;
     color: #6b7280;
+    text-wrap: nowrap;
+
+    .infoItem {
+        display: flex;
+
+        .infoItemTitle {
+            font-weight: 700;
+        }
+    }
 }
 
 /* 商品名称 */
-.orderCard .mainLind .mainLindInfo .itemName {
+.orderCard .mainLind .itemName {
     font-size: 30rpx;
     font-weight: 700;
     color: #374751;
+    width: 100%;
+    text-align: left;
 }
 
 /* 标签区域 */
@@ -453,4 +510,14 @@ export default {
     background-color: #EFF6FF;
     color: #2563EB;
 }
+
+.cancelBtn {
+    margin-top: 20rpx;
+}
+
+
+.tagCheckboxGroup {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+}
 </style>

pages/person/cards/index.vue

@@ -108,7 +108,7 @@
             </view>
         </view>
         <!-- 最新线索 -->
-        <view class="latest_clue"  v-if="clueList.length > 0">
+        <view class="latest_clue" v-if="clueList.length > 0">
             <view class="clue_header">
                 <text class="card_title">最新线索</text>
                 <view class="more_btn" @click="toPrivateClue">
@@ -232,28 +232,28 @@ export default {
     },
 
     methods: {
-        getCardData() {
-            uni.$u.api.getPersonCards().then(res => {
-              if (res.code === 200) {
-                this.cardData = res.data;
-              }
-            });
-        },
-        getClueList() {
-            uni.$u.api.getPersonLatestClue().then(res => {
-                if (res.code === 200) {
-                    this.clueList = res.data;
-                }
-            });
-        },
-        getChartData() {
-            uni.$u.api.getPersonRanking().then(res => {
-                if (res.code === 200) {
-                    this.chartData.categories = res.data.map(item => item.x);
-                    this.chartData.series[0].data = res.data.map(item => item.y);
-                }
-            });
-        },
+        // getCardData() {
+        //     uni.$u.api.getPersonCards().then(res => {
+        //       if (res.code === 200) {
+        //         this.cardData = res.data;
+        //       }
+        //     });
+        // },
+        // getClueList() {
+        //     uni.$u.api.getPersonLatestClue().then(res => {
+        //         if (res.code === 200) {
+        //             this.clueList = res.data;
+        //         }
+        //     });
+        // },
+        // getChartData() {
+        //     uni.$u.api.getPersonRanking().then(res => {
+        //         if (res.code === 200) {
+        //             this.chartData.categories = res.data.map(item => item.x);
+        //             this.chartData.series[0].data = res.data.map(item => item.y);
+        //         }
+        //     });
+        // },
         // 跳转私有线索页面
         toPrivateClue() {
             uni.switchTab({ url: '/pages/privateClue/index' });
@@ -264,7 +264,7 @@ export default {
         this.getClueList();
         this.getChartData();
     },
-    
+
 };
 </script>
 

store/modules/user.js

@@ -28,8 +28,8 @@ export default {
 		netConfig: {
 			// http://59.42.9.166:9520/proxy
 			// http://10.0.7.100:9500
-			// ip: "https://crm.nanjingshiyu.com/prod-api", // ip
-			ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
+			ip: "https://crm.nanjingshiyu.com/prod-api", // ip
+			// ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
 			// ip : "/api", // 测试环境ip
 			// ip : "http://47.113.184.101", // 测试环境ip
 			// ip: "http://172.16.7.200", // ip