From 8cdd8a45779d4e0c86bfd1e5f7224b1671b2915a Mon Sep 17 00:00:00 2001 From: wangfukang <15630117759@163.com> Date: Mon, 6 Apr 2026 17:12:29 +0800 Subject: [PATCH] 1 --- package1/buyFood/buyFood.vue | 1 + package1/order/orderDetail.vue | 193 +++++++++++++++++++++++---------- package1/order/orderList.vue | 11 +- 3 files changed, 145 insertions(+), 60 deletions(-) diff --git a/package1/buyFood/buyFood.vue b/package1/buyFood/buyFood.vue index 0e2bcd2..1b4251b 100644 --- a/package1/buyFood/buyFood.vue +++ b/package1/buyFood/buyFood.vue @@ -842,6 +842,7 @@ if (this.selected === 'zhiding' && this.assignedWorker) { payload.workerParam = { workerId: this.assignedWorker.workerId, + workerName: this.assignedWorker.workerName, orderBkge: parseFloat(this.assignedWorker.orderBkge || 0) }; } else if (this.selected === 'buzhiding') { diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue index 2f94f99..3ebaf3d 100644 --- a/package1/order/orderDetail.vue +++ b/package1/order/orderDetail.vue @@ -10,35 +10,34 @@ - + 外卖配送 - 竹仔园牛仔农庄(第六分店) + {{orderDetail.shopName}} - + - 牛仔农庄(医专店) + {{item1.productName}} - 打分；不要啦 + {{item1.specs}} - X1 + X{{item1.quantity}} - ￥90.00 拼团 - ￥59.9 + ￥{{item1.price}} @@ -48,7 +47,7 @@ - 差1人即可成团 + 差{{orderDetail.groupInfo.targetMembers - orderDetail.groupInfo.currentMembers}}人即可成团 @@ -60,22 +59,23 @@ - + + - - - + - - - - - 剩余23:59:23结束 分享至微信 + + 取消订单 + + + 补差价转直接购买 + + + 刷新 + @@ -92,7 +92,12 @@ - + + + + + + + 待支付 + 等待配送员接单 + 配送员已接单 + 待消费 + 配送员已取货 + 订单已完成 + 等待商家同意退款 + 订单已取消 + 订单已退款 - - 预计10:51送达 + + 预计{{orderDetail.deliveryInfo.mustFinishTime | formatHourMinute }}送达 - - 送至 北校区1号宿舍楼6楼612 + + 送至 {{orderDetail.deliveryInfo.receiverAddress}} - + 取消订单 + + 刷新 + - - 核销取餐码 + + 核销取餐码 需要画二维码 + + + 立即备餐 + + + 增加配送佣金 + 配送员 - - 不指定 + + {{orderDetail.deliveryInfo.workerName != null ? orderDetail.deliveryInfo.workerName : ''}} + + + 未指定等待接单中 - + 订单号 - 3847283739782938 + {{orderDetail.numberCode}} @@ -250,7 +266,7 @@ 下单时间 - 2026-02-01 23:00:00 + {{orderDetail.createTime}} @@ -263,6 +279,18 @@ + + + + + 确定要取消订单吗 + 取消订单需要商家同意 + + + 确认取消 + + + @@ -273,12 +301,32 @@ pintuan:false, menuButtonInfo: {}, orderId:'', + payData:{}, orderDetail:{}, codeImg:'https://jewel-shop.oss-cn-beijing.aliyuncs.com/3a4e68eb14d7417cbb4f15fa85907c64.jpg' } }, components: { + }, + filters: { + formatHourMinute(value) { + if (!value) return ''; + + const date = new Date(value); + + // 获取日 (getDate)，并补齐0 + const day = String(date.getDate()).padStart(2, '0'); + + // 获取小时 (getHours)，并补齐0 + const hour = String(date.getHours()).padStart(2, '0'); + + // 获取分钟 (getMinutes)，并补齐0 + const minute = String(date.getMinutes()).padStart(2, '0'); + + // 拼接格式：日-日-时:分 + return `${day}-${hour}:${minute}`; + } }, onLoad(option) { if (option.id) { @@ -293,6 +341,36 @@ openCode(){ this.$refs.imgPopup.open() }, + orderStatus(item){ + if(item.status == 0 || item.status == 10 || item.status == 2 || (item.status == 3 && item.deliveryType == 1) || (item.status == 3 && item.deliveryType == 2) || item.status == 4){ + return true; + } + return false; + }, + returnPopupProp(item){ + this.payData = item; + this.$refs.returnPopup.open('bottom'); + }, + returnOrder(){ + this.$refs.returnPopup.close(); + let item = this.payData + let that = this + that.tui.request("/mall/order/cancel", "POST", {orderId:item.id,userId:uni.getStorageSync('id')}, false, true).then((res) => { + if (res.code == 200) { + that.tui.toast("取消订单成功"); + that.getOrderDetail(item.id) + that.$forceUpdate(); + } else { + that.tui.toast(res.message); + return; + } + uni.hideLoading(); + }).catch((res) => {}); + }, + refreah(item){ + this.getOrderDetail(item.id) + this.$forceUpdate(); + }, getOrderDetail(id){ let that = this that.tui.request("/mall/order/detail/"+id, "GET", {}, false, true).then((res) => { @@ -300,10 +378,11 @@ that.orderDetail = res.result; if(that.orderDetail.groupInfo){ //还没有拼团成功拼团状态 0:拼团中 1:拼团成功 2:拼团失败 3:面对面团(不公开) - if(that.orderDetail.groupInfo.status != 1){ + if(that.orderDetail.groupInfo.status != 1 && that.orderDetail.groupInfo.status != 2){ that.pintuan = true; } } + that.$forceUpdate(); } else { that.tui.toast(res.message) return diff --git a/package1/order/orderList.vue b/package1/order/orderList.vue index 3577842..affcbdb 100644 --- a/package1/order/orderList.vue +++ b/package1/order/orderList.vue @@ -182,13 +182,13 @@ style="background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));color: #000;"> 去支付 - + 查看订单 - @@ -355,6 +355,11 @@ } return false; }, + orderDetail(id){ + uni.redirectTo({ + url: '/package1/order/orderDetail?id=' + id + }); + }, checkTabs2(type) { this.tab2Checked = type; this.searchForm.searchStatus = type;