From 8de4e58cb484cab8c8167f485f9f8ad20b4cc7d5 Mon Sep 17 00:00:00 2001
From: wong1988 <wong1988@petalmail.com>
Date: Sun, 21 Jan 2024 16:39:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/cloudCard2.vue                     |  2 +-
 .../uni-popup-dialog/uni-popup-dialog.vue     | 51 +++++++++++++++++--
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue
index 98dfba6..37710c5 100644
--- a/pages/home/cloudCard2.vue
+++ b/pages/home/cloudCard2.vue
@@ -171,7 +171,7 @@
 
 
 		<uni-popup ref="inputDialog" type="dialog">
-			<uni-popup-dialog ref="inputClose" mode="base" title="订购协议" :showConfirm="true"
+			<uni-popup-dialog ref="inputClose" mode="more" title="订购协议" :showConfirm="true"
 				:beforeClose="dialogBeforeClose" @confirm="dialogInputConfirm"
 				:content="data.brandVos[selectIndex2].dgxy" :confirm-text="confirmText"></uni-popup-dialog>
 		</uni-popup>
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
index e8c9fcc..47352f5 100644
--- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -4,12 +4,17 @@
 			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
 		</view>
 		<view v-if="mode === 'base'" class="uni-dialog-content">
+			<slot>
+				<text class="uni-dialog-content-text">{{content}}</text>
+			</slot>
+		</view>
+		<view v-if="mode === 'more'" class="uni-dialog-content">
 			<slot>
 				<textarea class="uni-dialog-content-text" :value="content" :auto-height="false"
-					:maxlength="10000"></textarea>
+					:style="{'height':contentHeight}" :maxlength="10000"></textarea>
 			</slot>
 		</view>
-		<view v-else class="uni-dialog-content">
+		<view v-if="mode === 'input'" class="uni-dialog-content">
 			<slot>
 				<input class="uni-dialog-input" v-model="val" :type="inputType" :placeholder="placeholderText"
 					:focus="focus">
@@ -117,7 +122,8 @@
 			return {
 				dialogType: 'warn',
 				focus: false,
-				val: ""
+				val: "",
+				contentHeight: '135px'
 			}
 		},
 		computed: {
@@ -146,6 +152,9 @@
 			},
 			value(val) {
 				this.val = val
+			},
+			content() {
+				this.getHeight()
 			}
 		},
 		created() {
@@ -185,6 +194,42 @@
 			},
 			close() {
 				this.popup.close()
+			},
+			getHeight() {
+
+
+				let height = '135px'
+
+				try {
+
+					if (this.mode != 'more') {
+						return
+					}
+
+					const count = (this.content.match(/\n/g) || []).length;
+					// 粗略高度
+					let temp = this.content.replaceAll("\n", "");
+
+					let col = temp.length / 18 + 1
+					let totalHeight = (col + count) * 15
+					// 568 
+					let height2 = getApp().globalData.navInfo.window.height
+
+					let maxHeight = (height2 - 170) / 3
+
+					if (totalHeight > maxHeight) {
+						height = maxHeight + 'px'
+					} else {
+						height = totalHeight + 'px'
+					}
+
+				} catch (e) {
+					//TODO handle the exception
+				}
+
+				this.contentHeight = height
+
+				console.log("======", this.contentHeight);
 			}
 		}
 	}