From 1e34baef7aac6b74a8d2793f5cff614f232e404b Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Wed, 10 Jun 2026 11:20:19 +0800
Subject: [PATCH 1/5] 1
---
package1/order/orderDetail.vue | 19 +++++++++++++++----
package1/runErrand/runErrand.vue | 2 +-
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue
index 812f193..4087744 100644
--- a/package1/order/orderDetail.vue
+++ b/package1/order/orderDetail.vue
@@ -685,12 +685,18 @@
-
+
确定要取消拼团吗
-
- 确认取消
+
+
+
+ 取消
+
+
+ 确认
+
@@ -1084,7 +1090,12 @@
this.peisongTime = `${fmt(hours1)}时${fmt(minutes1)}分${fmt(seconds1)}秒`;
}
- this.$refs.returnPopup.open('bottom');
+ if(this.orderDetail.status != 10){
+ this.$refs.returnPopup.open('bottom');
+ }else{
+ this.$refs.returnPopupBuy.open()
+ }
+
},
returnPopupPropBuy(item) {
this.payData = item;
diff --git a/package1/runErrand/runErrand.vue b/package1/runErrand/runErrand.vue
index 973ef5e..776446f 100644
--- a/package1/runErrand/runErrand.vue
+++ b/package1/runErrand/runErrand.vue
@@ -1238,7 +1238,7 @@
height: 150rpx;
display: flex;
background: #fff;
- z-index: 9999;
+ z-index: 99;
box-shadow: 0 -20rpx 30rpx rgba(0, 0, 0, 0.3);
}
From eee94b71d079d2b0750f9764d76a0d6945430e1c Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Wed, 10 Jun 2026 11:20:25 +0800
Subject: [PATCH 2/5] 1
---
package2/group/groupBuySingle.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package2/group/groupBuySingle.vue b/package2/group/groupBuySingle.vue
index e5a35b8..cc29346 100644
--- a/package2/group/groupBuySingle.vue
+++ b/package2/group/groupBuySingle.vue
@@ -560,8 +560,8 @@
- 配送费(均摊)
- {{tuanzhangOrder.deliveryFee}} 元
+
+ 配送费(均摊){{tuanzhangOrder.deliveryFee}} 元
打包费
From 15df1cd9f9a613d15ee6e40ef705dab100655e40 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Wed, 10 Jun 2026 11:45:24 +0800
Subject: [PATCH 3/5] 1
---
components/tab-bar/myCenter.vue | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/components/tab-bar/myCenter.vue b/components/tab-bar/myCenter.vue
index fd64c1d..49b5c13 100644
--- a/components/tab-bar/myCenter.vue
+++ b/components/tab-bar/myCenter.vue
@@ -1,12 +1,13 @@
商家入驻
- 商家中心-{{shopCounts}}
- 兼职注册
- 兼职主页-{{workerCounts}}
- 钱包余额 ￥{{balance}}
- 我的订单
- 切换校区放到设置中
+ 商家中心-{{shopCounts}}
+ 兼职注册
+ 兼职主页-{{workerCounts}}
+ 钱包余额 ￥{{balance}}
+ 我的订单
+ 切换校区放到设置中
+ 退出登录
@@ -174,6 +175,8 @@
url = '/package2/myCenter/goodsList'
} else if (e == 'merchant') {
url = '/package2/shop/merchantRegister'
+ } else if (e == 'tuichu') {
+ uni.clearStorageSync()
} else if (e == 'qiehuan') {
this.checkArea()
} else if (e == 'jianzhichaping') {
From 38f2b9ddb1b966db830169faf1df558f7826c390 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Wed, 10 Jun 2026 11:55:54 +0800
Subject: [PATCH 4/5] 1
---
components/tab-bar/myCenter.vue | 3 +++
1 file changed, 3 insertions(+)
diff --git a/components/tab-bar/myCenter.vue b/components/tab-bar/myCenter.vue
index 49b5c13..f4876ff 100644
--- a/components/tab-bar/myCenter.vue
+++ b/components/tab-bar/myCenter.vue
@@ -177,6 +177,9 @@
url = '/package2/shop/merchantRegister'
} else if (e == 'tuichu') {
uni.clearStorageSync()
+ uni.reLaunch({
+ url: '/package2/login/login'
+ })
} else if (e == 'qiehuan') {
this.checkArea()
} else if (e == 'jianzhichaping') {
From 5c31afd1f40aa3d3aee749f650f29f3f7d0911e7 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Wed, 10 Jun 2026 14:18:33 +0800
Subject: [PATCH 5/5] 1
---
manifest.json | 6 ------
1 file changed, 6 deletions(-)
diff --git a/manifest.json b/manifest.json
index c7522d2..b9760d8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -95,12 +95,6 @@
"optimization" : {
"subPackages" : true
},
- "plugins" : {
- "WechatSI" : {
- "version" : "0.3.5",
- "provider" : "wx069ba97219f66d99"
- }
- },
"permission" : {
"scope.userLocation" : {
"desc" : "用于编辑收货地址"