From 19dacdac2d8378ef1a564513d6f520a29781648c Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Fri, 5 Jul 2024 00:39:46 +0800
Subject: [PATCH] 1

---
 pages/users/order_list1/index.vue | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pages/users/order_list1/index.vue b/pages/users/order_list1/index.vue
index 14ef556..db91636 100644
--- a/pages/users/order_list1/index.vue
+++ b/pages/users/order_list1/index.vue
@@ -7,7 +7,7 @@
 				搜索我的寄售订单
 			</navigator>
 			<view class='nav acea-row row-around'>
-				<view class='item' :class='orderStatus==-1 ? "on": ""' @click="statusClick(-1)">
+				<view class='item' :class='orderStatus==-2 ? "on": ""' @click="statusClick(-2)">
 					<view>全部</view>
 					<view class='num'>{{orderData.all || 0}}</view>
 				</view>
@@ -19,9 +19,9 @@
 					<view>寄售中</view>
 					<view class='num'>{{orderData.noPostage || 0}}</view>
 				</view>
-				<view class='item' :class='orderStatus==2 ? "on": ""' @click="statusClick(2)">
+				<view class='item' :class='orderStatus==3 ? "on": ""' @click="statusClick(3)">
 					<view>已完成</view> 
-					<view class='num '>{{orderData.noDeliver || 0}}</view>
+					<view class='num '>{{orderData.done || 0}}</view>
 				</view>
 				
 				<!-- <view class='item' :class='orderStatus==1 ? "on": ""' @click="statusClick(1)">
@@ -225,6 +225,9 @@
 									<view class='bnt b-color' @click='goOrderDetails_Evaluation(item.order_id)'>去评价</view>
 								</block>
 								<block v-if="item.status == 3">
+									<view style="margin-right: 20rpx;">
+										买家:{{item.player_name}}
+									</view>
 									<view class='bnt b-color' @click='goOrderDetails(item.order_id)' v-if="item.activity_type == 2 || item.activity_type == 3 || item.activity_type == 10">查看详情</view>
 									<navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
 										<text class="iconfont icon-fabu"></text>
@@ -551,8 +554,15 @@
 							that.page = that.page + 1
 						})
 					} else {
+						let orderStatus;
+						if(that.orderStatus==1){
+							orderStatus = 0;
+						}else{
+							orderStatus = this.orderStatus
+						}
+						
 						getOrderList({
-							status: that.orderStatus - 1,
+							status: orderStatus,
 							// status: that.orderStatus ,
 							page: that.page,
 							limit: that.limit,