From 6e9d0048a15258cdbfb3919afb0c3ba31d6a002c Mon Sep 17 00:00:00 2001
From: xiaoyucoding <xiaoyucoding@126.com>
Date: Thu, 6 Dec 2018 20:32:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=99=90=E5=88=B6=20showModal=20?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=8F=8A=E5=86=85=E5=AE=B9=E7=9A=84=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/platforms/h5/components/app/popup/modal.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/platforms/h5/components/app/popup/modal.vue b/src/platforms/h5/components/app/popup/modal.vue
index afab6acbe..bbed8644e 100644
--- a/src/platforms/h5/components/app/popup/modal.vue
+++ b/src/platforms/h5/components/app/popup/modal.vue
@@ -12,7 +12,9 @@
           class="uni-modal__hd">
           <strong class="uni-modal__title">{{ title }}</strong>
         </div>
-        <div class="uni-modal__bd">{{ content }}</div>
+        <div
+          class="uni-modal__bd"
+          @touchmove.stop>{{ content }}</div>
         <div class="uni-modal__ft">
           <div
             v-if="showCancel"
@@ -105,13 +107,19 @@ export default {
 	}
 
 	uni-modal .uni-modal__hd {
-		padding: 1.3em 1.6em 0;
-		line-height: 1;
+		padding: 1em 1.6em 0.3em;
 	}
 
 	uni-modal .uni-modal__title {
 		font-weight: 400;
 		font-size: 18px;
+		word-wrap:break-word;
+		word-break:break-all;
+		overflow : hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
 	}
 
 	uni-modal .uni-modal__bd {
@@ -122,6 +130,8 @@ export default {
 		word-wrap: break-word;
 		word-break: break-all;
 		color: #999999;
+		max-height: 400px;
+		overflow-y: auto;
 	}
 
 	uni-modal .uni-modal__ft {
-- 
GitLab