From 70fd6fda1bc6ea45bb3090cea6970db08a1ff164 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Mon, 29 Apr 2024 10:37:22 +0800
Subject: [PATCH] uu

---
 .../buns-goodinfo-sheet/buns-goodinfo-sheet.vue  |  2 +-
 components/tpx-scroll-view/tpx-scroll-view.vue   | 16 +++++++++++++++-
 components/tpx-select/tpx-select.vue             |  9 ++++++---
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue b/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
index fb6f16f..faf26d7 100644
--- a/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
+++ b/components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
@@ -171,7 +171,7 @@
 			  return this.$store.getters.dicData
 			},
 			goodsSearchParam() {
-				return { goodsName: this.modelInfo.goodsName }
+				return { goodsName: this.modelInfo.goodsName || '' }
 			}
 		},
 		watch: {
diff --git a/components/tpx-scroll-view/tpx-scroll-view.vue b/components/tpx-scroll-view/tpx-scroll-view.vue
index ad6062b..4078459 100644
--- a/components/tpx-scroll-view/tpx-scroll-view.vue
+++ b/components/tpx-scroll-view/tpx-scroll-view.vue
@@ -1,5 +1,5 @@
 <template>
-	<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom()" style="height: 100%;">
+	<scroll-view :scroll-y="true" @scrolltolower="onScrollBottom()" :style="customStyle">
 		<slot></slot>
 
 		<!-- 加载更多 -->
@@ -41,6 +41,15 @@
 				deep: true
 			}
 		},
+		computed: {
+			customStyle() {
+				let stl = `height: 100%;`
+				if(this.maxHeight) {
+					stl += `max-height:${this.maxHeight}rpx;`
+				}
+				return stl
+			}
+		},
 		props: {
 			searchParam: {
 				default () {
@@ -73,6 +82,11 @@
 				default () {
 					return 'dfl'
 				}
+			},
+			maxHeight: {
+				default () {
+					return ''
+				}
 			}
 		},
 		data() {
diff --git a/components/tpx-select/tpx-select.vue b/components/tpx-select/tpx-select.vue
index d6e1a10..77739eb 100644
--- a/components/tpx-select/tpx-select.vue
+++ b/components/tpx-select/tpx-select.vue
@@ -19,7 +19,7 @@
 		</view>
 		
 		<view v-if="mode == modeEnum.drop && show" class="md-drop-cont">
-			<tpx-scroll-view :resObject="filResObject" :searchParam="searchParam" :getListFun="getListFun"  size="sm" :showLoadedAll="false" @onListChange="onListChange">
+			<tpx-scroll-view :maxHeight="dropMaxHeight" :resObject="filResObject" :searchParam="searchParam" :getListFun="getListFun"  size="sm" :showLoadedAll="false" @onListChange="onListChange">
 				<content-items :value="value" :list="filDataList" :minChecked="minChecked" :type="type"
 					@onChange="handleDataItemChange"
 				></content-items>
@@ -97,6 +97,11 @@
 					return ""
 				}
 			},
+			dropMaxHeight: {
+				default () {
+					return 600
+				}
+			},
 			list: {
 				default () {
 					return []
@@ -174,8 +179,6 @@
 		top: calc(100% + 8px);
 		left: 0;
 		right: 0;
-		max-height: 600rpx;
-		overflow: auto;
 		z-index: 10;
 		padding: 20rpx;
 		box-sizing: border-box;