From 2730de2ccc4a7ca7552ad2afcf94a46462fc683d Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Mon, 29 Jan 2024 14:07:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buns-goodsize-sheet.vue                   | 105 +++-------------
 .../bpe-addressinfo-tmp.vue                   | 101 +++++++++++++++
 .../bpe-goodsize-tmp.vue                      | 118 ++++++++++++++++++
 components/tpx-scan-input/tpx-scan-input.vue  |   2 +-
 pages/post/post.vue                           |  58 +--------
 5 files changed, 242 insertions(+), 142 deletions(-)
 create mode 100644 components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
 create mode 100644 components/buns-post-edit-templates/bpe-goodsize-tmp.vue

diff --git a/components/buns-goodsize-sheet/buns-goodsize-sheet.vue b/components/buns-goodsize-sheet/buns-goodsize-sheet.vue
index d9e9555..acac465 100644
--- a/components/buns-goodsize-sheet/buns-goodsize-sheet.vue
+++ b/components/buns-goodsize-sheet/buns-goodsize-sheet.vue
@@ -3,80 +3,7 @@
 		<view style="position: relative;height: calc(60vh);">
 			<tpx-layout>
 				<template v-slot:body>
-					<view class="shet-cont">
-						
-						
-						
-						<view class="jsfm-item">
-							<u-row justify="between">
-								<text class="font-28 font-weight">件数</text>
-								<view>
-									<uni-number-box :min="1" :max="10000"></uni-number-box>
-								</view>
-							</u-row>
-						</view>
-						<view class="jsfm-item">
-							<u-row justify="between">
-								<text class="font-28 font-weight">包裹重量</text>
-								<view>
-									<uni-number-box :min="1" :max="10000"></uni-number-box>
-								</view>
-							</u-row>
-						</view>
-						
-						<view class="jsfm-item">
-							<u-row justify="between" align="top">
-								<text class="font-28 font-weight pt-20">体积</text>
-								<view style="width: 70%;">
-									<u-row justify="between">
-										<u-col span="3.7">
-											<u-input placeholder="长" v-model="value1" 
-												custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 14rpx 20rpx;" 
-												placeholder-style="color: #999; " 
-											>
-												<template #suffix>
-													<text class="font-26 clr-sub pl-10">cm</text>
-												</template>
-											</u-input>
-										</u-col>
-										<u-col span="3.7">
-											<u-input placeholder="宽" v-model="value1" 
-												custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 14rpx 20rpx;" 
-												placeholder-style="color: #999;" 
-											>
-												<template #suffix>
-													<text class="font-26 clr-sub pl-10">cm</text>
-												</template>
-											</u-input>
-										</u-col>
-										<u-col span="3.7">
-											<u-input placeholder="高" v-model="value1" 
-												custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 14rpx 20rpx;" 
-												placeholder-style="color: #999; " 
-											>
-												<template #suffix>
-													<text class="font-26 clr-sub pl-10">cm</text>
-												</template>
-											</u-input>
-										</u-col>
-									</u-row>
-									
-									<u-row customStyle="margin: 20rpx 0 0 0;">
-										<u-input placeholder="" v-model="value1" 
-											custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 14rpx 20rpx;" 
-											placeholder-style="color: #999;" 
-										>
-											<template #suffix>
-												<text class="font-26 clr-sub pl-10">m³</text>
-											</template>
-										</u-input>
-									</u-row>
-								</view>
-								
-							</u-row>
-						</view>
-						
-					</view>	
+					<bpe-goodsize-tmp v-if="show" :value="submitVals"></bpe-goodsize-tmp>
 				</template>
 				
 				<template v-slot:footer>
@@ -92,12 +19,14 @@
 </template>
 
 <script>
+	import BpeGoodsizeTmp from "@/components/buns-post-edit-templates/bpe-goodsize-tmp"
 	export default {
-		// computed: {
-		// 	filDataList() {
-		// 		return []
-		// 	},
-		// },
+		components: { BpeGoodsizeTmp },
+		watch: {
+			show(){
+				this.submitVals = JSON.parse(JSON.stringify(this.value))
+			}
+		},
 		props: {
 			show: {
 				default () {
@@ -106,32 +35,32 @@
 			},
 			value: {
 				default () {
-					return {}
+					return {
+					}
 				}
 			}
 		},
 		data() {
 			return {
-				value1: '',
-				value2: '',
-				keyword: ''
+				submitVals: {}
 			}
 		},
 		created() {
 
 		},
 		onHide() {
-
 		},
-		destroyed() {},
+		unmounted() {
+		},
 
 		methods: {
 			handleCloseModal() {
 				this.$emit('update:show', false)
 			},
-			handleSubmitValue(val) {
-				this.$emit('onSure', {})
-				this.$emit('update:value', {})
+			handleSubmitValue() {
+				const val = this.submitVals
+				this.$emit('onSure', val)
+				this.$emit('update:value', val)
 				this.handleCloseModal()
 			}
 		}
diff --git a/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue b/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
new file mode 100644
index 0000000..6213553
--- /dev/null
+++ b/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
@@ -0,0 +1,101 @@
+<template>
+	<view>
+		<u-row @click="handleAddressChoose(1)" 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/adress.png`)">
+				</image>
+				<u-text align="center" text="地址薄" size="26" :bold="true"
+					margin="8rpx 0 0 0"></u-text>
+			</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 @click="handleAddressChoose(2)" 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/adress.png`)">
+				</image>
+				<u-text align="center" text="地址薄" size="26" :bold="true"
+					margin="8rpx 0 0 0"></u-text>
+			</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,
+			handleAddressChoose(type) { // 1 寄件地址 2收件地址
+				goto(`address/list?tab=${type}&type=choose`)
+			},
+		}
+	}
+</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/buns-post-edit-templates/bpe-goodsize-tmp.vue b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
new file mode 100644
index 0000000..97705c7
--- /dev/null
+++ b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
@@ -0,0 +1,118 @@
+<template>
+	<view class="shet-cont">
+		<view class="jsfm-item">
+			<u-row justify="between">
+				<text class="font-28 font-weight">件数</text>
+				<view>
+					<uni-number-box v-model="submitInfo.jianshu" :min="1" :max="10000"></uni-number-box>
+				</view>
+			</u-row>
+		</view>
+		<view class="jsfm-item">
+			<u-row justify="between">
+				<text class="font-28 font-weight">包裹重量</text>
+				<view>
+					<uni-number-box v-model="submitInfo.zhl" :min="1" :max="10000"></uni-number-box>
+				</view>
+			</u-row>
+		</view>
+		
+		<view class="jsfm-item">
+			<u-row justify="between" align="top">
+				<text class="font-28 font-weight pt-20">体积</text>
+				<view style="width: 70%;">
+					<u-row justify="between">
+						<u-col span="3.7">
+							<u-input placeholder="长" v-model="submitInfo.chang" 
+								custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 14rpx 20rpx;" 
+								placeholder-style="color: #999; " 
+							>
+								<template #suffix>
+									<text class="font-26 clr-sub pl-10">cm</text>
+								</template>
+							</u-input>
+						</u-col>
+						<u-col span="3.7">
+							<u-input placeholder="宽" v-model="submitInfo.kuan" 
+								custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 14rpx 20rpx;" 
+								placeholder-style="color: #999;" 
+							>
+								<template #suffix>
+									<text class="font-26 clr-sub pl-10">cm</text>
+								</template>
+							</u-input>
+						</u-col>
+						<u-col span="3.7">
+							<u-input placeholder="高" v-model="submitInfo.gao" 
+								custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 14rpx 20rpx;" 
+								placeholder-style="color: #999; " 
+							>
+								<template #suffix>
+									<text class="font-26 clr-sub pl-10">cm</text>
+								</template>
+							</u-input>
+						</u-col>
+					</u-row>
+					
+					<u-row customStyle="margin: 20rpx 0 0 0;">
+						<u-input placeholder="" v-model="submitInfo.pingfang" 
+							custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 14rpx 20rpx;" 
+							placeholder-style="color: #999;" 
+						>
+							<template #suffix>
+								<text class="font-26 clr-sub pl-10">m³</text>
+							</template>
+						</u-input>
+					</u-row>
+				</view>
+				
+			</u-row>
+		</view>
+	</view>	
+</template>
+
+<script>
+	export default {
+		computed: {
+			submitInfo: {
+				get(){
+					return this.value
+				}
+			}
+		},
+		props: {
+			value: {
+				default () {
+					return { }
+				}
+			}
+		},
+		data() {
+			return {
+			}
+		},
+		created() {
+
+		},
+		onHide() {
+
+		},
+		unmounted() {
+			
+		},
+
+		methods: {
+			
+		}
+	}
+</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-scan-input/tpx-scan-input.vue b/components/tpx-scan-input/tpx-scan-input.vue
index d041ab2..cb78559 100644
--- a/components/tpx-scan-input/tpx-scan-input.vue
+++ b/components/tpx-scan-input/tpx-scan-input.vue
@@ -59,7 +59,7 @@
 		onHide() {
 
 		},
-		destroyed() {},
+		unmounted() {},
 		
 		methods: {
 			async handleScan() {
diff --git a/pages/post/post.vue b/pages/post/post.vue
index c0f0f7b..7fffe04 100644
--- a/pages/post/post.vue
+++ b/pages/post/post.vue
@@ -2,7 +2,6 @@
 	<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>
@@ -32,54 +31,7 @@
 					</u-row>
 				</view>
 				<view class="blcok-white">
-					<view>
-						<u-row @click="handleAddressChoose(1)" 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/adress.png`)">
-								</image>
-								<u-text align="center" text="地址薄" size="26" :bold="true"
-									margin="8rpx 0 0 0"></u-text>
-							</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 @click="handleAddressChoose(2)" 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/adress.png`)">
-								</image>
-								<u-text align="center" text="地址薄" size="26" :bold="true"
-									margin="8rpx 0 0 0"></u-text>
-							</view>
-						</u-row>
-					</view>
+					<bpe-addressinfo-tmp v-model:value="submitParam"></bpe-addressinfo-tmp>
 				</view>
 			
 				<view class="blcok-white">
@@ -238,14 +190,16 @@
 	<buns-paytype-sheet v-model:show="paytypeModal.show" v-model:value="submitParam.paytype"></buns-paytype-sheet>
 	<buns-privacy-dialog v-model:show="privacyModal.show"> </buns-privacy-dialog>
 	<buns-revtime-sheet v-model:show="revtimeModal.show" v-model:value="submitParam.revtime"></buns-revtime-sheet>
-	<buns-goodsize-sheet v-model:show="goodChooseModal.show" v-model:value="submitParam.goods"></buns-goodsize-sheet>
+	<buns-goodsize-sheet v-model:show="goodChooseModal.show" v-model:value="submitParam"></buns-goodsize-sheet>
 </template>
 
 <script>
 	import getCdnUrl from "@/common/getCdnUrl"
 	import { sendTypeEnum, sendTypeList } from "@/common/enum"
 	import { goto } from "@/common/untool"
+	import BpeAddressinfoTmp from "@/components/buns-post-edit-templates/bpe-addressinfo-tmp"
 	export default {
+		components: { BpeAddressinfoTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean
@@ -322,9 +276,7 @@
 				// 	title: '加载中'
 				// });
 			},
-			handleAddressChoose(type) { // 1 寄件地址 2收件地址
-				goto(`address/list?tab=${type}&type=choose`)
-			},
+			
 			handleAgree() {
 				this.agreePrivateRule = !this.agreePrivateRule
 			},