|
|
|
@ -17,23 +17,24 @@ |
|
|
|
<view class="status-list"> |
|
|
|
<view v-for="(item, index) in statusList" :key="index" class="status-item" |
|
|
|
:class="{ 'active': currentIndex == item.value }" |
|
|
|
:style="{'width':item.name == '全部'?'14vw':'20vw'}" |
|
|
|
@click="handleStatusClick(item.value)"> |
|
|
|
<text class="status-text">{{ item.name }}</text> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</scroll-view> |
|
|
|
</view> |
|
|
|
<view class="box1" @tap="goDetail(item.id)" v-for="(item,index) in orderList" :key="index"> |
|
|
|
<view class="box1" @tap="goDetail(item)" v-for="(item,index) in orderList" :key="index"> |
|
|
|
<view style="display: flex;height: 50rpx;border-bottom: 1px solid #eee;"> |
|
|
|
<view style="display: flex;"> |
|
|
|
<view style="display: flex;padding-right: 20rpx;" v-if="item.numberCode"> |
|
|
|
{{'#' + item.numberCode}} |
|
|
|
</view> |
|
|
|
<view style="flex: 1;display: flex;padding-left: 20rpx;"> |
|
|
|
<view style="flex: 1;display: flex;"> |
|
|
|
{{item.createTime | formatISOTime}} |
|
|
|
<!-- <text>已退款</text> --> |
|
|
|
</view> |
|
|
|
<view> |
|
|
|
{{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.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 == 1 && item.shopMakeTime != null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake != 1)?'待消费':item.status == 4?'待送达':item.status == 5?'已完成':item.status == 7?'待同意退款':item.status == 8?'已退款':item.status == 6?'已取消':item.status == 11?'售后中':item.status == 12?'已售后':""}} |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view style="height: 120rpx;padding-top: 20rpx;"> |
|
|
|
@ -56,7 +57,7 @@ |
|
|
|
<view class="pinzi" @tap.stop="tanchuang(item.deliveryType)" style="width:80rpx;font-weight:700;margin-right: 20rpx;color:#00231C;background:linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1))"> |
|
|
|
{{item.deliveryType == 1?'配送':'自取'}} |
|
|
|
</view> |
|
|
|
<view v-if="item.orderType != 1" @tap.stop="getGroupOrders(item.id)" class="pinzi"> |
|
|
|
<view v-if="item.orderType != 1 && item.groupInfo != null" @tap.stop="getGroupOrders(item.id)" class="pinzi"> |
|
|
|
拼 |
|
|
|
</view> |
|
|
|
<view style="flex: 1;"></view> |
|
|
|
@ -155,13 +156,13 @@ |
|
|
|
checked: true |
|
|
|
}, |
|
|
|
{ |
|
|
|
name: '待消费', |
|
|
|
value: 2, |
|
|
|
name: '待出餐', |
|
|
|
value: 13, |
|
|
|
checked: false |
|
|
|
}, |
|
|
|
{ |
|
|
|
name: '待出餐', |
|
|
|
value: 13, |
|
|
|
name: '待退/售后', |
|
|
|
value: 7, |
|
|
|
checked: false |
|
|
|
}, |
|
|
|
{ |
|
|
|
@ -180,8 +181,8 @@ |
|
|
|
checked: false |
|
|
|
}, |
|
|
|
{ |
|
|
|
name: '待退款', |
|
|
|
value: 7, |
|
|
|
name: '待消费', |
|
|
|
value: 2, |
|
|
|
checked: false |
|
|
|
}, |
|
|
|
{ |
|
|
|
@ -253,7 +254,12 @@ |
|
|
|
} else { |
|
|
|
that.orderList = [...that.orderList, ...res.result.records] |
|
|
|
} |
|
|
|
|
|
|
|
for (let i = 0; i < that.orderList.length; i++) { |
|
|
|
if (that.currentIndex == 7) { |
|
|
|
that.orderList[i].goodsList = that.orderList[i].items |
|
|
|
} |
|
|
|
console.log('哈哈哈哈哈1',that.orderList) |
|
|
|
that.orderList[i].goodsNum = 0 |
|
|
|
for (let m = 0; m < that.orderList[i].goodsList.length; m++) { |
|
|
|
that.orderList[i].goodsNum += that.orderList[i].goodsList[m].quantity |
|
|
|
@ -315,7 +321,13 @@ |
|
|
|
} |
|
|
|
}); |
|
|
|
}, |
|
|
|
goDetail(id) { |
|
|
|
goDetail(item) { |
|
|
|
let id = "" |
|
|
|
if(this.currentIndex == 7){ |
|
|
|
id = item.mallOrder.id |
|
|
|
}else{ |
|
|
|
id = item.id |
|
|
|
} |
|
|
|
uni.navigateTo({ |
|
|
|
url: '/package2/shop/orderDetail?id=' + id |
|
|
|
}) |
|
|
|
|
wangfukang
3 weeks ago