部分字段绑定接口

pages/acceptOrderOrder/compounts/orderCard.vue

@@ -2,13 +2,16 @@
     <view class="order-card" :class="{ 'order-card-overTime': order.isDelay }" @click.stop="handleClick(order)">
         <view class="order-card-header">
             <view class="order-card-header-left">
+                <view class="order-card-header-left-band" style="backgroundColor: #007AFF;" v-show="order.itemBrand">
+                    {{ order.itemBrand }}
+                </view>
                 <view class="order-card-header-left-band" v-for="value in order.tags" :key="value.id"
                     :style="{ backgroundColor: value.color }">
                     {{ value.name }}
                 </view>
-                <view class="order-card-header-left-band" v-if="order.tags.length == 0" style="backgroundColor: #999;">
+                <!-- <view class="order-card-header-left-band" v-if="order.tags.length == 0" style="backgroundColor: #999;">
                     暂无标签
-                </view>
+                </view> -->
             </view>
             <view class="order-card-header-right">
                 <view class="order-card-header-right-price">
@@ -36,7 +39,7 @@
                 </u-col>
                 <u-col span="5.5">
                     <view @click.stop="handleBusy(order)">
-                        <u-button type="primary" size="medium">在忙</u-button>
+                        <u-button type="primary" size="medium">在忙（{{ buzyTime / 1000 }}s）</u-button>
 
                     </view>
                 </u-col>
@@ -62,11 +65,19 @@
                     </view>
                 </u-col>
             </u-row>
+            <u-row justify="between" v-if="order.status == '4'">
+                <u-col span="12">
+                    <view @click.stop="handleShare(order)">
+                        <u-button type="primary" size="medium">待跟进</u-button>
+                    </view>
+                </u-col>
+            </u-row>
         </view>
     </view>
 </template>
 
 <script>
+// order.status 1未接，2已接单，3完成一键分享，4未接待跟进
 export default {
     props: {
         order: {
@@ -74,6 +85,14 @@ export default {
             default: () => ({})
         }
     },
+    data() {
+        return {
+            buzyTime: 300000,
+            // buzyTime: 5000,
+            busyTimer: null,
+
+        }
+    },
     computed: {
         statue() {
             switch (this.order.status) {
@@ -86,16 +105,42 @@ export default {
             }
         }
     },
+    watch: {
+        buzyTime: {
+            handler(newVal) {
+                // console.log('newVal', newVal);
+                if (newVal == 0) {
+
+                    // 移动到最后
+                    this.handleBusy(this.order)
+                }
+            },
+            deep: true
+        }
+    },
+
+    mounted() {
+        this.openTimer()
+        console.log('order', this.order);
+
+    },
+    beforeDestroy() {
+        this.closeTimer()
+    },
     methods: {
         handleAcceptOrder(order) {
-            console.log('立即接单',order);
-             this.$emit('handleCardClick', order);
+            console.log('立即接单', order);
+            this.$emit('handleCardClick', order);
         },
         handleWillFollow(order) {
             console.log('待跟进', order);
         },
         handleBusy(order) {
+            this.closeTimer()
             console.log('在忙', order);
+            this.$emit('handleBuzyBtnClick', {
+                ...order,
+            });
         },
         handleTag(order) {
             console.log('打标签', order);
@@ -106,7 +151,22 @@ export default {
         handleClick(order) {
             console.log('点击了订单', order);
             this.$emit('handleCardClick', order);
+        },
+        openTimer() {
+            // 组件挂载时启动定时器
+            console.log('组件挂载时启动定时器');
+            this.busyTimer = setInterval(() => {
+                this.buzyTime -= 1000;
+            }, 1000);
+        },
+        closeTimer() {
+            // 组件卸载时清理定时器，防止内存泄漏
+            if (this.busyTimer) {
+                clearInterval(this.busyTimer);
+                this.busyTimer = null;
+            }
         }
+
     }
 }
 </script>

pages/acceptOrderOrder/index.vue

@@ -3,11 +3,16 @@
 		<u-navbar title="接单中心" :autoBack="true" :placeholder="true" v-hideNav></u-navbar>
 
 		<scroll-view class="scroll_wrap" scroll-y @scrolltolower="scrolltolower">
-			<order-card v-for="order in ordersList" :key="order.id" :order="order" @handleCardClick="handleCardClick"></order-card>
+			<order-card v-for="order, index in ordersList" :key="order.receiptId" :order="order"
+				@handleCardClick="handleCardClick" @handleBuzyBtnClick="handleBuzyBtnClick"></order-card>
 			<view class="hasMore">
 				{{ ordersList.length >= page.total ? '没有更多了~' : '向下滑动加载更多~' }}
 			</view>
 		</scroll-view>
+
+		<view class="createOrder" @click="handleAddClick">
+			<u-icon name="plus" size="30" color="#ffffff"></u-icon>
+		</view>
 	</view>
 </template>
 <script>
@@ -32,17 +37,17 @@ export default {
 	methods: {
 		async getOrderList() {
 
-			const { rows,total } = await uni.$u.api.selectClueOrderFormList({
+			const { rows, total } = await uni.$u.api.selectClueOrderFormList({
 				pageSize: this.page.pageSize,
 				pageNum: this.page.pageNum,
 			}
 			);
 			console.log('接单列表', rows);
 			this.ordersList.push(...rows);
-			this.page.total=total;
+			this.page.total = total;
 		},
 		scrolltolower() {
-			if(this.ordersList.length>=this.page.total){
+			if (this.ordersList.length >= this.page.total) {
 				return uni.$u.toast('没有更多了');
 			}
 			this.page.pageNum++;
@@ -52,6 +57,7 @@ export default {
 			this.ordersList = [];
 			this.page.pageNum = 1;
 		},
+		// 跳转按钮接单
 		handleCardClick(order) {
 			console.log('点击了订单', order);
 			//跳转
@@ -64,6 +70,19 @@ export default {
 				url: `/pages/orderDetailNew/index?orderId=${order.id}&item=${order.item}&type=${this.type}&clueId=${order.clueId}`,
 			})
 		},
+		// 在忙按钮先延迟把当前项目移动到队列末尾
+		// 点击或者在忙的时候倒计时300s结束之后触发
+		// 目前的问题是移动到当前10个item
+		// 队列的最后，而不是全部队列的最后
+		handleBuzyBtnClick(order) {
+			console.log('在忙', order);
+			// 先把当前项目移动到队列末尾
+			const index = this.ordersList.findIndex(item => item.id == order.id);
+			if (index != -1) {
+				const item = this.ordersList.splice(index, 1)[0];
+				this.ordersList.push(item);
+			}
+		},
 
 	},
 	onLoad() {
@@ -76,13 +95,30 @@ export default {
 </script>
 
 <style scoped>
-	.scroll_wrap {
-		height: calc( 100vh - 44px );
-	}
-	.hasMore {
-		text-align: center;
-		padding: 20rpx 0;
-		font-size: 24rpx;
-		color: #999;
-	}
+.scroll_wrap {
+	height: calc(100vh - 44px);
+}
+
+.hasMore {
+	text-align: center;
+	padding: 20rpx 0;
+	font-size: 24rpx;
+	color: #999;
+}
+
+.createOrder {
+	position: fixed;
+	bottom: 20rpx;
+	right: 20rpx;
+	z-index: 999;
+	background-color: #007AFF;
+	border-radius: 50%;
+	padding: 10rpx;
+	box-shadow: 0 2px 12px rgba(0, 0, 0, 0.04);
+	width: 80rpx;
+	height: 80rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
 </style>

pages/orderDetailNew/components/orderDetailNewView.vue

@@ -2,16 +2,17 @@
     <view class="orderDetailNewView">
 
         <view class="page-item" v-show="activeIndex === 0">
-            <pageOne @handleNextClick="handleNextClick" />
+            <pageOne @handleNextClick="handleNextClick" :orderDetail="detail" />
         </view>
         <view class="page-item" v-show="activeIndex === 1">
-            <pageTwo @handleNextClick="handleNextClick" />
+            <pageTwo @handleNextClick="handleNextClick" :orderDetail="detail" />
         </view>
         <view class="page-item" v-show="activeIndex === 2">
-            <pageThree @handleNextClick="handleNextClick" :detailImages="allFroms.formTwo.detailImages || []" />
+            <pageThree @handleNextClick="handleNextClick" :detailImages="allFroms.formTwo.detailImages || []"
+                :orderDetail="detail" />
         </view>
         <view class="page-item" v-show="activeIndex === 3">
-            <pageFour @handleNextClick="handleNextClick" />
+            <pageFour @handleNextClick="handleNextClick" :orderDetail="detail" />
         </view>
 
         <ul class="page">
@@ -27,6 +28,12 @@ import pageTwo from './pageTwo.vue'
 import pageThree from './pageThree.vue'
 import pageFour from './pageFour.vue'
 export default {
+    props: {
+        detail: {
+            type: Object,
+            default: () => { },
+        }
+    },
     components: {
         pageOne,
         pageTwo,

pages/orderDetailNew/components/pageFour.vue

@@ -189,6 +189,12 @@
 
 <script>
 export default {
+    props: {
+        orderDetail: {
+            type: Object,
+            default: () => { },
+        }
+    },
     data() {
         return {
             // 入库信息相关的数据
@@ -288,19 +294,31 @@ export default {
         },
         // 重新计算分成比例
         recalculatePercentage() {
-            const totalRows = this.profitSharingList.length;
-            if (totalRows > 0) {
-                // 计算平均比例（向下取整）
-                const avgPercentage = Math.floor(100 / totalRows);
-                // 设置所有行的比例
-                this.profitSharingList.forEach(item => {
-                    item.percentage = avgPercentage;
+            // 分别计算前端和后端的行数
+            const frontendRows = this.profitSharingList.filter(item => item.accountType === 'frontend');
+            const backendRows = this.profitSharingList.filter(item => item.accountType === 'backend');
+
+            // 计算前端平均比例
+            if (frontendRows.length > 0) {
+                const frontendAvg = Math.floor(100 / frontendRows.length);
+                frontendRows.forEach(item => {
+                    item.percentage = frontendAvg;
+                });
+            }
+
+            // 计算后端平均比例
+            if (backendRows.length > 0) {
+                const backendAvg = Math.floor(100 / backendRows.length);
+                backendRows.forEach(item => {
+                    item.percentage = backendAvg;
                 });
             }
         },
         // 切换账户类型
         toggleAccountType(item) {
             item.accountType = item.accountType === 'frontend' ? 'backend' : 'frontend';
+            // 重新计算分成比例
+            this.recalculatePercentage();
         },
         // 处理百分比输入
         handlePercentageInput(item) {
@@ -357,15 +375,29 @@ export default {
                 }
             }
 
-            // 校验分成比例总和,总和必须是100%
-            // const totalPercentage = this.profitSharingList.reduce((sum, item) => sum + Number(item.percentage), 0);
-            // if (totalPercentage !== 100) {
-            //     uni.showToast({
-            //         title: '分成比例总和必须为100%',
-            //         icon: 'none'
-            //     });
-            //     return false;
-            // }
+            // 校验前端分成比例总和必须是100%
+            const frontendTotal = this.profitSharingList
+                .filter(item => item.accountType === 'frontend')
+                .reduce((sum, item) => sum + Number(item.percentage), 0);
+            if (frontendTotal !== 100) {
+                uni.showToast({
+                    title: '前端分成比例总和必须为100%',
+                    icon: 'none'
+                });
+                return false;
+            }
+
+            // 校验后端分成比例总和必须是100%
+            const backendTotal = this.profitSharingList
+                .filter(item => item.accountType === 'backend')
+                .reduce((sum, item) => sum + Number(item.percentage), 0);
+            if (backendTotal !== 100) {
+                uni.showToast({
+                    title: '后端分成比例总和必须为100%',
+                    icon: 'none'
+                });
+                return false;
+            }
 
             return true;
         }

pages/orderDetailNew/components/pageOne.vue

@@ -48,21 +48,21 @@
             <u-row class="info-row">
                 <u-col span="6">
                     <view class="info-label">发单人</view>
-                    <view class="info-value">张三</view>
+                    <view class="info-value">{{ orderDetail.createNickName || '未填写' }}</view>
                 </u-col>
                 <u-col span="6">
                     <view class="info-label">型号</view>
-                    <view class="info-value">iPhone 15 Pro</view>
+                    <view class="info-value">{{ orderDetail.model || '未填写' }}</view>
                 </u-col>
             </u-row>
             <u-row class="info-row">
                 <u-col span="6">
                     <view class="info-label">上门时间</view>
-                    <view class="info-value">2025-12-20 14:30</view>
+                    <view class="info-value">{{ orderDetail.visitTime || '未填写' }}</view>
                 </u-col>
                 <u-col span="6">
                     <view class="info-label">地址</view>
-                    <view class="info-value">北京市朝阳区建国路88号</view>
+                    <view class="info-value">{{ orderDetail.address || '未填写' }}</view>
                 </u-col>
             </u-row>
         </view>
@@ -73,13 +73,13 @@
                 <u-icon name="phone" size="40" color="#07C160" style="margin-bottom: 10rpx;"></u-icon>
                 <view class="connect-title">电话</view>
                 <!-- 小红点 -->
-                <view v-if="phone" class="red-dot"></view>
+                <view v-if="orderDetail.phone" class="red-dot"></view>
             </view>
             <view class="connect-card wechat-card" @click="handleWechatClick">
                 <u-icon name="chat" size="40" color="#07C160" style="margin-bottom: 10rpx;"></u-icon>
                 <view class="connect-title">微信</view>
                 <!-- 小红点 -->
-                <view v-if="wechat" class="red-dot"></view>
+                <view v-if="orderDetail.wechat" class="red-dot"></view>
             </view>
         </view>
 
@@ -91,6 +91,12 @@
 import picComp from './picComp.vue'
 
 export default {
+    props: {
+        orderDetail: {
+            type: Object,
+            default: () => { },
+        }
+    },
     components: {
         picComp
     },
@@ -100,11 +106,13 @@ export default {
                 truePic: [],
                 chatRecords: [],
             },
-            phone: '13800138000',
-            wechat: 'wechat123456',
-            // 控制小红点显示的变量
         }
     },
+    beforeMount() {
+        setTimeout(() => {
+            console.log('orderDetail', this.orderDetail);
+        }, 5000)
+    },
     methods: {
         // 上传图片
         uploadImage(type) {
@@ -162,13 +170,27 @@ export default {
         },
         // 电话卡片点击事件
         handlePhoneClick() {
-            console.log('电话卡片被点击', '电话号码:', this.phone)
-            // 这里可以添加拨打电话的逻辑，例如调用uni.makePhoneCall
+            console.log('电话卡片被点击', '电话号码:', this.orderDetail.phone)
+            if (this.orderDetail.phone) {
+                //    稍后调用整个拨打电话的逻辑
+            } else {
+                uni.showToast({
+                    title: '该订单暂时没有电话号码',
+                    icon: 'none'
+                })
+            }
         },
         // 微信卡片点击事件
         handleWechatClick() {
-            console.log('微信卡片被点击', '微信号:', this.wechat)
-            // 这里可以添加打开微信的逻辑
+            console.log('微信卡片被点击', '微信号:', this.orderDetail.wechat)
+            if (this.orderDetail.wechat) {
+                //    稍后调用打开微信的逻辑
+            } else {
+                uni.showToast({
+                    title: '该订单暂时没有微信号',
+                    icon: 'none'
+                })
+            }
         },
         // 下一步
         handleNextClick() {
@@ -328,8 +350,8 @@ export default {
     position: absolute;
     top: 15rpx;
     right: 15rpx;
-    width: 16rpx;
-    height: 16rpx;
+    width: 25rpx;
+    height: 25rpx;
     background-color: #ff4d4f;
     border-radius: 50%;
     box-shadow: 0 0 4rpx rgba(255, 77, 79, 0.3);

pages/orderDetailNew/components/pageThree.vue

@@ -128,15 +128,38 @@
 import picComp from './picComp.vue'
 
 export default {
-    components: {
-        picComp
-    },
     props: {
+        orderDetail: {
+            type: Object,
+            default: () => { },
+        },
         detailImages: {
             type: Array,
             default: () => []
         }
     },
+    watch: {
+        orderDetail: {
+            handler(newVal) {
+                if (newVal) {
+                    this.paymentInfo.accountHolder = newVal.accountHolder || ''
+                    this.paymentInfo.bankName = newVal.bankName || ''
+                    this.paymentInfo.bankAccount = newVal.bankCardNumber || ''
+                    this.paymentInfo.idNumber = newVal.idCard || ''
+                }
+            },
+            deep: true,
+        },
+        detailImages: {
+            handler(newVal) {
+                this.localDetailImages = [...newVal];
+            },
+            deep: true
+        }
+    },
+    components: {
+        picComp
+    },
     data() {
         return {
             unpaidModelShow: false,
@@ -160,14 +183,7 @@ export default {
             startY: 0 // 触摸起始Y坐标
         };
     },
-    watch: {
-        detailImages: {
-            handler(newVal) {
-                this.localDetailImages = [...newVal];
-            },
-            deep: true
-        }
-    },
+
     methods: {
         // 上传高清细节图
         uploadDetailImage() {

pages/orderDetailNew/components/pageTwo.vue

@@ -132,6 +132,23 @@
 import picComp from './picComp.vue'
 
 export default {
+    props: {
+        orderDetail: {
+            type: Object,
+            default: () => { },
+        }
+    },
+    watch: {
+        orderDetail: {
+            handler(newVal, oldVal) {
+                if (newVal) {
+                    this.approvedPrice = newVal.itemPrice || 0;
+                }
+            },
+            deep: true,
+        }
+    },
+
     components: {
         picComp
     },

pages/orderDetailNew/index.vue

@@ -12,14 +12,14 @@
                 </view>
             </template>
             <template v-slot:right>
-                <view class="slot-right">
+                <view class="slot-right" @click="handleAddClick">
                     <image src="/static/icons/plus.png" mode="scaleToFill" />
                     <text>加一单</text>
                 </view>
             </template>
         </u-navbar>
 
-        <orderDetailNewView />
+        <orderDetailNewView :detail="receiptDetail" />
 
         <!-- 通用模态窗 -->
         <custom-modal :visible="modalVisible" :title="modalConfig.title" :value="modalConfig.value"
@@ -49,9 +49,27 @@ export default {
                 title: '',
                 value: '',
                 placeholder: ''
-            }
+            },
+            item: '',
+            orderId: '',
+            type: '',
+            clueId: '',
+            // 订单详情
+            receiptDetail: {},
         }
     },
+    onLoad(option) {
+        // 接收参数
+        const { item, orderId, type, clueId } = option;
+        console.log('接收的参数：', option);
+        this.item = item;
+        this.orderId = orderId;
+        this.type = type;
+        this.clueId = clueId;
+
+        //查询订单详情
+        this.getOrderDetail();
+    },
     methods: {
         handleBrandClick() {
             this.openModal('brand', '请输入品牌', this.topInfo.brand, '请输入品牌')
@@ -85,6 +103,21 @@ export default {
 
             this.modalVisible = false
             this.currentEditField = ''
+        },
+        handleAddClick() {
+            console.log('加一单')
+        },
+
+        //查询订单详情
+        async getOrderDetail() {
+            const res = await uni.$u.api
+                .getClueSendFormVoByOrderId({
+                    id: this.orderId,
+                })
+            console.log('订单详情', res);
+            if (res.code === 200) {
+                this.receiptDetail = res.data;
+            }
         }
     }
 }