From 3b6fc3bcacb38f9ecdf75b147dc250d85bb3256b Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 23 May 2024 16:58:00 +0800
Subject: [PATCH] uu

---
 pages/post/detail.vue |  49 ++++----
 pages/post/query.vue  | 270 ++++++++++++++++++------------------------
 2 files changed, 144 insertions(+), 175 deletions(-)

diff --git a/pages/post/detail.vue b/pages/post/detail.vue
index 9de06ba..fbf3b5e 100644
--- a/pages/post/detail.vue
+++ b/pages/post/detail.vue
@@ -1,27 +1,30 @@
 <template>
-	<tpx-layout>
-		<template v-slot:header></template>
-		<template v-slot:body>
-			<view class="mt-30">
-				<bo-detail-tmp v-model:value="submitParam" :billCode="queryOption.billCode"></bo-detail-tmp>
-			</view>
-		</template>
-		<template v-slot:footer>
-			<!-- <view class="blcok-white-noradius">
-				<u-row justify="space-around">
-					<u-button :plain="true" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
-					>修改
-					</u-button>
-					<u-button :plain="true" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
-					>取消
-					</u-button>
-					<u-button @click="goto(`post/post?id=${222}`)" type="primary" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
-					>再来一单
-					</u-button>
-				</u-row>
-			</view> -->
-		</template>
-	</tpx-layout>
+	<tpx-page>
+		<tpx-layout>
+			<template v-slot:header></template>
+			<template v-slot:body>
+				<view class="mt-30">
+					<bo-detail-tmp v-model:value="submitParam" :billCode="queryOption.billCode"></bo-detail-tmp>
+				</view>
+			</template>
+			<template v-slot:footer>
+				<!-- <view class="blcok-white-noradius">
+					<u-row justify="space-around">
+						<u-button :plain="true" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
+						>修改
+						</u-button>
+						<u-button :plain="true" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
+						>取消
+						</u-button>
+						<u-button @click="goto(`post/post?id=${222}`)" type="primary" size="large" shape="circle"  custom-style="margin: 0 10rpx;height:80rpx;font-size: 30rpx;"
+						>再来一单
+						</u-button>
+					</u-row>
+				</view> -->
+			</template>
+		</tpx-layout>
+	</tpx-page>
+	
 </template>
 
 <script>
diff --git a/pages/post/query.vue b/pages/post/query.vue
index 2688edd..3450b38 100644
--- a/pages/post/query.vue
+++ b/pages/post/query.vue
@@ -1,145 +1,110 @@
 <template>
-	<tpx-layout>
-		<template v-slot:header>
-			<view class="pgb-header">
-				<view class="com-jianju">
-					<tpx-scan-input v-model:value="searchParam.yundanhao" placeholder="请输入单号或扫码"
-						iconPos="right"></tpx-scan-input>
-				</view>
-			</view>
-		</template>
-		<template v-slot:body>
-			<div style="min-height: 100%;display: flex;flex-direction: column;">
-				<view style="position: relative;">
-					
-					<view class="mp-aside">
-						<u-row justify="between">
-							<u-row @click="setClipboardData(`T7080304038`)">
-								<view>
-									<u-text :text="'运单号：'+ 'T7080304038'" size="26"></u-text>
-								</view>
-								<view class="pl-10">
-									<u-icon name="file-text" size="32" custom-style=""></u-icon>
-								</view>
-							</u-row>
-							<view @click="goto(`post/detail?id={${22}}`)" class="com-tag-grey">
-								运单信息
-							</view>
-						</u-row>
-	
-						<u-row @click="handleDealItem(orItem, { type: 1 })" custom-style="margin-top: 30rpx;" justify="center">
-							<u-col span="4">
-								<u-text :text="'中国上海'" size="30" :bold="true" align="center"></u-text>
-								<u-text :text="'张三'" size="26" color="#999" margin="20rpx 0 0 0"
-									align="center"></u-text>
-							</u-col>
-							<u-col span="4" justify="center" align="center" custom-style="text-align: center;">
-								<image style="width: 70rpx;height: 14rpx;" :src="getCdnUrl('search/toline.png')">
-								</image>
-								<!-- getCdnUrl('search/toline-grey.png') -->
-								<u-text :text="'待付款'" align="center" size="22" margin="10rpx 0 0 0"></u-text>
-							</u-col>
-							<u-col span="4">
-								<u-text :text="'越南'" size="30" :bold="true" align="center"></u-text>
-								<u-text :text="'李四'" size="26" color="#999" margin="20rpx 0 0 0"
-									align="center"></u-text>
-							</u-col>
-						</u-row>
-										
-						<u-text :text="'下单时间：' + '2022-04-30 15:25'" color="#999" size="24"
-							margin="30rpx 0 0 0"></u-text>
+	<tpx-page>
+		<tpx-layout>
+			<template v-slot:header>
+				<view class="pgb-header">
+					<view class="com-jianju">
+						<tpx-scan-input v-model:value="searchParam.billCode" placeholder="请输入单号或扫码"
+							@change="handleScanValChange" iconPos="right"></tpx-scan-input>
 					</view>
-					
-					<view class="mp-aside">
-						<u-row justify="between" align="top">
-							<view class="font-28 font-weight">
-								货物图片
-							</view>
-							<view style="width: 120rpx;">
-								<u-button @click="handleCheckDanJu" :plain="true"  shape="circle"  custom-style="margin: 0 10rpx;height:50rpx;font-size: 28rpx;">
-									查看
-								</u-button>
-							</view>
-						</u-row>
-						<view>
-							<u-row>
-								<u-image @click="handlePreviewDiDan()" :src="getCdnUrl(`mine/kjcha.png`)" width="100" height="50" mode="aspectFill"
-									custom-style="margin: 20rpx 20rpx 0 0;"
-								></u-image>
-							</u-row>
+				</view>
+			</template>
+			<template v-slot:body>
+				<div v-if="modelInfo.billCode" style="min-height: 100%;display: flex;flex-direction: column;">
+					<view style="position: relative;">
+						
+						<view class="mp-aside">
+							<bpd-send-reciever-tmp :value="modelInfo"></bpd-send-reciever-tmp>
 						</view>
 						
-						<u-row justify="between" align="top" custom-style="margin-top:30rpx;">
-							<view class="font-28 font-weight">
-								签收底单
-							</view>
-							<view style="width: 120rpx;">
-								<u-button @click="handleCheckDanJu" :plain="true"  shape="circle"  custom-style="margin: 0 10rpx;height:50rpx;font-size: 28rpx;">
-									查看
-								</u-button>
-							</view>
-						</u-row>
-						<view>
-							<u-row>
-								<u-image @click="handlePreviewDiDan()" :src="getCdnUrl(`mine/kjcha.png`)" width="100" height="50" mode="aspectFill"
-									custom-style="margin: 20rpx 20rpx 0 0;"
-								></u-image>
+						<view class="mp-aside">
+							<u-row justify="between" align="top">
+								<view class="font-28 font-weight">
+									货物图片
+								</view>
+								<view style="width: 120rpx;">
+									<u-button @click="handleCheckDanJu" :plain="true"  shape="circle"  custom-style="margin: 0 10rpx;height:50rpx;font-size: 28rpx;">
+										查看
+									</u-button>
+								</view>
 							</u-row>
+							<view>
+								<u-row>
+									<u-image @click="handlePreviewDiDan()" :src="getCdnUrl(`mine/kjcha.png`)" width="100" height="50" mode="aspectFill"
+										custom-style="margin: 20rpx 20rpx 0 0;"
+									></u-image>
+								</u-row>
+							</view>
+							
+							<u-row justify="between" align="top" custom-style="margin-top:30rpx;">
+								<view class="font-28 font-weight">
+									签收底单
+								</view>
+								<view style="width: 120rpx;">
+									<u-button @click="handleCheckDanJu" :plain="true"  shape="circle"  custom-style="margin: 0 10rpx;height:50rpx;font-size: 28rpx;">
+										查看
+									</u-button>
+								</view>
+							</u-row>
+							<view>
+								<u-row>
+									<u-image @click="handlePreviewDiDan()" :src="getCdnUrl(`mine/kjcha.png`)" width="100" height="50" mode="aspectFill"
+										custom-style="margin: 20rpx 20rpx 0 0;"
+									></u-image>
+								</u-row>
+							</view>
 						</view>
 					</view>
-				</view>
+					
+					<view class="dt-block">
+						<view  class="mb-20">
+							<buns-locus-pos :billCode="searchParam.billCode"></buns-locus-pos>
+						</view>
+					</view>
+				</div>
 				
-				<view class="dt-block">
-					<view class="dt-item">
-						<buns-locus-pos :list="[{},{},{},{},{}]"></buns-locus-pos>
-					</view>
+				<view v-if="!modelInfo.billCode">
+					<tpx-empty></tpx-empty>
 				</view>
-			</div>
-		</template>
-	</tpx-layout>
-	
-	<tpx-dialog type="type-dialog" v-model:show="danCheckModal.show" title="输入号码后4位">
-		<view style="position: relative;height: 360rpx; width: 500rpx;">
-			<tpx-layout>
-				<template v-slot:body>
-					<view class="mt-20">
-						<u-row justify="center">
-							<text class="font-28 clr-sub">输入寄件人或收件人于机号码后四位</text>
-						</u-row>
-					</view>
-					<view class="mt-40">
-						<u-row justify="center">
-							<u-code-input v-model="danCheckModal.yanCode" maxlength="4" space="20" fontSize="36" size="80"></u-code-input>
-						</u-row>	
-					</view>
-				</template>
-				
-				<template v-slot:footer>
-					<view class="blcok-white-noradius" style="margin-top: 0;margin-bottom: 0;">
-						<u-button @click="handleSubmitDanCheck" type="primary" size="large" shape="circle" 
-							custom-style="height:80rpx;font-size: 30rpx;">
-							确认
-						</u-button>
-					</view>
-				</template>
-			</tpx-layout>
-		</view>
-	</tpx-dialog>
+			</template>
+		</tpx-layout>
+		
+		<tpx-dialog type="type-dialog" v-model:show="danCheckModal.show" title="输入号码后4位">
+			<view style="position: relative;height: 360rpx; width: 500rpx;">
+				<tpx-layout>
+					<template v-slot:body>
+						<view class="mt-20">
+							<u-row justify="center">
+								<text class="font-28 clr-sub">输入寄件人或收件人于机号码后四位</text>
+							</u-row>
+						</view>
+						<view class="mt-40">
+							<u-row justify="center">
+								<u-code-input v-model="danCheckModal.yanCode" maxlength="4" space="20" fontSize="36" size="80"></u-code-input>
+							</u-row>	
+						</view>
+					</template>
+					
+					<template v-slot:footer>
+						<view class="blcok-white-noradius" style="margin-top: 0;margin-bottom: 0;">
+							<u-button @click="handleSubmitDanCheck" type="primary" size="large" shape="circle" 
+								custom-style="height:80rpx;font-size: 30rpx;">
+								确认
+							</u-button>
+						</view>
+					</template>
+				</tpx-layout>
+			</view>
+		</tpx-dialog>
+		
+	</tpx-page>
 	
 </template>
 
 <script>
-	import getCdnUrl from "@/common/getCdnUrl"
-	
-	import {
-		goto,
-		goBack,
-		scanCode,
-		setClipboardData,
-		confirmModal,
-		makePhoneCall,
-		showLoading
-	} from "@/common/untool"
+	import { debounce } from "@/common/util"
+	import * as apiService from "@/common/api"
+	import BpdSendRecieverTmp from "@/components/buns-post-detail-templates/bpd-send-reciever-tmp"
 
 	export default {
 		props: {
@@ -147,35 +112,41 @@
 			// 	type: Boolean
 			// }
 		},
-		computed: {},
+		computed: {
+			dicData() {
+			  return this.$store.getters.dicData
+			},
+		},
+		components: { BpdSendRecieverTmp },
 		data() {
 			return {
+				queryOption: {
+					billCode: '', // 运单id
+				},
+				modelInfo: {},
 				danCheckModal: {
 					show: false
 				},
 				searchParam: {
-					keyword: ''
+					billCode: ''
 				}
 			}
 		},
 		onShareAppMessage() {
 			return {
-				// title: '',
-				// path: 'TODO'
+				
 			}
 		},
-		onLoad(queryOption) {
-			this.queryOption = queryOption
+		onLoad(option) {
+			this.queryOption = option
+			this.searchParam.billCode = option.billCode
 			this.initData();
 		},
 		onUnload() {},
 		methods: {
-			setClipboardData,
-			goBack,
-			goto,
-			getCdnUrl,
+			
 			initData() {
-				// showLoading()
+				
 			},
 			handleCheckDanJu() {
 				this.danCheckModal.show = true
@@ -187,11 +158,13 @@
 					]
 				})
 			},
-			handleSearchParamChange() {
-				
-			},
-			async handleScan () {
-				const res = await scanCode()
+			handleScanValChange: debounce(function(val){
+				val && (this.handleSearch(val))
+			}),
+			async handleSearch(val) {
+				let res = await apiService.getOrderDetail({...this.searchParam, _loading: true})
+				// 通过对象合并才能修改父级 数据
+				Object.assign(this.modelInfo, res.data || {})
 			},
 			handleSubmitDanCheck() {
 				this.danCheckModal.show = false
@@ -244,11 +217,4 @@
 			font-size: 30rpx;
 		}
 	}
-
-	.dt-item {
-		display: flex;
-		flex-direction: row;
-		margin-bottom: 20rpx;
-		justify-content: space-between;
-	}
 </style>
\ No newline at end of file