From 85a7e287facae56c28657857abd39d81f9a18be7 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Sat, 18 Apr 2026 17:57:16 +0800
Subject: [PATCH] 11
---
package2/shop/orderDetail.vue | 80 ++++++++++++++++++++++++++++++---
package2/shop/shopOrderList.vue | 25 ++++++++---
2 files changed, 94 insertions(+), 11 deletions(-)
diff --git a/package2/shop/orderDetail.vue b/package2/shop/orderDetail.vue
index cf10ad6..ad0fdd3 100644
--- a/package2/shop/orderDetail.vue
+++ b/package2/shop/orderDetail.vue
@@ -91,7 +91,7 @@
平台服务费
- ￥12.00假的
+ ￥{{(data.chouyong).toFixed(2)}}
@@ -114,12 +114,20 @@
{{data.createTime | formatISOTime}}
-
+
用户账号
- 13521030111假的
+ {{data.receiverPhone}}
+
+
+
+
+ 团购信息
+
+
+ 查看 >
@@ -131,7 +139,7 @@
预计收入
- ￥10.32假的
+ ￥{{(data.yujishouru).toFixed(2)}}
@@ -143,6 +151,27 @@
+
+
+
+
+ {{data.groupInfo.targetMembers}}人团已拼{{data.groupInfo.currentMembers}}人
+
+
+
+ 
+
+
+
+ +
+
+
+
+
+ 点击头像可查看拼团订单详情
+
+
+
@@ -183,12 +212,15 @@
//商家预计收入的计算
let price = that.data.goodsAmount+that.data.packageFee
if(that.data.orderType == 1){
- that.data.chouyong = price * uni.getStorageSync('shopTakeaway').commissionRateOne
+ that.data.chouyong = price/100 * uni.getStorageSync('shopTakeaway').commissionRateOne
that.data.yujishouru = price - that.data.chouyong
}else{
- that.data.chouyong = price * uni.getStorageSync('shopTakeaway').commissionRateMore
+ that.data.chouyong = price/100 * uni.getStorageSync('shopTakeaway').commissionRateMore
that.data.yujishouru = price - that.data.chouyong
}
+ if(that.data.groupInfo != null){
+ that.data.groupInfo.groupIdList = that.data.groupInfo.groupOrderIds.split(',');
+ }
that.data.goodsNum = 0
for(let m=0;m {});
},
+ goDetail(id){
+ this.shopId = id
+ this.getDetail()
+ this.$refs.groupPopup.close()
+ },
+ checkGroup(){
+ this.$refs.groupPopup.open()
+ },
mealServing(item){
let that = this
uni.showModal({
@@ -314,4 +354,32 @@
float: right;
margin-left: 10px;
}
+ .group-content{
+ background: #fff;
+ width: 300px;
+ height: 500px;
+ }
+ .weipincheng {
+ width: 90rpx;
+ height: 90rpx;
+ background: #a6ffea;
+ border-radius: 90rpx;
+ text-align: center;
+ font-size: 60rpx;
+ font-weight: 700;
+ margin-left: -6rpx;
+ z-index: 97;
+ color: #02fbdd;
+ border: 1px solid #a6ffea;
+ line-height: 80rpx;
+ margin: 0 auto;
+ }
+ .kaituan2{
+ display: flex;
+ width: 90%;
+ margin: 40rpx auto;
+ }
+ .kaituan22{
+ flex: 1;
+ }
\ No newline at end of file
diff --git a/package2/shop/shopOrderList.vue b/package2/shop/shopOrderList.vue
index 330cc76..ac93773 100644
--- a/package2/shop/shopOrderList.vue
+++ b/package2/shop/shopOrderList.vue
@@ -25,7 +25,7 @@
-
+
{{'#' + item.numberCode}}
@@ -52,9 +52,10 @@
-
+
+ 拼
-
+
已出餐
@@ -196,6 +197,9 @@
uni.hideLoading();
}).catch((res) => {});
},
+ openPopup(){
+ this.$refs.groupPopup.open()
+ },
mealServing(item){
let that = this
uni.showModal({
@@ -231,10 +235,11 @@
})
},
handleStatusClick(index, value) {
+ this.getList()
if (this.currentIndex === index) return;
this.currentIndex = index;
this.searchForm.searchStatus = value
- this.getList()
+
},
back() {
uni.navigateBack()
@@ -356,6 +361,16 @@
margin: 20rpx auto;
background: #fff;
border-radius: 20rpx;
- padding: 20rpx;
+ padding: 20rpx 20rpx 0;
+ }
+ .btn{
+ background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
+ padding:0 5px;
+ height: 25px;
+ border-radius: 7px;
+ line-height: 25px;
+ text-align: center;
+ font-weight: 700;
+ margin-top: 10px;
}
\ No newline at end of file