From e2686a0c7a015c19bb9b289de21ed019b0729d8b Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Thu, 1 Feb 2024 13:48:20 +0800
Subject: [PATCH] uu

---
 .../bpe-addressjiami-tmp.vue                  |  94 ++++++++++
 components/tpx-com-dialog/tpx-com-dialog.vue  |   5 +-
 pages.json                                    |   6 +
 pages/deliveryDeal/pickUp.vue                 | 163 ++++++++++++++++++
 pages/post/openorder.vue                      |   7 +
 pages/tabBar/deal/deal.vue                    |   2 +-
 6 files changed, 274 insertions(+), 3 deletions(-)
 create mode 100644 components/buns-post-edit-templates/bpe-addressjiami-tmp.vue
 create mode 100644 pages/deliveryDeal/pickUp.vue

diff --git a/components/buns-post-edit-templates/bpe-addressjiami-tmp.vue b/components/buns-post-edit-templates/bpe-addressjiami-tmp.vue
new file mode 100644
index 0000000..2819302
--- /dev/null
+++ b/components/buns-post-edit-templates/bpe-addressjiami-tmp.vue
@@ -0,0 +1,94 @@
+<template>
+	<view>
+		<u-row custom-style="position:relative;" align="top"
+			justify="between">
+			<view>
+				<image style="height: 50rpx;width: 42rpx;" :src="getCdnUrl(`post/ji.png`)"></image>
+			</view>
+			<view style="flex: 1;padding: 0 30rpx;">
+				<u-text text="寄件人信息" size="28" :bold="true"></u-text>
+				<view style="margin: 8rpx 0 0 0;">
+					<u-text text="请新建您的寄件地址信息" size="26" color="#999"></u-text>
+				</view>
+			</view>
+			<view class="flex-column-center">
+				<image style="height: 32rpx;width: 28rpx;" :src="getCdnUrl(`post/eye-off.svg`)">
+				</image>
+			</view>
+			<view style="position: absolute;left: 20rpx;bottom: -20rpx;top: 46rpx;">
+				<u-line custom-style="height:100%;" direction="col" dashed="true"></u-line>
+			</view>
+		</u-row>
+		<view style="padding-left: 76rpx;">
+			<u-line margin="20rpx 0"></u-line>
+		</view>
+		<u-row custom-style="position:relative;" align="top"
+			justify="between">
+			<view style="position: absolute;left: 20rpx;top: -20rpx;bottom: 100%;">
+				<u-line custom-style="height:100%;" direction="col" dashed="true"></u-line>
+			</view>
+			<view>
+				<image style="height: 50rpx;width: 42rpx;" :src="getCdnUrl(`post/shou.png`)">
+				</image>
+			</view>
+			<view class="pr-30 pl-30" style="flex: 1;">
+				<u-text text="收件人信息" size="28" :bold="true"></u-text>
+				<view style="margin: 8rpx 0 0 0;">
+					<u-text text="请填写收件人国家、姓名，电话" size="26" color="#999"></u-text>
+				</view>
+			</view>
+			<view class="flex-column-center">
+				<image style="height: 32rpx;width: 28rpx;" :src="getCdnUrl(`post/eye-line.svg`)">
+				</image>
+			</view>
+		</u-row>
+	</view>
+</template>
+
+<script>
+	import getCdnUrl from "@/common/getCdnUrl"
+	import { goto } from "@/common/untool"
+	
+	export default {
+		computed: {
+			submitInfo: {
+				get(){
+					return this.value
+				}
+			}
+		},
+		props: {
+			value: {
+				default () {
+					return { }
+				}
+			}
+		},
+		data() {
+			return {
+			}
+		},
+		created() {
+		},
+		onHide() {
+	
+		},
+		unmounted() {
+			
+		},
+	
+		methods: {
+			getCdnUrl,
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.shet-cont{
+		padding: 10rpx 0 30rpx 0;
+	}
+	.jsfm-item{
+		margin-top: 30rpx;
+	}
+	
+</style>
\ No newline at end of file
diff --git a/components/tpx-com-dialog/tpx-com-dialog.vue b/components/tpx-com-dialog/tpx-com-dialog.vue
index 8dcc5e6..2c02ce1 100644
--- a/components/tpx-com-dialog/tpx-com-dialog.vue
+++ b/components/tpx-com-dialog/tpx-com-dialog.vue
@@ -1,8 +1,8 @@
 <template>
 	<tpx-dialog type="type-dialog" :show="show" :title="title" @onClose="handleCloseModal">
-		<view style="position: relative;min-height: 360rpx; width: 500rpx;display:flex;flex-direction: column;padding: 0 10rpx 10rpx 10rpx;">
+		<view style="position: relative;min-height: 260rpx; width: 500rpx;display:flex;flex-direction: column;padding: 0 10rpx 10rpx 10rpx;">
 			
-			<u-row custom-style="flex: 1;" align="center">
+			<u-row custom-style="flex: 1;" align="center" justify="center">
 				<slot name="body">
 					
 				</slot>
@@ -77,6 +77,7 @@
 				} else {
 					this.handleCloseModal()
 					this.$emit('onClose')
+					this.$emit('onCancel')
 				}
 			}
 		}
diff --git a/pages.json b/pages.json
index 5342dca..7fae744 100644
--- a/pages.json
+++ b/pages.json
@@ -128,6 +128,12 @@
 			"style": {
 				"navigationBarTitleText": "发件清单"
 			}
+		},
+		{
+			"path": "pages/deliveryDeal/pickUp",
+			"style": {
+				"navigationBarTitleText": "揽收扫描"
+			}
 		}
 	],
 	"subPackages": [{
diff --git a/pages/deliveryDeal/pickUp.vue b/pages/deliveryDeal/pickUp.vue
new file mode 100644
index 0000000..6aa0d15
--- /dev/null
+++ b/pages/deliveryDeal/pickUp.vue
@@ -0,0 +1,163 @@
+<template>
+	<tpx-layout>
+		<template v-slot:body>
+			<view class="com-jianju pos-rlt pb-30" style="padding-top: 2rpx;">
+				<view class="blcok-white">
+					<u-row justify="between">
+						<view style="width: 130rpx;">运单号</view>
+						<view style="flex:1;">
+							<tpx-scan-input v-model:value="submitParam.yundanhao"></tpx-scan-input>
+						</view>
+						<view class="pl-10">
+							<u-button custom-style="height: 74rpx;">确定</u-button>
+						</view>
+						
+					</u-row>
+				</view>
+				
+				<view class="com-section mt-30">
+					<u-row justify="space-between">
+						<text>订单号：TWO291929</text>
+						<u-icon name="bag" size="42"></u-icon>
+					</u-row>
+				</view>
+				<view class="blcok-white">
+					<bpe-addressjiami-tmp v-model:value="submitParam"></bpe-addressjiami-tmp>
+				</view>
+			
+				
+				<view class="com-section mt-30">托寄货物描述</view>
+				<view class="blcok-white">
+					<bpe-gooditem-edit-tmp v-model:value="submitParam"></bpe-gooditem-edit-tmp>
+				</view>
+				
+				<view class="com-section mt-30">揽收备注</view>
+				<view class="blcok-white">
+					<u-textarea v-model="submitParam.otherDes" border="surround" height="120" placeholder="备注"
+						maxlength="50" count></u-textarea>
+				</view>
+				
+			</view>
+		</template>
+		<template v-slot:footer>
+			<view class="pos-rlt blcok-white" style="border-radius: 0;margin-top: 0;">
+				<u-row>
+					<u-button size="large" shape="circle" @click="handleLan"
+						custom-style="width: 260rpx;height:80rpx;font-size: 30rpx;" :plain="true" type="primary">揽收</u-button>
+						
+					<u-button size="large" shape="circle"
+						custom-style="width: 400rpx;height:80rpx;font-size: 30rpx;" type="primary" >揽收开单</u-button>
+				</u-row>
+			</view>
+		</template>
+	</tpx-layout>
+	<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>
+</template>
+
+<script>
+	import getCdnUrl from "@/common/getCdnUrl"
+	import { sendTypeEnum, sendTypeList, qingguanList, baoguanList, } from "@/common/enum"
+	import { goto } from "@/common/untool"
+	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"
+	
+	export default {
+		components: { BpeAddressjiamiTmp, BpeGooditemEditTmp, BpeGoodphotoTmp },
+		props: {
+			// hasLeftWin: {
+			// 	type: Boolean
+			// }
+		},
+		computed: {
+
+		},
+		data() {
+			return {
+				kehuList: [{title: '李先生', val: '11'}],
+				...(JSON.parse(JSON.stringify({ qingguanList, baoguanList, sendTypeEnum, sendTypeList }))),
+				tipsList: [
+					
+				],
+				lanDialog: {
+					show: false
+				},
+				submitParam: {
+					yundanhao: '',
+					stockRoomId: '',
+					countryId: '',
+					wayId: '',
+					type: sendTypeList[0].val,
+					paytype: '',
+					otherDes: '',
+					prodId: 1,
+					tips: [],
+					revtime: '',
+					gdList: [{},{}]
+				}
+			}
+		},
+		onShareAppMessage() {
+			return {
+				// title: '',
+				// path: 'TODO'
+			}
+		},
+		onLoad() {
+			this.initData();
+		},
+		onUnload() {
+
+		},
+		methods: {
+			getCdnUrl,
+			goto,
+			initData() {
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });
+			},
+			
+			handleAgree() {
+				this.agreePrivateRule = !this.agreePrivateRule
+			},
+			handleDialogClick(curModal){
+				curModal.show = true
+			},
+			handleLan(){
+				this.handleDialogClick(this.lanDialog)
+			},
+			handleLanConf(type) {
+				debugger
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '@/common/uni-nvue.scss';
+
+	page {
+		background-color: #F6F6F6;
+		height: 100% !important;
+	}
+</style>
+<style scoped lang="scss">
+	.yunf-item {
+		margin-bottom: 20rpx;
+		padding: 30rpx;
+		background: #F6F6F6;
+		border-radius: 20rpx;
+		border: 2rpx solid transparent;
+		&.active {
+			border-color: $uni-color-primary;
+		}
+	}
+	
+	.yunf-input-item{
+		padding: 26rpx 0;
+		border-bottom: 2rpx solid #F6F6F6;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index 834642b..cf7ee0c 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -24,6 +24,13 @@
 						</view>
 					</u-row>
 				</view>
+				
+				<view class="com-section mt-30">
+					<u-row justify="space-between">
+						<text>订单号：TWO291929</text>
+						<u-icon name="bag" size="42"></u-icon>
+					</u-row>
+				</view>
 				<view class="blcok-white">
 					<bpe-addressinfo-tmp v-model:value="submitParam"></bpe-addressinfo-tmp>
 				</view>
diff --git a/pages/tabBar/deal/deal.vue b/pages/tabBar/deal/deal.vue
index dc5244d..a7d604d 100644
--- a/pages/tabBar/deal/deal.vue
+++ b/pages/tabBar/deal/deal.vue
@@ -59,7 +59,7 @@
 				
 				faBtnlist: [
 					{  title: '运单录入', subTitle: "", icon: getCdnUrl(`home/ydluru.png`), url: 'post/openorder' },
-					{  title: '揽收扫描', subTitle: "", icon: getCdnUrl(`home/lshsm.png`), url: '' },
+					{  title: '揽收扫描', subTitle: "", icon: getCdnUrl(`home/lshsm.png`), url: 'deliveryDeal/pickUp' },
 					{  title: '发件扫描', subTitle: "", icon: getCdnUrl(`home/fajiansm.png`), url: '' },
 					{  title: '合包扫描', subTitle: "", icon: getCdnUrl(`home/hebaosm.png`), url: '' },
 					{  title: '运单修改', subTitle: "", icon: getCdnUrl(`home/ydxiugai.png`), url: '' },