From 9e3e8b4da99c4598ccc5d0701f763202536c2de2 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 1 Feb 2024 14:43:06 +0800
Subject: [PATCH] uu

---
 .../buns-order-templates/bo-detail-tmp.vue    | 260 ++++++++++++++++++
 components/tpx-dialog/tpx-dialog.vue          |   6 +-
 pages.json                                    |  16 +-
 pages/deliveryDeal/pickUp.vue                 |  13 +-
 pages/post/detail.vue                         |  84 ++++++
 pages/post/locus.vue                          | 217 +++++++++++++++
 pages/post/openorder.vue                      |   2 +-
 7 files changed, 590 insertions(+), 8 deletions(-)
 create mode 100644 components/buns-order-templates/bo-detail-tmp.vue
 create mode 100644 pages/post/detail.vue
 create mode 100644 pages/post/locus.vue

diff --git a/components/buns-order-templates/bo-detail-tmp.vue b/components/buns-order-templates/bo-detail-tmp.vue
new file mode 100644
index 0000000..f2352bf
--- /dev/null
+++ b/components/buns-order-templates/bo-detail-tmp.vue
@@ -0,0 +1,260 @@
+<template>
+	<view class="dt-block" style="margin-top: 0;">
+		<view class="dt-tle">
+			<view class="t1">订单号: Tw891823727001</view>
+			<view class="t2">
+				<text class="clr-prm">{{'待遗收'}}</text>
+			</view>
+		</view>
+		<u-line margin="20rpx 0 20rpx"></u-line>
+		<view>
+			<bpe-addressjiami-tmp v-model:value="submitParam"></bpe-addressjiami-tmp>
+		</view>
+		
+	</view>
+	
+	<view class="dt-block">
+		<view class="dt-tle">
+			<view class="t1">托寄货物描述</view>
+			<view class="t2">
+				<text class="clr-prm">{{'待确认'}}</text>
+			</view>
+		</view>
+		<u-line margin="20rpx 0 20rpx"></u-line>
+		<view v-for="(item) in ydList" class="yditem">
+			<view class="ydi-lab">
+				<text class="font-weight">女士针织棉上衣</text>
+				<text>预报: 300</text>
+			</view>
+			<view class="ydi-lab mt-10">
+				<text class="clr-sub">无 12L 中国内地</text>
+				<text>实入仓: 0</text>
+			</view>
+			<view class="ydi-lab mt-10">
+				<text class="clr-prm">12 CNY</text>
+			</view>
+		</view>
+		
+		<view class="dt-item">
+			<view class="font-weight">
+				<text>总重量:50kg</text>
+				<text class="pl-20">总体积:50m</text>
+			</view>
+		</view>
+		
+		<u-row justify="end">
+			<view style="display: inline-block;white-space: nowrap;" class="mt-10">
+				<u-row>
+					<u-button @click="goto(`warehousing/detail?id=${211}`)" shape="circle" type="primary"
+						custom-style="height: 54rpx;margin-left: 20rpx;">进仓单</u-button>
+					<u-button shape="circle" type="primary" :plain="true"
+						custom-style="height: 54rpx;margin-left: 20rpx;">补单证资料</u-button>
+				</u-row>					
+			</view>
+		</u-row>
+	</view>
+	
+	
+	<view class="dt-block">
+		<view class="dt-tle">
+			<view class="t1">产品类型及费用</view>
+			<view class="t2">
+				<text class="clr-prm">{{'已付款/待付款月结'}}</text>
+			</view>
+		</view>
+		<u-line margin="20rpx 0 20rpx"></u-line>
+		<view class="blcok-grey-sm">
+			<view class="dt-item">
+				<view>
+					<text class="clr-sub pr-10">目的国家:</text>
+					<text class="">柬埔寨</text>
+				</view>
+				<view>
+					<text class="clr-sub pr-10">线路:</text>
+					<text class="">柬埔寨快递</text>
+				</view>
+			</view>
+			<view class="dt-item">
+				<view>
+					<text class="clr-sub pr-10">产品类型:</text>
+					<text class="">柬埔寨国际特快</text>
+				</view>
+				<view>
+					<text class="clr-sub pr-10">时效:</text>
+					<text class="">23天</text>
+				</view>
+			</view>
+			<view class="dt-item">
+				<view>
+					<text class="clr-sub pr-10">基础运费:</text>
+					<text class="">￥80.00</text>
+				</view>
+				<view>
+					<text class="clr-sub pr-10">付款方式:</text>
+					<text class="">寄付现结</text>
+				</view>
+			</view>
+			<view class="dt-item">
+				<view>
+					<text class="clr-sub pr-10">报关方式:</text>
+					<text class="">快递报关</text>
+				</view>
+				<view>
+					<text class="clr-sub pr-10">清关方式:</text>
+					<text class="">快递清关</text>
+				</view>
+			</view>
+			<view class="dt-item">
+				<view>
+					<text class="clr-sub pr-10">运费:</text>
+					<text class="clr-prm font-32">￥ 80.00</text>
+				</view>
+			</view>
+		</view>
+	</view>
+	
+	<view class="dt-block">
+		<view class="dt-tle">
+			<view class="t1">取件信息</view>
+			<view class="t2">
+				<text class="clr-prm">{{'已付款/待付款月结'}}</text>
+			</view>
+		</view>
+		<u-line margin="20rpx 0 20rpx"></u-line>
+		<view class="blcok-grey-sm">
+			<view class="dt-item">
+				<view>
+					<text class="clr-sub pr-10">取货方式:</text>
+					<text class="">上门取件 整柜提货</text>
+				</view>
+			</view>
+			<view class="dt-item">
+				<view>
+					<text class="clr-sub pr-10">预约上门:</text>
+					<text class=""> 2023 11-22 09:00 - 10:00</text>
+				</view>
+			</view>
+			<view class="dt-item">
+				<view>
+					<text class="clr-sub pr-10">安排信息:</text>
+					<text >已安排快递员上门取货</text>
+				</view>
+			</view>
+		</view>
+		
+		<u-line margin="20rpx 0 10rpx 0"></u-line>
+		<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>
+				<view>
+					<u-avatar size="50" :src="''"></u-avatar>
+				</view>
+			</u-row>
+		</u-row>
+	</view>
+	
+	<view class="dt-block">
+		<view class="dt-tle">
+			<view class="t1">物流动态</view>
+			<view class="t2">
+				<u-button @click="goto(`post/locus?id=${222}`)" shape="circle" :plain="true" custom-style="height: 50rpx;font-size:28rpx;">查看轨迹</u-button>
+			</view>
+		</view>
+		<u-line margin="20rpx 0 20rpx"></u-line>
+		<view class="dt-item">
+			<buns-locus-pos :list="[{},{},{}]"></buns-locus-pos>
+		</view>
+	</view>
+</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"
+	
+	export default {
+		components: { BpeAddressjiamiTmp },
+		computed: {
+			submitInfo: {
+				get(){
+					return this.value
+				}
+			}
+		},
+		props: {
+			value: {
+				default () {
+					return { }
+				}
+			}
+		},
+		data() {
+			return {
+				ydList: [
+					{},{},{}
+				]
+			}
+		},
+		created() {
+		},
+		onHide() {
+		
+		},
+		unmounted() {
+			
+		},
+		methods: {
+			goto,
+			getCdnUrl,
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/common/uni-nvue.scss';
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+	
+</style>
+<style scoped lang="scss">
+	.dt-block {
+		margin-top: 30rpx;
+		padding: 30rpx;
+		background-color: #FFF;
+		position: relative;
+	}
+	.dt-tle {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		.t1 {
+			font-size: 30rpx;
+			font-weight: 600;
+		}
+		.t2{
+			font-size: 30rpx;
+		}
+	}
+	.dt-item {
+		display: flex;
+		flex-direction: row;
+		margin-bottom: 20rpx;
+		justify-content: space-between;
+	}
+	
+	.yditem{
+		padding: 20rpx 20rpx;
+		background-color: #F6F6F6;
+		border-radius: 10rpx;
+		margin-bottom: 20rpx;
+	}
+	.ydi-lab{
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/components/tpx-dialog/tpx-dialog.vue b/components/tpx-dialog/tpx-dialog.vue
index 820af0f..579023a 100644
--- a/components/tpx-dialog/tpx-dialog.vue
+++ b/components/tpx-dialog/tpx-dialog.vue
@@ -3,9 +3,9 @@
 		mut-bind:touchmove="true">
 		<view @touchmove.stop="" class="dialog-mask" @click="handleClose()"></view>
 		<view :class="`dialog-content ${type} pos-${closePosType}`"
-			:style="`padding: 20rpx 30rpx;background-color:${bgColor};${contentStyle};`">
+			:style="`padding: 20rpx 0rpx;background-color:${bgColor};`">
 			<view v-if="title" style="margin-bottom: 30rpx;" >
-				<u-row @touchmove.stop="" justify="between" custom-style="padding-bottom: 20rpx;">
+				<u-row @touchmove.stop="" justify="between" custom-style="padding: 0 30rpx 20rpx; 30rpx;">
 					<view class="lgd-title">{{title}}</view>
 					<view @click="handleClose()">
 						<u-icon name="close" size="32" color="#999"></u-icon>
@@ -13,7 +13,7 @@
 				</u-row>
 				<view style="height: 1rpx;background-color: rgb(214, 215, 217);position: absolute;left: 0rpx;right: 0rpx;;"></view>
 			</view>
-			<view class="lgd-body">
+			<view class="lgd-body" :style="`padding: 0rpx 30rpx;${contentStyle}`">
 				<slot></slot>
 			</view>
 		</view>
diff --git a/pages.json b/pages.json
index 7fae744..6771ae7 100644
--- a/pages.json
+++ b/pages.json
@@ -82,9 +82,15 @@
 			}
 		},
 		{
-			"path": "pages/goods/edit",
+			"path": "pages/post/detail",
 			"style": {
-				"navigationBarTitleText": "货物信息"
+				"navigationBarTitleText": "运单详情"
+			}
+		},
+		{
+			"path": "pages/post/locus",
+			"style": {
+				"navigationBarTitleText": "物流轨迹"
 			}
 		},
 		{
@@ -93,6 +99,12 @@
 				"navigationBarTitleText": "报价试算"
 			}
 		},
+		{
+			"path": "pages/goods/edit",
+			"style": {
+				"navigationBarTitleText": "货物信息"
+			}
+		},
 		{
 			"path": "pages/address/list",
 			"style": {
diff --git a/pages/deliveryDeal/pickUp.vue b/pages/deliveryDeal/pickUp.vue
index 6aa0d15..bebbb14 100644
--- a/pages/deliveryDeal/pickUp.vue
+++ b/pages/deliveryDeal/pickUp.vue
@@ -15,7 +15,7 @@
 					</u-row>
 				</view>
 				
-				<view class="com-section mt-30">
+				<view class="com-section mt-30" @click="handleDialogClick(orderDetailModal)">
 					<u-row justify="space-between">
 						<text>订单号：TWO291929</text>
 						<u-icon name="bag" size="42"></u-icon>
@@ -54,6 +54,11 @@
 	<tpx-com-dialog v-model:show="lanDialog.show" title="揽收成功" cancelText="立即称重" sureText="带回仓库" @onCancel="handleLanConf(1)" @onSure="handleLanConf(2)">
 		<template v-slot:body>请现场称重或带回仓库称重!</template>
 	</tpx-com-dialog>
+	
+	<tpx-dialog v-model:show="orderDetailModal.show" title="订单详情" contentStyle="padding:0;">
+		<bo-detail-tmp v-model:value="submitParam"></bo-detail-tmp>
+	</tpx-dialog>
+	
 </template>
 
 <script>
@@ -63,9 +68,10 @@
 	import BpeAddressjiamiTmp from "@/components/buns-post-edit-templates/bpe-addressjiami-tmp"
 	import BpeGooditemEditTmp from "@/components/buns-post-edit-templates/bpe-gooditem-edit-tmp"
 	import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp"
+	import BoDetailTmp from "@/components/buns-order-templates/bo-detail-tmp"
 	
 	export default {
-		components: { BpeAddressjiamiTmp, BpeGooditemEditTmp, BpeGoodphotoTmp },
+		components: { BpeAddressjiamiTmp, BpeGooditemEditTmp, BpeGoodphotoTmp, BoDetailTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
@@ -84,6 +90,9 @@
 				lanDialog: {
 					show: false
 				},
+				orderDetailModal: {
+					show: false
+				},
 				submitParam: {
 					yundanhao: '',
 					stockRoomId: '',
diff --git a/pages/post/detail.vue b/pages/post/detail.vue
new file mode 100644
index 0000000..4c363a0
--- /dev/null
+++ b/pages/post/detail.vue
@@ -0,0 +1,84 @@
+<template>
+	<tpx-layout>
+		<template v-slot:header></template>
+		<template v-slot:body>
+			<view class="mt-30">
+				<bo-detail-tmp v-model:value="submitParam"></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>
+</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"
+	
+	export default {
+		components: { BoDetailTmp },
+		props: {
+			// hasLeftWin: {
+			// 	type: Boolean
+			// }
+		},
+		computed: {
+		},
+		data() {
+			return {
+				submitParam: {
+					
+				},
+				ydList: [
+					{},{},{}
+				]
+			}
+		},
+		onShareAppMessage() {
+			return {
+				// title: '',
+				// path: 'TODO'
+			}
+		},
+		onLoad(queryOption) {
+			this.queryOption = queryOption
+			this.initData();
+		},
+		onUnload() {
+		},
+		methods: {
+			goto,
+			getCdnUrl,
+			initData(){
+				// showLoading()
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/common/uni-nvue.scss';
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+	
+</style>
+<style scoped lang="scss">
+	
+</style>
\ No newline at end of file
diff --git a/pages/post/locus.vue b/pages/post/locus.vue
new file mode 100644
index 0000000..68d499d
--- /dev/null
+++ b/pages/post/locus.vue
@@ -0,0 +1,217 @@
+<template>
+	<tpx-layout>
+		<template v-slot:header></template>
+		<template v-slot:body>
+			<div style="min-height: 100%;display: flex;flex-direction: column;">
+				<view style="position: relative;">
+					<map :markers="map.markers" :latitude="map.latitude" :longitude="map.longitude"
+						style="width: 750rpx;height: 600rpx;"
+					></map>
+					 
+					<view class="mp-address-mask">
+						<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>
+					</view>
+					<view class="mp-kuadiyuan-mask" @click="handleCallTel">
+						<u-row justify="between">
+							<u-row>
+								<tpx-image :src="getCdnUrl('post/run.png')" width="30" height="30"></tpx-image>
+								<view class="ml-20">探路小哥 - 黎明</view>
+							</u-row>
+							<tpx-image :src="getCdnUrl('post/call.png')" width="60" height="60"></tpx-image>
+						</u-row>
+					</view>
+				</view>
+				
+				<view class="dt-block">
+					<view class="dt-item">
+						<buns-locus-pos :list="[{},{},{},{},{}]"></buns-locus-pos>
+					</view>
+				</view>
+			</div>
+		</template>
+		<template v-slot:footer>
+			<view class="blcok-white-noradius" style="margin-top: 0;">
+				<u-row justify="space-around">
+					<u-button @click="goBack()" :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>
+</template>
+
+<script>
+	import getCdnUrl from "@/common/getCdnUrl"
+	
+	import {
+		goto,
+		goBack,
+		setClipboardData,
+		confirmModal,
+		makePhoneCall,
+		showLoading
+	} from "@/common/untool"
+
+	export default {
+		props: {
+			// hasLeftWin: {
+			// 	type: Boolean
+			// }
+		},
+		computed: {},
+		data() {
+			return {
+				map: {
+					latitude: 23.106574, //纬度
+					longitude: 113.324587, //经度
+					scale: 13, //缩放级别
+					markers: [{
+						latitude: 23.106574, //纬度
+						longitude: 113.324587, //经度
+						title: '出发地',
+						iconPath: getCdnUrl('mine/tousu.png'),
+						width: 50,
+						height: 50,
+						label: {
+							content: '发货地址',
+							color: '#fff',
+							borderRadius: '10',
+							bgColor: '#B12D29',
+							padding: '10'
+						}
+					}]
+				}
+			}
+		},
+		onShareAppMessage() {
+			return {
+				// title: '',
+				// path: 'TODO'
+			}
+		},
+		onLoad(queryOption) {
+			this.queryOption = queryOption
+			this.initData();
+		},
+		onUnload() {},
+		methods: {
+			setClipboardData,
+			goBack,
+			goto,
+			getCdnUrl,
+			initData() {
+				// showLoading()
+			},
+			handleCallTel() {
+				makePhoneCall("114")
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/common/uni-nvue.scss';
+
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+</style>
+<style scoped lang="scss">
+	.mp-address-mask, .mp-kuadiyuan-mask{
+		z-index: 1000;
+		position: absolute;
+		left: 30rpx;
+		right: 30rpx;
+	}
+	.mp-address-mask{
+		padding: 20rpx 30rpx;
+		top: 30rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx;
+	}
+	.mp-kuadiyuan-mask{
+		padding: 12rpx 10rpx 12rpx 30rpx;
+		bottom: 20rpx;
+		color: #fff;
+		&::after{
+			border-radius: 36rpx;
+			content:  ' ';
+			position: absolute;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			background: #0E0708;
+			opacity: 0.5;
+			z-index: -1;
+		}
+	}
+	.dt-block {
+		flex: 1;
+		border-radius: 30rpx 30rpx 0rpx 0rpx;
+		padding: 30rpx;
+		background-color: #FFF;
+		position: relative;
+	}
+
+	.dt-tle {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		.t1 {
+			font-size: 30rpx;
+			font-weight: 600;
+		}
+
+		.t2 {
+			font-size: 30rpx;
+		}
+	}
+
+	.dt-item {
+		display: flex;
+		flex-direction: row;
+		margin-bottom: 20rpx;
+		justify-content: space-between;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index cf7ee0c..d72acde 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -25,7 +25,7 @@
 					</u-row>
 				</view>
 				
-				<view class="com-section mt-30">
+				<view class="com-section mt-30" @click="goto('post/detail')">
 					<u-row justify="space-between">
 						<text>订单号：TWO291929</text>
 						<u-icon name="bag" size="42"></u-icon>