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

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>
 
@@ -149,26 +149,19 @@ export default {
             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,17 +219,21 @@ export default {
             const allImages = [...this.trueUploadList, ...this.chatRecordsUploadList];
             //取出所有图的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 {
@@ -247,6 +244,127 @@ export default {
             }
         },
 
+        // 保存图片到本地相册
+        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,10 +38,10 @@
                 <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.slice(0, 6)"
@@ -501,6 +501,7 @@ export default {
         display: flex;
         flex-wrap: wrap;
         gap: 20rpx;
+        position: relative;
     }
 
     .detail-image-item {
@@ -534,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

@@ -231,7 +231,135 @@ 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);
+                    }
+                });
+            });
         },
 
         // 下一步按钮点击事件

pages/pagereceivecenter/pagereceivecenter.vue

@@ -19,16 +19,41 @@ export default {
             currentOrder: {},
             followUpModelShow: false,
             followUpNotes: '',
+            countdown: 3000,
+            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 {
@@ -222,13 +247,13 @@ export default {
                         <view class="Btns">
 
                             <view class="btnGroup"
-                                v-if="item && (item.status == '1' || item.status == null || item.status === undefined)">
+                                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)">
+                                v-if="item && (item.status == '2')">
                                 <view class="card-button willFollow" @click.stop="handleBtnClick('willFollow', item)">
                                     待跟进
                                 </view>
@@ -236,12 +261,12 @@ export default {
                             </view>
 
                             <view class="btnGroup"
-                                v-if="item && (item.status == '3' || item.status == null || item.status === undefined)">
+                                v-if="item && (item.status == '3')">
                                 <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)">
+                                v-if="item && (item.status == '4')">
                                 <view class="card-button oneFollow" @click.stop="handleBtnClick('oneFollow', item)">待跟进
                                 </view>
                             </view>