From d88e8f26c4bdfe5f3f4a792e5fe3717f5710a14d Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Wed, 16 Apr 2025 08:38:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 otherPages/orderTakingManage/detail/index.vue | 12 +++++++-----
 pages/orderTakingManage/components/list.vue   | 10 ++++++++--
 pages/orderTakingManage/index.vue             |  3 ++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/otherPages/orderTakingManage/detail/index.vue b/otherPages/orderTakingManage/detail/index.vue
index f636261..7b0e005 100644
--- a/otherPages/orderTakingManage/detail/index.vue
+++ b/otherPages/orderTakingManage/detail/index.vue
@@ -21,7 +21,8 @@
 				<view>
 					本单酬劳
 					<view class="vertically_center text1">
-						¥ {{ orderDetail.pet_payment_bcs[userInfo.userBcsRole - 1].paramValueNo * orderDetail.order?.h5OrderVO?.payAmount }}
+						¥ {{ orderDetail.order.orderGive}}
+						<!-- ¥ {{ orderDetail.pet_payment_bcs[userInfo.userBcsRole - 1].paramValueNo * orderDetail.order?.h5OrderVO?.payAmount }} -->
 					</view>
 				</view>
 			</view>
@@ -103,7 +104,7 @@
 					合计
 				</view>
 				<view class="money_text">
-					¥&nbsp;{{ orderDetail.order?.payAmount }}
+					¥&nbsp;{{ orderDetail.order.price }}
 				</view>
 			</view>
 		</view>
@@ -118,7 +119,7 @@
 					订单编号：
 				</view>
 				<view>
-					{{ orderDetail.order.id }}
+					{{ orderDetail.order.orderSn }}
 				</view>
 			</view>
 			<view class="line1">
@@ -138,7 +139,7 @@
 					支付时间：
 				</view>
 				<view>
-					{{ orderDetail.order?.payTime }}
+					{{ orderDetail.order.payTime }}
 				</view>
 			</view>
 		</view>
@@ -346,7 +347,8 @@
 
 	const getDetail = async () => {
 		let response = await getByOrderId({
-			id: orderId.value
+			id: orderId.value,
+			userId: userInfo.value.userId,
 		});
 		if (response.code == 200 && response.data) {
 			orderDetail.value = response.data;
diff --git a/pages/orderTakingManage/components/list.vue b/pages/orderTakingManage/components/list.vue
index d6ec38d..a788bd0 100644
--- a/pages/orderTakingManage/components/list.vue
+++ b/pages/orderTakingManage/components/list.vue
@@ -25,7 +25,7 @@
                             </view> -->
 
                             <!-- <view style="margin: 18rpx 0">期望上门时间：{{itemService.expectServiceTime}}</view> -->
-                            <view class="" style="margin-top: 10rpx;">{{ pet.breed }}{{ pet.bodyType }} | {{ pet.productNameText.join('，') }}
+                            <view class="" style="margin-top: 10rpx;">{{ pet.breed }}({{ pet.bodyType }}) | {{ pet.productNameText.join('，') }}
 
                                 <!-- <text v-for="itemPet in item.h5OrderVO.orderItemList" :key="itemPet.id">
                                     {{ itemPet.productName }}
@@ -40,12 +40,18 @@
                 	<view class="mb28 address" style="font-size: 26rpx;">{{ item.address }}</view>
                 	<view class="mb28" style="padding-left: 20rpx;font-size: 26rpx;"
                 	v-if="item.type == 0">订单为系统派发，请确认订单信息后再抢单</view>
-                	<view class="flex flex-between">
+                	<view class="flex flex-between" v-if="current != 2">
                 	    <up-button @click="unableToAcceptOrder(item.id)" text="无法接单" shape="circle" plain
                 	        class="mr20"></up-button>
                 	    <up-button @click="toOrderDetail(item.id)" type="primary" text="查看详情后接单" shape="circle"
                 	        color="#FFAA48"></up-button>
                 	</view>
+					<view class="flex flex-between" v-if="current == 2">
+					    <!-- <up-button @click="unableToAcceptOrder(item.id)" text="无法接单" shape="circle" plain
+					        class="mr20"></up-button> -->
+					    <up-button @click="toOrderDetail(item.id)" type="primary" text="查看派单详情" shape="circle"
+					        color="#FFAA48"></up-button>
+					</view>
                 </view>
             </view>
         </up-list-item>
diff --git a/pages/orderTakingManage/index.vue b/pages/orderTakingManage/index.vue
index 48190c7..e9ffb1c 100644
--- a/pages/orderTakingManage/index.vue
+++ b/pages/orderTakingManage/index.vue
@@ -75,7 +75,8 @@ import { getOrderServiceText, getProductNameText } from '@/utils/serviceTime.js'
 	const getOrderList = async () => {
 		let response = await orderList({
 			type: current.value,
-			userIdJson: userInfo.value.userId
+			userIdJson: userInfo.value.userId,
+			userId:userInfo.value.userId,
 		});
 		if (response.code == 200 && response.data) {
 			orderlist.value = response.data.rows;