From e56340c2934f89eda95538526bfa58c3c9e4a213 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Mon, 29 Jan 2024 18:48:55 +0800
Subject: [PATCH] uu

---
 .../buns-goodsize-sheet.vue                   | 107 +++-------------
 .../bpe-addressinfo-tmp.vue                   | 101 +++++++++++++++
 .../bpe-goodsize-tmp.vue                      | 118 ++++++++++++++++++
 components/tpx-date-input/tpx-date-input.vue  |   2 +-
 components/tpx-dialog/tpx-dialog.vue          |   6 +-
 components/tpx-input/tpx-input.vue            |   2 +-
 components/tpx-scan-input/tpx-scan-input.vue  |   4 +-
 .../tpx-select/default-select-input.vue       |  34 ++++-
 components/tpx-select/tpx-select.vue          |  22 ++--
 components/tpx-textarea/tpx-textarea.vue      |   2 +-
 pages/address/edit.vue                        |   4 +-
 pages/user/certification.vue                  |   2 +-
 12 files changed, 290 insertions(+), 114 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..b54669d 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,16 @@
 </template>
 
 <script>
+	import BpeGoodsizeTmp from "@/components/buns-post-edit-templates/bpe-goodsize-tmp"
 	export default {
-		// computed: {
-		// 	filDataList() {
-		// 		return []
-		// 	},
-		// },
+		components: { BpeGoodsizeTmp },
+		watch: {
+			show(v){
+				if(v) {
+					this.submitVals = JSON.parse(JSON.stringify(this.value))
+				}
+			}
+		},
 		props: {
 			show: {
 				default () {
@@ -106,32 +37,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..82a05d0
--- /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">件数</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">包裹重量</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 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: 11rpx 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: 11rpx 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: 11rpx 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: 11rpx 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-date-input/tpx-date-input.vue b/components/tpx-date-input/tpx-date-input.vue
index ffa70a4..3274fa1 100644
--- a/components/tpx-date-input/tpx-date-input.vue
+++ b/components/tpx-date-input/tpx-date-input.vue
@@ -1,7 +1,7 @@
 <template>
 	<view @click="handleSelectDate" class="pos-rlt">
 		<u-input :placeholder="placeholder" :fontSize="fontSize" :modelValue="inputValue"
-			:custom-style="`border-radius: 10rpx;padding: 8rpx 12rpx;${customStyle};`" 
+			:custom-style="`border-radius: 10rpx;padding: 11rpx 20rpx;${customStyle};`" 
 			readonly="true"
 		>
 			<template v-slot:suffix>
diff --git a/components/tpx-dialog/tpx-dialog.vue b/components/tpx-dialog/tpx-dialog.vue
index a8c2094..7881740 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: 30rpx;background-color:${bgColor};${contentStyle};`">
+			:style="`padding: 20rpx 30rpx;background-color:${bgColor};${contentStyle};`">
 			<view v-if="title" style="margin-bottom: 30rpx;" >
-				<u-row @touchmove.stop="" justify="between" custom-style="padding-bottom: 30rpx;">
+				<u-row @touchmove.stop="" justify="between" custom-style="padding-bottom: 20rpx;">
 					<view class="lgd-title">{{title}}</view>
 					<view @click="handleClose()">
 						<u-icon name="close" size="32" color="#999"></u-icon>
@@ -148,7 +148,7 @@
 	}
 	
 	.lgd-title{
-		font-size: 32rpx;font-weight: 600;
+		font-size: 30rpx;font-weight: 600;
 	}
 
 	.type-sheet .lgd-body::-webkit-scrollbar {
diff --git a/components/tpx-input/tpx-input.vue b/components/tpx-input/tpx-input.vue
index 8137fee..02691f4 100644
--- a/components/tpx-input/tpx-input.vue
+++ b/components/tpx-input/tpx-input.vue
@@ -1,6 +1,6 @@
 <template>
 	<u-input shape="circle" :placeholder="placeholder" :modelValue="value" :clearable="true" 
-		:custom-style="`border:0;border-radius: 20rpx;background-color: #F6F6F6;padding: 20rpx 30rpx;${customStyle};`" 
+		:custom-style="`border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 11rpx 20rpx;${customStyle};`" 
 		:placeholder-style="`color: #0E0708;${placeholderStyle};` " @change="handleChange"
 	></u-input>
 </template>
diff --git a/components/tpx-scan-input/tpx-scan-input.vue b/components/tpx-scan-input/tpx-scan-input.vue
index d041ab2..f875723 100644
--- a/components/tpx-scan-input/tpx-scan-input.vue
+++ b/components/tpx-scan-input/tpx-scan-input.vue
@@ -1,6 +1,6 @@
 <template>
 	<u-input :placeholder="placeholder" :fontSize="fontSize" :modelValue="value"  
-		:custom-style="`border-radius: 10rpx;padding: 8rpx 12rpx;${customStyle};`" 
+		:custom-style="`border-radius: 10rpx;padding: 11rpx 20rpx;${customStyle};`" 
 		@change="handleChange"
 	>
 		<template v-if="iconPos == 'left'" v-slot:prefix>
@@ -59,7 +59,7 @@
 		onHide() {
 
 		},
-		destroyed() {},
+		unmounted() {},
 		
 		methods: {
 			async handleScan() {
diff --git a/components/tpx-select/default-select-input.vue b/components/tpx-select/default-select-input.vue
index 5cc1afd..a3dcff9 100644
--- a/components/tpx-select/default-select-input.vue
+++ b/components/tpx-select/default-select-input.vue
@@ -1,6 +1,6 @@
 <template>
-	<view :class="contClass" style="margin-top: 0;">
-		<u-row>
+	<view :class="contClass" :style="styles">
+		<u-row custom-style="width: 100%;">
 			<view style="flex: 1;">
 				<u-text :text="leftText" size="28"></u-text>
 			</view>
@@ -25,16 +25,24 @@
 				return str
 			},
 			contClass() {
-				let pre = ['radius-20']
+				let pre = ['radius-10']
 				if (this.isWhite) {
-					pre.push('blcok-white')
+					pre.push('c-white')
 				} else {
-					pre.push('blcok-grey')
+					pre.push('c-grey')
 				}
 				return pre.join(" ")
+			},
+			styles() {
+				return `margin-top: 0;height: 62rpx;${this.customStyle}`
 			}
 		},
 		props: {
+			customStyle: {
+				default () {
+					return ''
+				}
+			},
 			isWhite: {
 				default () {
 					return false
@@ -79,5 +87,19 @@
 </script>
 
 <style scoped lang="scss">
-
+.c-white,.c-grey{
+	display: flex;
+	padding-left: 20rpx;
+	padding-right: 20rpx;
+	border-radius: 10rpx;
+	align-items: center;
+}
+.c-white{
+	background-color: #fff;
+	border: 1rpx solid #dadbde;
+}
+.c-grey{
+	background-color: #F6F6F6;
+	border: 1rpx solid #dadbde;
+}
 </style>
\ No newline at end of file
diff --git a/components/tpx-select/tpx-select.vue b/components/tpx-select/tpx-select.vue
index a76f359..fe438eb 100644
--- a/components/tpx-select/tpx-select.vue
+++ b/components/tpx-select/tpx-select.vue
@@ -2,11 +2,11 @@
 	<view class="" style="position: relative;">
 		<view @click="handleSelectSwitch">
 			<slot v-if="customInput"></slot>
-			<default-select-input v-if="!customInput" :placeholder="placeholder" :show="show" :list="list" :value="value" :isWhite="isWhite"></default-select-input>
+			<default-select-input v-if="!customInput" :placeholder="placeholder" :show="show" :list="list" :value="value" :isWhite="isWhite" :customStyle="customStyle"></default-select-input>
 		</view>
 		
 		<view v-if="mode == modeEnum.sheet">
-			<tpx-dialog :show="show" :title="title || placeholder" @onClose="handleSelectSwitch">
+			<tpx-dialog :show="show" :title="placeholder" @onClose="handleSelectSwitch">
 				<content-items :value="value" :list="list" :minChecked="minChecked" :type="type" 
 					@onChange="handleDataItemChange"
 				></content-items>
@@ -41,7 +41,16 @@
 			ContentItems, DefaultSelectInput
 		},
 		props: {
-			isWhite: {},
+			isWhite: {
+				default () {
+					return false
+				}
+			},
+			customStyle: {
+				default () {
+					return ''
+				}
+			},
 			customInput: {
 				default () {
 					return false
@@ -59,12 +68,7 @@
 			},
 			placeholder: {
 				default () {
-					return ""
-				}
-			},
-			title: {
-				default () {
-					return ""
+					return "请选择"
 				}
 			},
 			mode: {
diff --git a/components/tpx-textarea/tpx-textarea.vue b/components/tpx-textarea/tpx-textarea.vue
index 3d28a45..33463bc 100644
--- a/components/tpx-textarea/tpx-textarea.vue
+++ b/components/tpx-textarea/tpx-textarea.vue
@@ -1,7 +1,7 @@
 <template>
 	<u-textarea shape="circle"  placeholder-style="color: #0E0708; "  
 		:modelValue="value" :clearable="true" :placeholder="placeholder" 
-		custom-style="border:0;border-radius: 20rpx;background-color: #F6F6F6;padding: 20rpx 30rpx;" height="160"
+		custom-style="border:0;border-radius: 10rpx;background-color: #F6F6F6;padding: 15rpx 20rpx;" height="160"
 	></u-textarea>
 </template>
 
diff --git a/pages/address/edit.vue b/pages/address/edit.vue
index a7741cf..ac0f437 100644
--- a/pages/address/edit.vue
+++ b/pages/address/edit.vue
@@ -13,7 +13,7 @@
 				</view>
 				
 				<view class="mt-40">
-					<tpx-select placeholder="国家" v-model:value="country" :list="[]" :isWhite="true" 
+					<tpx-select placeholder="国家" v-model:value="country" :list="[]" :isWhite="true" custom-style="border:0;"  
 					></tpx-select>
 				</view>
 			
@@ -32,7 +32,7 @@
 						</view>
 						
 						<view class="mt-40">
-							<tpx-select placeholder="省市区" v-model:value="country" :list="[]"
+							<tpx-select placeholder="省市区" v-model:value="country" :list="[]" custom-style="border:0;"  
 							></tpx-select>
 						</view>
 						
diff --git a/pages/user/certification.vue b/pages/user/certification.vue
index 6fcd481..714dcd7 100644
--- a/pages/user/certification.vue
+++ b/pages/user/certification.vue
@@ -9,7 +9,7 @@
 							<tpx-input v-model:value="baseFormData.name" placeholder="真实姓名"></tpx-input>
 						</uni-forms-item>
 						<uni-forms-item :required="false">
-							<tpx-select placeholder="证件类型" v-model:value="baseFormData.type" :list="typeList"
+							<tpx-select placeholder="证件类型" v-model:value="baseFormData.type" :list="typeList" custom-style="border:0;"  
 								mode="drop"
 							></tpx-select>
 						</uni-forms-item>