From 8686550f3c458787ddc40003877092e30f39a1cd Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Wed, 29 May 2024 17:49:08 +0800
Subject: [PATCH] uu

---
 common/enum.js                                |  2 +-
 .../buns-order-templates/bo-detail-tmp.vue    | 30 +++++++++++++++----
 pages.json                                    |  2 +-
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/common/enum.js b/common/enum.js
index b2ffae7..242d984 100644
--- a/common/enum.js
+++ b/common/enum.js
@@ -219,7 +219,7 @@ const dealBtnMap = {
 	liuCangScan: {  title: '留仓扫描', subTitle: "", icon: getCdnUrl(`home/licsm.png`), url: 'deliveryDeal/stayScanning' },
 	zhuanJianScan: {  title: '转件扫描', subTitle: "", icon: getCdnUrl(`home/zhuanjsm.png`), url: 'deliveryDeal/translateScanning' },
 	jinCangChaXun: {  title: '进仓查询', subTitle: "", icon: getCdnUrl(`home/jincchx.png`), url: '' },
-	yunDanChaXun: {  title: '运单查询', subTitle: "", icon: getCdnUrl(`home/kdchxun.png`), url: 'post/query' },
+	yunDanChaXun: {  title: '快件跟踪', subTitle: "", icon: getCdnUrl(`home/kdchxun.png`), url: 'post/query' },
 	shuiFeiYuGu: {  title: '税费预估', subTitle: "", icon: getCdnUrl(`home/shfgs.png`), url: '' }
 }
 
diff --git a/components/buns-order-templates/bo-detail-tmp.vue b/components/buns-order-templates/bo-detail-tmp.vue
index fbdf6f4..fd06e72 100644
--- a/components/buns-order-templates/bo-detail-tmp.vue
+++ b/components/buns-order-templates/bo-detail-tmp.vue
@@ -26,6 +26,7 @@
 			
 		</view>
 		
+		
 		<view class="dt-block">
 			<view class="dt-tle">
 				<view class="t1">托寄货物描述</view>
@@ -75,12 +76,28 @@
 				<view class="t1">产品类型及费用</view>
 				<view class="t2">
 					<text class="clr-prm">
-						{{'已付款/待付款'}}
+						<tpx-text-dic :value="modelInfo.paymentStatus" :list="dicData.emis_payment_status" ></tpx-text-dic>
 					</text>
 				</view>
 			</view>
 			<u-line margin="20rpx 0 20rpx"></u-line>
 			<view class="blcok-grey-sm">
+				<view class="dt-item">
+					<view v-if="modelInfo.reciever">
+						<text class="clr-sub pr-10">寄件网点:</text>
+						<text class="">{{ modelInfo.sendSiteName }}</text>
+					</view>
+					<view>
+						<text class="clr-sub pr-10">目的网点:</text>
+						<text class="">{{ modelInfo.dispatchUnderlingSiteName }}</text>
+					</view>
+				</view>
+				<view class="dt-item">
+					<view v-if="modelInfo.reciever">
+						<text class="clr-sub pr-10">目的地:</text>
+						<text class="">{{ modelInfo.destinationName }}</text>
+					</view>
+				</view>
 				<view class="dt-item">
 					<view v-if="modelInfo.reciever">
 						<text class="clr-sub pr-10">目的国家:</text>
@@ -98,13 +115,13 @@
 					</view>
 					<view>
 						<text class="clr-sub pr-10">时效:</text>
-						<text class="">23天</text>
+						<text class="">{{modelInfo.timeType}}</text>
 					</view>
 				</view>
 				<view class="dt-item">
 					<view>
 						<text class="clr-sub pr-10">基础运费:</text>
-						<text class="">￥80.00</text>
+						<text class="">￥{{modelInfo.freight}}</text>
 					</view>
 					<view>
 						<text class="clr-sub pr-10">付款方式:</text>
@@ -158,13 +175,16 @@
 				<view class="dt-item">
 					<view>
 						<text class="clr-sub pr-10">预约上门:</text>
-						<text class=""> 2023 11-22 09:00 - 10:00</text>
+						<text class=""> {{modelInfo.pickStartDate}}</text>
 					</view>
 				</view>
 				<view class="dt-item">
 					<view>
 						<text class="clr-sub pr-10">安排信息:</text>
-						<text >已安排快递员上门取货</text>
+						<text >
+							<text v-if="modelInfo.pickupMethod == 1">{{modelInfo.operateEmployeeName}}</text>
+							<text v-if="modelInfo.pickupMethod == 2">{{modelInfo.takePieceEmployeeName}}</text>
+						</text>
 					</view>
 				</view>
 			</view>
diff --git a/pages.json b/pages.json
index 0a2b12d..baf06d5 100644
--- a/pages.json
+++ b/pages.json
@@ -103,7 +103,7 @@
 		{
 			"path": "pages/post/query",
 			"style": {
-				"navigationBarTitleText": "快递查询"
+				"navigationBarTitleText": "快件跟踪"
 			}
 		},
 		{