From 5a64d45b719ff201bc4a7cc85f4a3dbe9ce2ebbb Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 27 Feb 2024 09:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=94=B6=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/news/recycling/recoveryList.vue |  5 ++---
 pages/news3/shopOrder.vue             | 13 +++++++++----
 pages/order/detail.vue                |  4 ++--
 pages/user/index.vue                  | 14 +++++++-------
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/pages/news/recycling/recoveryList.vue b/pages/news/recycling/recoveryList.vue
index be8186f..67f769a 100644
--- a/pages/news/recycling/recoveryList.vue
+++ b/pages/news/recycling/recoveryList.vue
@@ -85,8 +85,7 @@
 		},
 		onLoad(o) {
 			if (o.type) {
-				console.log(o.type)
-				this.classifyShow = o.type - 1
+				this.classifyShow = o.type
 			}
 		},
 		onShow() {
@@ -340,7 +339,7 @@
 		.list {
 			position: relative;
 			display: inline-block;
-			width: 25%;
+			width: 20%;
 			height: 100%;
 			line-height: 100rpx;
 			text-align: center;
diff --git a/pages/news3/shopOrder.vue b/pages/news3/shopOrder.vue
index 80a0c67..bbe11f4 100644
--- a/pages/news3/shopOrder.vue
+++ b/pages/news3/shopOrder.vue
@@ -260,6 +260,8 @@
 				itemInfor: '',
 				audit_status: 20,
 				audit_notes: '',
+				user_id: '',
+				delivery_type: ''
 			}
 		},
 		onReady() {
@@ -271,8 +273,9 @@
 			}
 			this.getList()
 		},
-		onLoad() {
-
+		onLoad(option) {
+			this.delivery_type = option.delivery_type ||'';
+			this.user_id = option.user_id||''
 		},
 		methods: {
 			reset() {
@@ -308,7 +311,9 @@
 					searchValue: this.keyword,
 					payMethod: this.payIndex > 0 ? this.payList[this.payIndex].val : '',
 					orderSource: this.sourceIndex > 0 ? this.selectList[this.sourceIndex].val : '',
-					betweenTime: this.endTime ? [this.startTime, this.endTime].join(',') : ''
+					betweenTime: this.endTime ? [this.startTime, this.endTime].join(',') : '',
+					delivery_type:this.delivery_type,
+					user_id:this.user_id,
 				});
 				if (status == 200) {
 					uni.hideLoading();
@@ -399,7 +404,7 @@
 			async submitRefund() {
 				let params = {
 					"orderId": this.itemInfor.order_id,
-					"orderRefundId":this.itemInfor.order_refund_id,
+					"orderRefundId": this.itemInfor.order_refund_id,
 					"form": {
 						"audit_status": this.audit_status,
 						"refund_notes": this.refund_notes,
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 26bd295..f19398c 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -75,10 +75,10 @@
 						{{ order.address.phone }}
 					</view>
 				</view>
-				<view class="up" @click="onAdress(order.goods_id)"
+				<!-- <view class="up" @click="onAdress(order.goods_id)"
 					v-if="order.pay_status == PayStatusEnum.SUCCESS.value && order.delivery_status == DeliveryStatusEnum.NOT_DELIVERED.value">
 					修改
-				</view>
+				</view> -->
 			</view>
 			<view class="sl">
 				<text v-for="(region, idx) in order.address.region" :key="idx">{{ region }}</text>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index fc41c3b..6b38928 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -253,19 +253,19 @@
 					<u-icon style="margin-left: 5rpx; color: #909090; margin-top: -5rpx;" name="arrow-right"></u-icon>
 				</view>
 				<view class="grounding goodsOrder">
-					<view class="image-text_21" @click="toRecovery(1)">
+					<view class="image-text_21" @click="toRecovery(0)">
 						<image :src="$picUrl+'/static/user/unpay.png'" class="label_11"></image>
 						<view class="text-group_21">
 							<text class="text_71"
-								v-if="orderTodoInfo.service_order.confirm_number">{{orderTodoInfo.service_order.confirm_number}}</text>
+								v-if="orderTodoInfo.recovery_order.accepted_number">{{orderTodoInfo.recovery_order.accepted_number>=100?"99+":orderTodoInfo.recovery_order.accepted_number}}</text>
 							<text class="text_81">待验收</text>
 						</view>
 					</view>
-					<view class="image-text_21" @click="toRecovery(2)">
+					<view class="image-text_21" @click="toRecovery(1)">
 						<image :src="$picUrl+'/static/user/unsend.png'" class="label_11"></image>
 						<view class="text-group_21">
 							<text class="text_71"
-								v-if="orderTodoInfo.service_order.service_number">{{orderTodoInfo.service_order.service_number}}</text>
+								v-if="orderTodoInfo.recovery_order.already_number">{{orderTodoInfo.recovery_order.already_number>=100?"99+":orderTodoInfo.recovery_order.already_number}}</text>
 							<text class="text_81">已验收</text>
 						</view>
 					</view>
@@ -273,15 +273,15 @@
 						<image :src="$picUrl+'/static/user/untake.png'" class="label_11"></image>
 						<view class="text-group_21">
 							<text class="text_71"
-								v-if="orderTodoInfo.service_order.payment_number">{{orderTodoInfo.service_order.payment_number}}</text>
+								v-if="orderTodoInfo.recovery_order.cancel_number">{{orderTodoInfo.recovery_order.cancel_number>=100?"99+":orderTodoInfo.recovery_order.cancel_number}}</text>
 							<text class="text_81">已取消</text>
 						</view>
 					</view>
-					<view class="image-text_21" @click="toRecovery(4)">
+					<view class="image-text_21" @click="toRecovery(2)">
 						<image :src="$picUrl+'/static/user/detail.png'" class="label_11"></image>
 						<view class="text-group_21">
 							<text class="text_71"
-								v-if="orderTodoInfo.service_order.check_number">{{orderTodoInfo.service_order.check_number}}</text>
+								v-if="orderTodoInfo.recovery_order.finish_number">{{orderTodoInfo.recovery_order.finish_number>=100?"99+":orderTodoInfo.recovery_order.finish_number}}</text>
 							<text class="text_81">已完成</text>
 						</view>
 					</view>