From bb12e8e705522bc3f61df4fb3395d4ec9a9871c6 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Wed, 31 Jan 2024 17:17:34 +0800
Subject: [PATCH] uu

---
 .../buns-goodinfo-sheet.vue                   |  2 +-
 .../bpe-gooditem-edit-tmp.vue                 | 99 +++++++++++++++++++
 .../bpe-goodphoto-tmp.vue                     | 66 +++++++++++++
 components/tpx-dialog/tpx-dialog.vue          |  8 +-
 components/tpx-upload/tpx-upload.vue          |  2 +-
 pages/post/openorder.vue                      | 13 ++-
 6 files changed, 180 insertions(+), 10 deletions(-)
 create mode 100644 components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
 create mode 100644 components/buns-post-edit-templates/bpe-goodphoto-tmp.vue

diff --git a/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue b/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
index 9691983..05322b8 100644
--- a/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
+++ b/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
@@ -7,7 +7,7 @@
 						<view class="dt-tle">
 							<view class="com-section">物品信息</view>
 							<view>
-								<u-button custom-style="font-size: 28rpx;height: 56rpx;border-radius: 16rpx;" plain="true">选择历史</u-button>
+								<u-button custom-style="font-size: 28rpx;height: 56rpx;border-radius: 16rpx;" plain="true" type="primary">选择历史</u-button>
 							</view>
 						</view>
 						<view class="dt-cont">
diff --git a/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue b/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
new file mode 100644
index 0000000..54a6730
--- /dev/null
+++ b/components/buns-post-edit-templates/bpe-gooditem-edit-tmp.vue
@@ -0,0 +1,99 @@
+<template>
+	<view v-for="(item, index) in submitInfo.gdList" class="yditem">
+		<view class="ydi-lab">
+			<text @click="handleEditGood(item)" class="font-weight">女士针织棉上衣</text>
+			<view>
+				<u-icon @click="handleDelGood(index)" name="trash" size="32"></u-icon>
+			</view>
+		</view>
+		<view class="ydi-lab mt-10">
+			<view @click="handleEditGood(item)" style="width: 100%;">
+				<u-row justify="between">
+					<view class="clr-sub">无 12L 中国内地</view>
+					<view><text class="clr-sub">预报</text> 21</view>
+				</u-row>
+				<view class="clr-prm pt-10">12 CNY</view>
+			</view>
+		</view>
+		<view class="ydi-lab mt-10">
+			<u-row>
+				<text class="pr-20 clr-prm">异常</text>
+				<uni-number-box :min="0" v-model="item.yichang" :max="10000" background="#fff"></uni-number-box>
+			</u-row>
+			<u-row>
+				<text class="pr-20">实入仓</text>
+				<uni-number-box :min="0"  v-model="item.shiru" :max="10000" background="#fff"></uni-number-box>
+			</u-row>
+		</view>
+	</view>
+	
+	<u-button @click="handleEditGood" custom-style="border-radius: 16rpx;" type="primary" plain="true">
+		<u-row justify="center">
+			<view>
+				<u-icon name="plus" size="30" color="#B12D29"></u-icon>
+			</view>
+			<text class="pl-10">增加货物</text>
+		</u-row>
+	</u-button>
+	
+	<buns-goodinfo-sheet v-model:show="goodinfoModal.show" v-model:value="goodinfoModal.value"></buns-goodinfo-sheet>
+	
+</template>
+
+<script>
+	export default {
+		computed: {
+			submitInfo: {
+				get(){
+					return this.value
+				}
+			}
+		},
+		props: {
+			value: {
+				default () {
+					return { }
+				}
+			}
+		},
+		data() {
+			return {
+				goodinfoModal:{
+					show: false,
+					value: {}
+				}
+			}
+		},
+		created() {
+		},
+		onHide() {
+
+		},
+		unmounted() {
+			
+		},
+
+		methods: {
+			handleEditGood(item = {}) {
+				this.goodinfoModal.show = true
+				this.goodinfoModal.value = item
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.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/buns-post-edit-templates/bpe-goodphoto-tmp.vue b/components/buns-post-edit-templates/bpe-goodphoto-tmp.vue
new file mode 100644
index 0000000..797b524
--- /dev/null
+++ b/components/buns-post-edit-templates/bpe-goodphoto-tmp.vue
@@ -0,0 +1,66 @@
+<template>
+	<view v-if="title" class="mb-20">{{title}}</view>
+	<tpx-upload v-model:value="submitInfo[filedName]" maxLen="10"></tpx-upload>
+</template>
+
+<script>
+	export default {
+		computed: {
+			submitInfo: {
+				get(){
+					return this.value
+				}
+			}
+		},
+		props: {
+			title: {
+				default () {
+					return ''
+				}
+			},
+			filedName:{
+				default () {
+					return ''
+				}
+			},
+			value: {
+				default () {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				
+			}
+		},
+		created() {
+		},
+		onHide() {
+
+		},
+		unmounted() {
+			
+		},
+
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.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 3871722..820af0f 100644
--- a/components/tpx-dialog/tpx-dialog.vue
+++ b/components/tpx-dialog/tpx-dialog.vue
@@ -60,7 +60,7 @@
 			},
 			zIndex: {
 				default () {
-					return 1000
+					return 990
 				}
 			},
 		},
@@ -88,7 +88,7 @@
 
 <style scoped lang="scss">
 	.dialog {
-		z-index: 1000;
+		z-index: 990;
 		position: fixed;
 		top: 0;
 		right: 0;
@@ -124,7 +124,7 @@
 	}
 
 	.type-sheet {
-		z-index: 5000;
+		z-index: 990;
 		line-height: 1.4;
 		background-color: #fff;
 		border-top-left-radius: 30rpx;
@@ -132,7 +132,7 @@
 		left: 0;
 		right: 0;
 		bottom: 0;
-		max-height: 85%;
+		max-height:calc(85vh);
 		min-height: 60%;
 		width: 100%;
 		box-sizing: border-box;
diff --git a/components/tpx-upload/tpx-upload.vue b/components/tpx-upload/tpx-upload.vue
index 1687a94..96bfe1d 100644
--- a/components/tpx-upload/tpx-upload.vue
+++ b/components/tpx-upload/tpx-upload.vue
@@ -13,7 +13,7 @@
 			</view>
 		</view>
 		
-		<view v-if="list.length < maxLen" style="width: 100%;">
+		<view v-if="list.length < maxLen">
 			<view v-if="!isSlot"  @click="handleChooseFile" class="camer-btn" :style="`width:${width}rpx;height:${height}rpx;`">
 				<template v-if="btnText">
 					<u-icon name="plus" size="40"></u-icon>
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index 8ca3c9b..d6330ad 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -280,8 +280,12 @@
 	
 	<buns-way-sheet v-model:show="wayModal.show" v-model:value="submitParam.wayId"></buns-way-sheet>
 	
-	<buns-edit-sheet title="商品信息" v-model:show="goodChooseModal.show" v-model:value="submitParam" v-slot="tempObject">
-		<!-- <bpe-goodsize-tmp :value="tempObject.value"></bpe-goodsize-tmp> -->
+	<buns-edit-sheet percentHeight="70" title="商品信息" v-model:show="goodChooseModal.show" v-model:value="submitParam" v-slot="tempObject">
+		<view class="mb-20">托寄货物描述</view>
+		<bpe-gooditem-edit-tmp :value="tempObject.value"></bpe-gooditem-edit-tmp>
+		<view class="mt-30">
+			<bpe-goodphoto-tmp title="货物照片" :value="tempObject.value" filedName="phName"></bpe-goodphoto-tmp>
+		</view>
 	</buns-edit-sheet>
 	
 </template>
@@ -293,10 +297,11 @@
 	import BpeAddressinfoTmp from "@/components/buns-post-edit-templates/bpe-addressinfo-tmp"
 	import BpeGoodstaticTmp from "@/components/buns-post-edit-templates/bpe-goodstatic-tmp"
 	import BpeCostTmp from "@/components/buns-post-edit-templates/bpe-cost-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: { BpeAddressinfoTmp, BpeGoodstaticTmp, BpeCostTmp },
+		components: { BpeAddressinfoTmp, BpeGoodstaticTmp, BpeCostTmp, BpeGooditemEditTmp, BpeGoodphotoTmp },
 		props: {
 			// hasLeftWin: {
 			// 	type: Boolean