From 0fc381c36befcc32d048935e1c0c2f421b13ebbb Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Mon, 30 Dec 2019 00:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=B1=95=E7=A4=BA=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=A0=87=E9=A2=98=E8=B0=83=E6=95=B4=E4=B8=BA=E4=B8=A4?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/view/default/goods/index.html    |  4 ++--
 application/index/view/default/index/index.html    |  2 +-
 application/index/view/default/search/content.html |  6 ++++--
 public/static/common/css/common.css                | 14 ++++++++++++++
 public/static/index/default/css/goods.css          |  2 +-
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/application/index/view/default/goods/index.html b/application/index/view/default/goods/index.html
index c418b39e5..b28c47053 100755
--- a/application/index/view/default/goods/index.html
+++ b/application/index/view/default/goods/index.html
@@ -440,7 +440,7 @@
                                         <img alt="{{$v.title}}" src="{{$v.images}}">
                                     </a>               
                                 </div>
-                                <div class="p-name">
+                                <div class="p-name am-text-truncate-2 am-margin-vertical-xs ">
                                     <a href="{{:$v['goods_url']}}" {{if !empty($v.title_color)}}style="color:{{$v.title_color}};"{{/if}}>{{$v.title}}</a>
                                 </div>
                                 <div class="p-price"><strong>￥{{$v.price}}</strong></div>
@@ -581,7 +581,7 @@
                                                     <img alt="{{$v.title}}" src="{{$v.home_recommended_images}}" />
                                                 </a>
                                                 <a href="{{:$v['goods_url']}}">
-                                                    <p class="am-text-truncate" {{if !empty($v.title_color)}}style="color:{{$v.title_color}};"{{/if}}>{{$v.title}}</p>
+                                                    <p class="am-text-truncate-2 am-margin-bottom-xs" {{if !empty($v.title_color)}}style="color:{{$v.title_color}};"{{/if}}>{{$v.title}}</p>
                                                 </a>
                                                 <p class="price fl">
                                                     <strong>￥{{$v.price}}</strong>
diff --git a/application/index/view/default/index/index.html b/application/index/view/default/index/index.html
index 225888481..5b960694c 100755
--- a/application/index/view/default/index/index.html
+++ b/application/index/view/default/index/index.html
@@ -254,7 +254,7 @@
                                             <img src="{{$goods.home_recommended_images}}" alt="{{$goods.title}}" class="goods-images" />
                                         </a>
                                         <div class="outer-con">
-                                            <div class="goods-title am-text-truncate">
+                                            <div class="goods-title am-text-truncate-2 am-margin-bottom-xs">
                                                 <a href="{{$goods['goods_url']}}" target="_blank" {{if !empty($goods.title_color)}}style="color:{{$goods.title_color}};"{{/if}}>{{$goods.title}}</a>
                                             </div>
 
diff --git a/application/index/view/default/search/content.html b/application/index/view/default/search/content.html
index 4078ddea4..72f9ed928 100644
--- a/application/index/view/default/search/content.html
+++ b/application/index/view/default/search/content.html
@@ -1,7 +1,7 @@
 {{if !empty($data)}}
     {{foreach $data as $v}}
         <li class="am-animation-scale-up">
-            <div class="items">
+            <div class="items am-padding-bottom-xs">
                 <a href="{{$v.goods_url}}" target="_blank" class="am-block">
                     <!-- 搜索页面商品信息顶部钩子 -->
                     {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
@@ -25,7 +25,9 @@
                     {{/php}}
 
                     <img src="{{$v.images}}" alt="{{$v.title}}" class="goods-images" />
-                    <p class="am-text-truncate am-padding-xs goods-title" title="{{$v.title}}">{{$v.title}}</p>
+                    <div class="am-padding-xs">
+                        <p class="am-text-truncate-2 goods-title" title="{{$v.title}}">{{$v.title}}</p>
+                    </div>
                 </a>
                 <p class="am-padding-horizontal-xs am-cf">
                     {{if isset($v['original_price']) and $v['original_price'] gt 0}}
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 0b702124f..cb75fd7a0 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -397,4 +397,18 @@ button.colorpicker-submit img {
 }
 .plugins-tag:hover span {
     display: block;
+}
+
+/**
+ * 两行、超出字符省略
+ */
+.am-text-truncate-2 {
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    line-height: 18px;
+    height: 35px;
 }
\ No newline at end of file
diff --git a/public/static/index/default/css/goods.css b/public/static/index/default/css/goods.css
index 7c20e8895..e1b56aeb4 100755
--- a/public/static/index/default/css/goods.css
+++ b/public/static/index/default/css/goods.css
@@ -270,7 +270,7 @@ ul.detail-attr li {height: 26px;overflow: hidden;line-height: 26px;vertical-alig
 
 /*推荐商品*/
 .like{margin-top:25px;border-radius:4px;}
-.like li{ float:left; padding:8px 10px 0;font: 14px/1.5 tahoma,arial,"Hiragino Sans GB",宋体,sans-serif;}
+.like li{ float:left; padding:8px 10px 5px;font: 14px/1.5 tahoma,arial,"Hiragino Sans GB",宋体,sans-serif;}
 .like li{ text-align:left; border-top: 1px solid #eee; } 
 .like li .p-price strong {
     font-size: 14px; color: #E4393C;font-weight: 400;font-family: Verdana;}