From de6a7368894d8e1b91dee68e092a58bb93a3b515 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Wed, 25 Mar 2026 14:47:55 +0800
Subject: [PATCH] 11
---
package1/buyFood/buyFood.vue | 25 ++++++++++++++++---------
package1/group/groupBuySingle.vue | 23 +++++++++++++++++++----
package1/index/deliveryPersonList.vue | 1 +
3 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/package1/buyFood/buyFood.vue b/package1/buyFood/buyFood.vue
index 385bce1..abf9526 100644
--- a/package1/buyFood/buyFood.vue
+++ b/package1/buyFood/buyFood.vue
@@ -36,7 +36,10 @@
- 北校区1食堂3楼12号窗口杨国福麻辣烫
+ {{shopItem.shopName || '未知商家'}}
+
+
+ 地址：{{shopItem.shopAddress || ''}}
@@ -188,7 +191,7 @@
-
+
打包费
@@ -198,7 +201,7 @@
- 配送费 (均摊)
+ 配送费 (均摊 | 超过2人，每多一人配送费总额增加0.5)
￥{{deliveryFeeCalc.toFixed(2)}}
@@ -289,7 +292,7 @@
- 差1人即可成团
+ 差{{groupItem.groupRule.groupCount - 1}}人即可成团
@@ -299,7 +302,7 @@
- 
@@ -430,15 +433,19 @@
let members = parseInt(this.groupItem.groupRule.groupCount) || 1;
if (this.selected === 'zhiding') {
let extra = members > 2 ? (members - 2) * 0.5 : 0;
- return Math.ceil(((commission + extra) / members) * 10) / 10;
+ return Math.ceil(((commission + extra) / members) * 100) / 100;
} else {
- return Math.ceil((commission / members) * 10) / 10;
+ return Math.ceil((commission / members) * 100) / 100;
}
}
return commission;
},
totalAmountCalc() {
- return this.goodsAmountCalc + this.packageFee + this.deliveryFeeCalc;
+ if(this.isPaotui==true){
+ return this.goodsAmountCalc + this.packageFee + this.deliveryFeeCalc;
+ }else{
+ return this.goodsAmountCalc;
+ }
}
},
onShow() {
@@ -462,7 +469,7 @@
},
onShareAppMessage(res) {
if (this.isPaymentSuccessGroupInitiate) {
- let groupId = this.createdOrderInfo?.groupId || this.createdOrderInfo?.groupDeliveryOrderId || this.createdOrderInfo?.id || this.currentOrderId;
+ let groupId = this.createdOrderInfo.groupInfo.id;
let targetMembers = this.groupItem?.groupRule?.groupCount || 2;
let shopItemStr = encodeURIComponent(JSON.stringify(this.shopItem));
let isFTF = this.isFaceToFace ? 1 : 0;
diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue
index 6b014c3..0f1a88f 100644
--- a/package1/group/groupBuySingle.vue
+++ b/package1/group/groupBuySingle.vue
@@ -134,7 +134,7 @@
style="background: rgba(166, 255, 234, 0.3);margin-right: 6%;border: 1px solid rgba(166, 255, 234, 0.5);">
直接购买¥{{item.attributeListPrice | sliceMsg}}
-
+
拼团购买¥{{ getGroupPrice(item) }}
@@ -285,7 +285,7 @@
+ v-if="groupId == '' && isPintuan && currentItem.productGroupBuyPrices && currentItem.productGroupBuyPrices.length > 0">
成团选择
@@ -348,7 +348,7 @@
参与拼团￥{{selectedGroupRule && selectedGroupRule.groupPrice ? parseFloat(selectedGroupRule.groupPrice).toFixed(2) : '0.00'}}
@@ -485,6 +485,9 @@
若拼团失败，将会为您自动退款
+
+ 包含打包费 {{currentItem.lunchBox}} 元 配送费(均摊) {{tuanzhangOrder.deliveryFee}} 元
+
@@ -546,6 +549,7 @@
shopItem: {},
productId: '',
productItem: [],
+ tuanzhangOrder:{},
cartItems: [],
currentItem: {},
parsedSpecs: [],
@@ -654,6 +658,17 @@
}
if (option.isFaceToFace) {
this.isFaceToFaceGroup = option.isFaceToFace === '1' || option.isFaceToFace === 'true';
+ if(this.isFaceToFaceGroup){
+ this.tui.request("/mall/order/selectMallOrderByGroupId/"+this.groupId, "GET", {}, false, true).then((res) => {
+ if (res.code == 200) {
+ this.tuanzhangOrder = res.result;
+ } else {
+ that.tui.toast(res.message)
+ return
+ }
+ uni.hideLoading()
+ }).catch((res) => {})
+ }
}
if (option.targetMembers) {
this.targetMembers = parseInt(option.targetMembers);
@@ -910,7 +925,7 @@
let payload = {
userId: uni.getStorageSync('id') || 'test-user123',
shopId: this.shopItem.id,
- deliveryType: 1,
+ deliveryType: this.tuanzhangOrder.deliveryType,
packageFee: packageFee,
remark: '',
items: items,
diff --git a/package1/index/deliveryPersonList.vue b/package1/index/deliveryPersonList.vue
index 15f7d21..5c264eb 100644
--- a/package1/index/deliveryPersonList.vue
+++ b/package1/index/deliveryPersonList.vue
@@ -123,6 +123,7 @@
// Fake request to our new endpoint
let payload = {
shopAreaId: this.shopAreaId,
+ orderType: 0,
putAreaId: this.putAreaId,
baozhang: this.baozhang,
xiangtong: this.xiangtong,