From 2891f0fe920533d91085876888a050265f44c0f2 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Tue, 14 May 2024 15:19:42 +0800
Subject: [PATCH] uu

---
 .../buns-order-templates/bo-detail-tmp.vue    | 104 ++++++++++++------
 pages/post/detail.vue                         |  24 ++--
 pages/tabBar/order/order.vue                  |   2 +-
 3 files changed, 82 insertions(+), 48 deletions(-)

diff --git a/components/buns-order-templates/bo-detail-tmp.vue b/components/buns-order-templates/bo-detail-tmp.vue
index c257270..66e7dcd 100644
--- a/components/buns-order-templates/bo-detail-tmp.vue
+++ b/components/buns-order-templates/bo-detail-tmp.vue
@@ -1,14 +1,26 @@
 <template>
 	<view class="dt-block" style="margin-top: 0;">
-		<view class="dt-tle">
-			<view class="t1">订单号: Tw891823727001</view>
+		
+		<!-- <tpx-text-dic :value="modelInfo.waybillStatus" :list="dicData.emis_waybill_status" ></tpx-text-dic> -->
+		<!-- <view class="dt-tle">
+			<view class="t1">订单号: {{modelInfo.orderSn}}</view>
 			<view class="t2">
-				<text class="clr-prm">{{'待遗收'}}</text>
+				<text class="clr-prm">
+					<tpx-text-dic :value="modelInfo.orderStatus" :list="dicData.emis_order_status" ></tpx-text-dic>
+				</text>
+			</view>
+		</view> -->
+		<view class="dt-tle">
+			<view class="t1">运单号: {{modelInfo.billCode}}</view>
+			<view class="t2">
+				<text class="clr-prm">
+					<tpx-text-dic :value="modelInfo.billCode" :list="dicData.emis_waybill_status" ></tpx-text-dic>
+				</text>
 			</view>
 		</view>
 		<u-line margin="20rpx 0 20rpx"></u-line>
 		<view>
-			<bpe-addressjiami-tmp v-model:value="submitParam"></bpe-addressjiami-tmp>
+			<bpe-addressjiami-tmp v-model:value="modelInfo"></bpe-addressjiami-tmp>
 		</view>
 		
 	</view>
@@ -17,28 +29,30 @@
 		<view class="dt-tle">
 			<view class="t1">托寄货物描述</view>
 			<view class="t2">
-				<text class="clr-prm">{{'待确认'}}</text>
+				<text class="clr-prm">
+					<tpx-text-dic :value="modelInfo.waybillStatus" :list="dicData.emis_waybill_status" ></tpx-text-dic>
+				</text>
 			</view>
 		</view>
 		<u-line margin="20rpx 0 20rpx"></u-line>
-		<view v-for="(item) in ydList" class="yditem">
+		<view v-for="(item) in (modelInfo.cargoList || [])" class="yditem">
 			<view class="ydi-lab">
-				<text class="font-weight">女士针织棉上衣</text>
-				<text>预报: 300</text>
+				<text class="font-weight">{{item.goodsName}}</text>
+				<text>预报: {{item.cargoQty}}</text>
 			</view>
 			<view class="ydi-lab mt-10">
-				<text class="clr-sub">无 12L 中国内地</text>
-				<text>实入仓: 0</text>
+				<text class="clr-sub">{{item.nationArea}}</text>
+				<text>实入仓: {{ item.cargoQty - (item.abnormalQty || 0) }}</text>
 			</view>
 			<view class="ydi-lab mt-10">
-				<text class="clr-prm">12 CNY</text>
+				<text class="clr-prm">{{item.price}} CNY</text>
 			</view>
 		</view>
 		
 		<view class="dt-item">
 			<view class="font-weight">
-				<text>总重量:50kg</text>
-				<text class="pl-20">总体积:50m</text>
+				<text>总重量:{{modelInfo.totalWeight || '-'}}kg</text>
+				<text class="pl-20">总体积:{{modelInfo.totalVolume || '-'}}m³</text>
 			</view>
 		</view>
 		
@@ -59,7 +73,9 @@
 		<view class="dt-tle">
 			<view class="t1">产品类型及费用</view>
 			<view class="t2">
-				<text class="clr-prm">{{'已付款/待付款月结'}}</text>
+				<text class="clr-prm">
+					{{'已付款/待付款'}}
+				</text>
 			</view>
 		</view>
 		<u-line margin="20rpx 0 20rpx"></u-line>
@@ -67,17 +83,17 @@
 			<view class="dt-item">
 				<view>
 					<text class="clr-sub pr-10">目的国家:</text>
-					<text class="">柬埔寨</text>
+					<text class="">{{ modelInfo.reciever.countryName }}</text>
 				</view>
 				<view>
 					<text class="clr-sub pr-10">线路:</text>
-					<text class="">柬埔寨快递</text>
+					<text class="">{{ modelInfo.transLineName }}</text>
 				</view>
 			</view>
 			<view class="dt-item">
 				<view>
 					<text class="clr-sub pr-10">产品类型:</text>
-					<text class="">柬埔寨国际特快</text>
+					<text class="">{{ modelInfo.productTypeName }}</text>
 				</view>
 				<view>
 					<text class="clr-sub pr-10">时效:</text>
@@ -91,23 +107,29 @@
 				</view>
 				<view>
 					<text class="clr-sub pr-10">付款方式:</text>
-					<text class="">寄付现结</text>
+					<text class="">
+						<tpx-text-dic :value="modelInfo.paymentType" :list="dicData.emis_payment_type" ></tpx-text-dic>
+					</text>
 				</view>
 			</view>
 			<view class="dt-item">
 				<view>
 					<text class="clr-sub pr-10">报关方式:</text>
-					<text class="">快递报关</text>
+					<text class="">
+						<tpx-text-dic :value="modelInfo.customsEclaration" :list="dicData.emis_declare_mode" ></tpx-text-dic>
+					</text>
 				</view>
 				<view>
 					<text class="clr-sub pr-10">清关方式:</text>
-					<text class="">快递清关</text>
+					<text class="">
+						<tpx-text-dic :value="modelInfo.customsClear" :list="dicData.emis_customs_clear" ></tpx-text-dic>
+					</text>
 				</view>
 			</view>
 			<view class="dt-item">
 				<view>
 					<text class="clr-sub pr-10">运费:</text>
-					<text class="clr-prm font-32">￥ 80.00</text>
+					<text class="clr-prm font-32">￥ {{modelInfo.freight}}</text>
 				</view>
 			</view>
 		</view>
@@ -117,7 +139,9 @@
 		<view class="dt-tle">
 			<view class="t1">取件信息</view>
 			<view class="t2">
-				<text class="clr-prm">{{'已付款/待付款月结'}}</text>
+				<text class="clr-prm">
+					
+				</text>
 			</view>
 		</view>
 		<u-line margin="20rpx 0 20rpx"></u-line>
@@ -125,7 +149,9 @@
 			<view class="dt-item">
 				<view>
 					<text class="clr-sub pr-10">取货方式:</text>
-					<text class="">上门取件 整柜提货</text>
+					<text class="">
+						<tpx-text-dic :value="modelInfo.pickupMethod" :list="dicData.emis_qujian_fangshi" ></tpx-text-dic>
+					</text>
 				</view>
 			</view>
 			<view class="dt-item">
@@ -146,7 +172,7 @@
 		<u-row justify="between">
 			<u-text text="快递员" size="28" :bold="true"></u-text>
 			<u-row>
-				<u-text text="李晓" size="28" :bold="true" margin="0 30rpx 0 0"></u-text>
+				<u-text :text="modelInfo.takePieceEmployeeCode" size="28" :bold="true" margin="0 30rpx 0 0"></u-text>
 				<view>
 					<u-avatar size="50" :src="''"></u-avatar>
 				</view>
@@ -196,14 +222,17 @@
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import { goto, goBack, setClipboardData, confirmModal, showLoading } from "@/common/untool"
+
 	import BpeAddressjiamiTmp from "@/components/buns-post-edit-templates/bpe-addressjiami-tmp"
+	import * as apiService from "@/common/api"
 	
 	export default {
 		components: { BpeAddressjiamiTmp },
 		computed: {
-			submitInfo: {
+			dicData() {
+			  return this.$store.getters.dicData
+			},
+			modelInfo: {
 				get(){
 					return this.value
 				}
@@ -214,16 +243,22 @@
 				default () {
 					return { }
 				}
+			},
+			billCode: {
+				default () {
+					return ''
+				}
 			}
 		},
 		data() {
 			return {
-				ydList: [
-					{},{},{}
-				]
 			}
 		},
 		created() {
+			
+		},
+		mounted(){
+			this.initData()
 		},
 		onHide() {
 		
@@ -232,8 +267,13 @@
 			
 		},
 		methods: {
-			goto,
-			getCdnUrl,
+			async initData(){
+				if(this.billCode) {
+					let res = await apiService.getOrderDetail({billCode: this.billCode, _loading: true})
+					// 通过对象合并才能修改父级 数据
+					Object.assign(this.modelInfo, res.data || {})
+				}
+			}
 		}
 	}
 </script>
diff --git a/pages/post/detail.vue b/pages/post/detail.vue
index 30b090b..9de06ba 100644
--- a/pages/post/detail.vue
+++ b/pages/post/detail.vue
@@ -3,7 +3,7 @@
 		<template v-slot:header></template>
 		<template v-slot:body>
 			<view class="mt-30">
-				<bo-detail-tmp v-model:value="submitParam"></bo-detail-tmp>
+				<bo-detail-tmp v-model:value="submitParam" :billCode="queryOption.billCode"></bo-detail-tmp>
 			</view>
 		</template>
 		<template v-slot:footer>
@@ -25,9 +25,8 @@
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	import { goto, goBack, setClipboardData, confirmModal, showLoading } from "@/common/untool"
 	import BoDetailTmp from "@/components/buns-order-templates/bo-detail-tmp"
+	import * as apiService from "@/common/api"
 	
 	export default {
 		components: { BoDetailTmp },
@@ -40,31 +39,26 @@
 		},
 		data() {
 			return {
-				submitParam: {
-					
+				submitParam: {},
+				queryOption: {
+					billCode: '', // 运单id
 				},
-				ydList: [
-					{},{},{}
-				]
 			}
 		},
 		onShareAppMessage() {
 			return {
-				// title: '',
-				// path: 'TODO'
 			}
 		},
-		onLoad(queryOption) {
-			this.queryOption = queryOption
+		onLoad(option) {
+			this.queryOption = option
 			this.initData();
 		},
 		onUnload() {
+			
 		},
 		methods: {
-			goto,
-			getCdnUrl,
 			initData(){
-				// showLoading()
+				
 			},
 			
 		}
diff --git a/pages/tabBar/order/order.vue b/pages/tabBar/order/order.vue
index 5086b24..9e7ba30 100644
--- a/pages/tabBar/order/order.vue
+++ b/pages/tabBar/order/order.vue
@@ -193,7 +193,7 @@
 				let itemQuery = `?billCode=${item.billCode || ''}&orderSn=${item.orderSn || ''}`
 				switch (deal.type){
 					case 1: // 跳转
-						this.goto(`post/detail?id=${item.id || ''}`)
+						this.goto(`post/detail${itemQuery}`)
 						break;
 					case 2: // 复制订单号
 						this.setClipboardData(item.billCode || item.orderSn)