From 6811bad35209163417855c9be649056e13201e0b Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Wed, 22 Apr 2026 15:33:12 +0800
Subject: [PATCH 1/6] 11
---
package1/order/orderEvaluate.vue | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/package1/order/orderEvaluate.vue b/package1/order/orderEvaluate.vue
index 2e0fbd4..6409530 100644
--- a/package1/order/orderEvaluate.vue
+++ b/package1/order/orderEvaluate.vue
@@ -211,18 +211,21 @@
score:this.shopEvaluateNum,
orderId:this.shopData.id,
shopId:this.shopData.shopId,
- },{ //配送员
- parentId:'',
- leve:0,
- remark:this.shopRemark,
- picture:this.manPicture,
- createBy:uni.getStorageSync('id'),
- createByName:'微信用户',
- createByIcon:'https://ooo.0o0.ooo/2019/04/28/5cc5a71a6e3b6.png',
- score:this.manEvaluateNum,
- orderId:this.shopData.id,
- shopId:this.manId,
}]
+ if(this.shopData.deliveryType == 1){
+ data.push({ //配送员
+ parentId:'',
+ leve:0,
+ remark:this.shopRemark,
+ picture:this.manPicture,
+ createBy:uni.getStorageSync('id'),
+ createByName:'微信用户',
+ createByIcon:'https://ooo.0o0.ooo/2019/04/28/5cc5a71a6e3b6.png',
+ score:this.manEvaluateNum,
+ orderId:this.shopData.id,
+ shopId:this.manId,
+ })
+ }
that.tui.request("/app/comment/save", "POST", data, false, false).then((res) => {
if (res.code == 200) {
uni.showToast({
From 043f9c823961ef495292f7f1a56d7d2d063a096a Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Wed, 22 Apr 2026 17:03:44 +0800
Subject: [PATCH 2/6] 11
---
package1/group/shopEvaluate.vue | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
diff --git a/package1/group/shopEvaluate.vue b/package1/group/shopEvaluate.vue
index b348739..21f9ec3 100644
--- a/package1/group/shopEvaluate.vue
+++ b/package1/group/shopEvaluate.vue
@@ -45,7 +45,7 @@
{{item.createByName}}
- {{item.createTime}}
+ {{item.createTime | formatTime}}
@@ -125,6 +125,32 @@
},
components: {
+ },
+ filters:{
+ formatTime(value) {
+ const date = new Date(value);
+
+ // 获取年份
+ const year = date.getFullYear();
+
+ // 获取月份 (getMonth 返回 0-11，所以需要 +1)，并补齐0
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+
+ // 获取日 (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');
+
+ // 获取秒 (getSeconds)，并补齐0
+ const second = String(date.getSeconds()).padStart(2, '0');
+
+ // 拼接格式：年-月-日 时:分:秒
+ return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+ }
},
onLoad(option) {
this.shopItem = JSON.parse(option.item)
From 613ece979aec91fadb219704e59b1742ad2771b5 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Wed, 22 Apr 2026 17:03:49 +0800
Subject: [PATCH 3/6] 11
---
package2/shop/merchantCenter.vue | 2 +-
package2/shop/shopOrderList.vue | 14 +++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/package2/shop/merchantCenter.vue b/package2/shop/merchantCenter.vue
index 23eb119..965f4f8 100644
--- a/package2/shop/merchantCenter.vue
+++ b/package2/shop/merchantCenter.vue
@@ -281,7 +281,7 @@
case 'pj':
let item = {
shopScore:uni.getStorageSync('shopScore'),
- id:uni.getStorageSync('id')
+ id:uni.getStorageSync('shopId')
}
url = '/package1/group/shopEvaluate?item=' + JSON.stringify(item)
break;
diff --git a/package2/shop/shopOrderList.vue b/package2/shop/shopOrderList.vue
index d3159e3..df211a9 100644
--- a/package2/shop/shopOrderList.vue
+++ b/package2/shop/shopOrderList.vue
@@ -53,7 +53,7 @@
- 拼
+ 拼
已出餐
@@ -77,6 +77,7 @@
regionId: JSON.parse(uni.getStorageSync('area')).id
},
totalPages: 1,
+ tuanzhangOrder:[],
orderList: [],
currentIndex: 10,
menuButtonInfo: {},
@@ -197,6 +198,17 @@
uni.hideLoading();
}).catch((res) => {});
},
+ getGroupOrders(id){
+ this.tui.request("/mall/order/selectAllOrderByOrderId/"+id, "GET", {}, false, true).then((res) => {
+ if (res.code == 200) {
+ this.tuanzhangOrder = res.result;
+ } else {
+ that.tui.toast(res.message)
+ return
+ }
+ uni.hideLoading()
+ }).catch((res) => {})
+ },
openPopup(){
this.$refs.groupPopup.open()
},
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 4/6] 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
From 87fa767713b38ea0b606b78bc9e64817388943c0 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Thu, 23 Apr 2026 15:54:50 +0800
Subject: [PATCH 5/6] 11
---
pages/index/index.vue | 61 +++++++++++++++++++++++--------------------
1 file changed, 32 insertions(+), 29 deletions(-)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1a4a770..6cdbe71 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -26,38 +26,41 @@
-
-
-
-
- 
-
-
-
- 待支付
- 等待配送员接单
- 待成团
- 配送员已接单
- 待消费
- 配送员已取货
- 订单已完成
- 等待同意退款
- 订单已取消
- 订单已退款
- 售后中
- 订单已售后
+
+
+
+
+
+
-
- 预计{{item.deliveryInfo.mustFinishTime | formatHourMinute }}送达
+
+
+ 待支付
+ 等待配送员接单
+ 待成团
+ 配送员已接单
+ 待消费
+ 配送员已取货
+ 订单已完成
+ 等待同意退款
+ 订单已取消
+ 订单已退款
+ 售后中
+ 订单已售后
+
+
+ 预计{{item.deliveryInfo.mustFinishTime | formatHourMinute }}送达
+
+
+
+ 
-
-
-
-
-
-
+
+
+
+