From 8db406540bdc850f562aae6b7c779cca3b9b953b Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Thu, 23 Apr 2026 15:54:28 +0800
Subject: [PATCH] 11
---
package2/shop/shopOrderList.vue | 112 +++++++++++++++++++++++++++++++-
1 file changed, 111 insertions(+), 1 deletion(-)
diff --git a/package2/shop/shopOrderList.vue b/package2/shop/shopOrderList.vue
index df211a9..53a8e13 100644
--- a/package2/shop/shopOrderList.vue
+++ b/package2/shop/shopOrderList.vue
@@ -53,13 +53,84 @@
- 拼
+
+ {{item.deliveryType == 1?'配送':'自取'}}
+
+
+ 拼
+
已出餐
+
+
+
+
+
+ 订单{{index + 1}}
+
+
+
+
+ 配送信息
+
+
+
+ 配送编号：
+
+
+ {{item.numberCode}}
+
+
+
+
+ 订单号：
+
+
+ {{item.id}}
+
+
+
+
+
+ 订单时间：
+
+
+ {{item.createTime | formatISOTime}}
+
+
+
+
+
+ 商品信息
+
+
+
+ 商品名：{{item1.productName}}
+
+
+ X{{item1.quantity}}
+
+
+ ￥{{item1.price}}
+
+
+
+
+
+ 餐盒费：￥{{item.packageFee}} 配送费：￥{{item.deliveryFee}}
+
+
+ 总计：￥{{item.totalAmount}}
+
+
+
+
+
+
@@ -198,10 +269,14 @@
uni.hideLoading();
}).catch((res) => {});
},
+ tanchuang(v){
+ this.tui.toast('该订单为'+(v==1?'配送':'自取')+'单')
+ },
getGroupOrders(id){
this.tui.request("/mall/order/selectAllOrderByOrderId/"+id, "GET", {}, false, true).then((res) => {
if (res.code == 200) {
this.tuanzhangOrder = res.result;
+ this.$refs.pintuanPopup.open('bottom')
} else {
that.tui.toast(res.message)
return
@@ -385,4 +460,39 @@
font-weight: 700;
margin-top: 20rpx;
}
+ .pinzi{
+ margin: 20rpx 0;
+ background: linear-gradient(90deg, #FF4500, #FFA07A);
+ width: 40rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ text-align: center;
+ border-radius: 10rpx;
+ color: #fff;
+ }
+ .guize-list {
+ width: 100%;
+ padding: 20rpx;
+ overflow: scroll;
+ background: #fff;
+ max-height: 1000rpx;
+ line-height: 25px;
+ }
+ .pt-title{
+ font-size: 28rpx;
+ font-weight: 700;
+ color: #777;
+ }
+ .dingdan{
+ border-top: 1px solid #eee;
+ }
+ .uni-popup__wrapper{
+ border-radius: 20rpx !important;
+ }
+ .pituan-text{
+ flex:1;
+ text-align:right;
+ padding-right:20rpx;
+ font-weight: 700;
+ }
\ No newline at end of file