diff --git a/package2/partTimeJob/partTimeJobCenter.vue b/package2/partTimeJob/partTimeJobCenter.vue
index fd805bd..17f44a5 100644
--- a/package2/partTimeJob/partTimeJobCenter.vue
+++ b/package2/partTimeJob/partTimeJobCenter.vue
@@ -43,6 +43,9 @@
查看订单
+
+ 拼
+
不同意
@@ -166,6 +169,70 @@
+
+
+
+
+
+
+ 订单-{{item.numberCode}}
+
+
+
+
+
+ 订单状态：
+
+
+ {{item.status == 0?'待支付':item.status == 2?'待配送员接单':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime == null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake == 1)?'待出餐':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null)?'待取货':(item.status == 3 && item.deliveryType == 2)?'待消费':item.status == 4?'待送达':item.status == 5?'已完成':item.status == 7?'待同意退款':item.status == 8?'已退款':item.status == 6?'已取消':item.status == 11?'售后中':item.status == 12?'已售后':""}}
+
+
+
+
+ 订单号：
+
+
+ {{item.id}}
+
+
+
+
+
+ 订单时间：
+
+
+ {{item.createTime | formatISOTime}}
+
+
+
+
+
+ 商品信息
+
+
+
+ 商品名：{{item1.productName}}
+
+
+ X{{item1.quantity}}
+
+
+ ￥{{item1.price}}
+
+
+
+
+
+ 餐盒费：￥{{item.packageFee}} 配送费：￥{{item.deliveryFee}}
+
+
+ 总计：￥{{item.totalAmount}}
+
+
+
+
+
+
@@ -184,6 +251,7 @@
type:'worker',
returnFormData:{},
groupOrderIdList:[],
+ tuanzhangOrder:[],
goodsList:[],
orderDetail:{},
returnData:[],
@@ -213,6 +281,18 @@
this.getReturnCount()
},
methods: {
+ 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
+ }
+ uni.hideLoading()
+ }).catch((res) => {})
+ },
orderDetailOpen(item){
this.returnFormData.id = item.id;
this.returnFormData.linkId = item.linkId;
@@ -418,6 +498,16 @@
border-radius: 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;
+ }
.goods-content {
flex: 1;
padding-left: 20rpx;
@@ -433,4 +523,29 @@
margin: 16rpx 0;
color: #777;
}
+ .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
diff --git a/package2/shop/shopOrderList.vue b/package2/shop/shopOrderList.vue
index 17d426c..cb9b654 100644
--- a/package2/shop/shopOrderList.vue
+++ b/package2/shop/shopOrderList.vue
@@ -70,19 +70,16 @@
- 订单{{index + 1}}
+ 订单-{{item.numberCode}}
-
- 配送信息
-
- 配送编号：
+ 订单状态：
- {{item.numberCode}}
+ {{item.status == 0?'待支付':item.status == 2?'待配送员接单':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime == null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake == 1)?'待出餐':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null)?'待取货':(item.status == 3 && item.deliveryType == 2)?'待消费':item.status == 4?'待送达':item.status == 5?'已完成':item.status == 7?'待同意退款':item.status == 8?'已退款':item.status == 6?'已取消':item.status == 11?'售后中':item.status == 12?'已售后':""}}