From 62a9f45e201600df90f7337910a711449675f591 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Mon, 18 Dec 2023 00:16:18 +0800
Subject: [PATCH] uu

---
 .../buns-goodsize-sheet.vue                   |  60 +++++++
 pages.json                                    |   6 +
 pages/goods/edit.vue                          | 165 ++++++++++++++++++
 pages/post/freightCalculate.vue               |   7 +-
 pages/post/post.vue                           |  13 +-
 5 files changed, 246 insertions(+), 5 deletions(-)
 create mode 100644 components/buns-goodsize-sheet/buns-goodsize-sheet.vue
 create mode 100644 pages/goods/edit.vue

diff --git a/components/buns-goodsize-sheet/buns-goodsize-sheet.vue b/components/buns-goodsize-sheet/buns-goodsize-sheet.vue
new file mode 100644
index 0000000..b9a3bda
--- /dev/null
+++ b/components/buns-goodsize-sheet/buns-goodsize-sheet.vue
@@ -0,0 +1,60 @@
+<template>
+	<tpx-dialog :show="show" title="填写预估重量体积" @onClose="handleCloseModal()">
+		<view class="shet-cont">
+			
+			
+		</view>
+	</tpx-dialog>
+</template>
+
+<script>
+	export default {
+		// computed: {
+		// 	filDataList() {
+		// 		return []
+		// 	},
+		// },
+		props: {
+			show: {
+				default () {
+					return false
+				}
+			},
+			value: {
+				default () {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				keyword: ''
+			}
+		},
+		created() {
+
+		},
+		onHide() {
+
+		},
+		destroyed() {},
+
+		methods: {
+			handleCloseModal() {
+				this.$emit('update:show', false)
+			},
+			handleSubmitValue(val) {
+				this.$emit('onSure', {})
+				this.$emit('update:value', {})
+				this.handleCloseModal()
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.shet-cont{
+		padding: 10rpx 0 30rpx 0;
+	}
+	
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 6ae48fa..7edfbc3 100644
--- a/pages.json
+++ b/pages.json
@@ -68,6 +68,12 @@
 				"navigationBarTitleText": "运费时效"
 			}
 		},
+		{
+			"path": "pages/goods/edit",
+			"style": {
+				"navigationBarTitleText": "货物申报信息"
+			}
+		},
 		{
 			"path": "pages/warehousing/list",
 			"style": {
diff --git a/pages/goods/edit.vue b/pages/goods/edit.vue
new file mode 100644
index 0000000..a7741cf
--- /dev/null
+++ b/pages/goods/edit.vue
@@ -0,0 +1,165 @@
+<template>
+	<tpx-layout>
+		<template v-slot:body>
+			<view class="com-jianju pos-rlt pb-30" style="padding-top: 2rpx;">
+				
+				<view class="blcok-white radius-20">
+					<u-textarea v-model="submitParam.otherDes" border="none" height="110" placeholder="粘贴或输入地址，点击“智能识别”自动拆分姓名、电话和地址" custom-style="border:0;padding: 0;"></u-textarea>
+					<u-row justify="end">
+						<view class="mt-10">
+							<u-button @click="handleAnsText()" type="primary" size="mini" shape="circle" custom-style="width: 130rpx;font-size: 24rpx;padding:0;">智能识别</u-button>
+						</view>
+					</u-row>
+				</view>
+				
+				<view class="mt-40">
+					<tpx-select placeholder="国家" v-model:value="country" :list="[]" :isWhite="true" 
+					></tpx-select>
+				</view>
+			
+				<view class="blcok-white radius-20">
+					<view class="">
+						
+						<view style="margin-top: 10rpx;">
+							<u-row>
+								<u-col span="4">
+									<tpx-input v-model:value="submitParam.name" placeholder="真实姓名"></tpx-input>
+								</u-col>
+								<u-col offset="1" span="7">
+									<tpx-input v-model:value="submitParam.tel" placeholder="电话"></tpx-input>
+								</u-col>
+							</u-row>
+						</view>
+						
+						<view class="mt-40">
+							<tpx-select placeholder="省市区" v-model:value="country" :list="[]"
+							></tpx-select>
+						</view>
+						
+						<view class="mt-30">
+							<tpx-textarea v-model:value="submitParam.detail" placeholder="详细地址（例如**街道**号**）"></tpx-textarea>
+						</view>
+						
+						<view class="mt-30">
+							<tpx-input v-model:value="submitParam.tel" placeholder="电话"></tpx-input>
+						</view>
+						
+						<view class="mt-30">
+							<tpx-input v-model:value="submitParam.tel" placeholder="邮编"></tpx-input>
+						</view>
+						
+						<view class="mt-30">
+							<tpx-input v-model:value="submitParam.tel" placeholder="邮箱（选填"></tpx-input>
+						</view>
+						
+						<view class="mt-30">
+							<tpx-input v-model:value="submitParam.tel" placeholder="公司名称（选填）"></tpx-input>
+						</view>
+					</view>
+				</view>
+			
+				<view class="mt-30 pl-30 pr-30">
+					<u-row justify="between">
+						<view>
+							<u-checkbox-group v-model="radiovalue1" placement="column" @change="handleFormChange()">
+							    <u-checkbox
+									shape="circle"
+									size="30" label="默认地址" active-color="#B12D29" la
+									label-size="28" hange="handleFormChange()"
+							    >
+							    </u-checkbox>
+							  </u-checkbox-group>
+						</view>
+						<view>
+							<u-text text="清空" size="28" color="#0E0708"></u-text>
+						</view>
+					</u-row>
+				</view>
+			</view>
+		</template>
+		<template v-slot:footer>
+			<view class="blcok-white-noradius">
+				<u-button @click="handleSubmit()" type="primary" size="large" shape="circle" 
+					custom-style="height:80rpx;font-size: 30rpx;"
+				>确定</u-button>
+			</view>
+		</template>
+	</tpx-layout>
+</template>
+
+<script>
+	import getCdnUrl from "@/common/getCdnUrl"
+	import {
+		ordStaEnum,
+		ordStatusList,
+		payTypeEnum,
+		payTypeList,
+		dlvTypeEnum,
+		dlvTypeList,
+		dateTypeEnum,
+		dateTypeList
+	} from "@/common/enum"
+	import {
+		goto
+	} from "@/common/untool"
+	export default {
+		props: {
+			// hasLeftWin: {
+			// 	type: Boolean
+			// }
+		},
+		computed: {
+
+		},
+		data() {
+			return {
+				submitParam: {
+					type: 1,
+					otherDes: ''
+				}
+			}
+		},
+		onShareAppMessage() {
+			return {
+				// title: '',
+				// path: 'TODO'
+			}
+		},
+		onLoad() {
+			this.initData();
+		},
+		onUnload() {
+
+		},
+		methods: {
+			getCdnUrl,
+
+			initData() {
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });
+			},
+			handleAnsText(){
+				
+			},
+			handleFormChange(){
+				
+			},
+			handleSubmit() {
+				
+			},
+		}
+	}
+</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/freightCalculate.vue b/pages/post/freightCalculate.vue
index 3822487..50f5d86 100644
--- a/pages/post/freightCalculate.vue
+++ b/pages/post/freightCalculate.vue
@@ -83,7 +83,7 @@
 						</view>
 			
 						
-						<view class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;"
+						<view @click="handleDialogClick(goodChooseModal)" class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;"
 							v-if="submitParam.type != sendTypeEnum.container"
 						>
 							<u-row>
@@ -155,6 +155,7 @@
 	</tpx-layout>
 	<buns-country-sheet v-model:show="countryModal.show" v-model:value="submitParam.countryId"></buns-country-sheet>
 	<buns-way-sheet v-model:show="wayModal.show" v-model:value="submitParam.wayId"></buns-way-sheet>
+	<buns-goodsize-sheet v-model:show="goodChooseModal.show" v-model:value="submitParam.goods"></buns-goodsize-sheet>
 </template>
 
 <script>
@@ -188,7 +189,9 @@
 				wayModal: {
 					show: false,
 				},
-				
+				goodChooseModal:{
+					show: false
+				},
 				submitParam: {
 					stockRoomId: '',
 					countryId: '',
diff --git a/pages/post/post.vue b/pages/post/post.vue
index b015063..7993f96 100644
--- a/pages/post/post.vue
+++ b/pages/post/post.vue
@@ -93,7 +93,7 @@
 							</u-row>
 						</view>
 			
-						<view class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;">
+						<view @click="handleChooseGoods" class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;">
 							<u-row>
 								<view>
 									<u-text text="货物信息(必填)" size="28" :bold="true"></u-text>
@@ -106,7 +106,7 @@
 							</u-row>
 						</view>
 			
-						<view class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;"
+						<view @click="handleDialogClick(goodChooseModal)" class="pt-30 pb-30" style="border-bottom: 2rpx solid #F6F6F6;;"
 							v-if="submitParam.type != sendTypeEnum.container"
 						>
 							<u-row>
@@ -240,6 +240,7 @@
 	<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>
 </template>
 
 <script>
@@ -286,6 +287,9 @@
 				revtimeModal: {
 					show: false,
 				},
+				goodChooseModal: {
+					show: false,
+				},
 				submitParam: {
 					stockRoomId: '',
 					countryId: '',
@@ -313,7 +317,7 @@
 		},
 		methods: {
 			getCdnUrl,
-
+			goto,
 			initData() {
 				// uni.showLoading({
 				// 	title: '加载中'
@@ -327,6 +331,9 @@
 			},
 			handleDialogClick(curModal){
 				curModal.show = true
+			},
+			handleChooseGoods(){
+				goto(`goods/edit?type=choose`)
 			}
 		}
 	}