From 7cac9388142b85d5fb8f988516aba7507111824a Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Fri, 24 May 2019 01:07:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index/view/default/goods/index.html       |  2 +-
 .../index/view/default/index/index.html       |  2 +-
 .../index/view/default/public/footer_nav.html |  4 ++--
 .../index/view/default/user/index.html        |  4 ++--
 public/static/index/default/css/common.css    | 13 +++--------
 public/static/index/default/css/search.css    | 22 +++----------------
 public/static/index/default/js/search.js      |  4 ++--
 7 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/application/index/view/default/goods/index.html b/application/index/view/default/goods/index.html
index 35d18bb15..1db1395c7 100755
--- a/application/index/view/default/goods/index.html
+++ b/application/index/view/default/goods/index.html
@@ -481,7 +481,7 @@
                                                 <a href="{{:$v['goods_url']}}">
                                                     <img alt="{{$v.title}}" src="{{$v.home_recommended_images}}" />
                                                 </a>
-                                                <p class="ellipsis" {{if !empty($v.title_color)}}style="color:{{$v.title_color}};"{{/if}}>{{$v.title}}</p>
+                                                <p class="am-text-truncate" {{if !empty($v.title_color)}}style="color:{{$v.title_color}};"{{/if}}>{{$v.title}}</p>
                                                 <p class="price fl">
                                                     <strong>¥{{$v.price}}</strong>
                                                 </p>
diff --git a/application/index/view/default/index/index.html b/application/index/view/default/index/index.html
index e419d5498..6f0c9b6ce 100755
--- a/application/index/view/default/index/index.html
+++ b/application/index/view/default/index/index.html
@@ -178,7 +178,7 @@
                                             <img src="{{$goods.home_recommended_images}}" alt="{{$goods.title}}" />
                                         </a>
                                         <div class="outer-con">
-                                            <div class="goods-title ellipsis">
+                                            <div class="goods-title am-text-truncate">
                                                 <a href="{{$goods['goods_url']}}" target="_blank" {{if !empty($goods.title_color)}}style="color:{{$goods.title_color}};"{{/if}}>{{$goods.title}}</a>
                                             </div>
                                             <div class="price">￥{{$goods.min_price}}</div>
diff --git a/application/index/view/default/public/footer_nav.html b/application/index/view/default/public/footer_nav.html
index be4ad4631..43c3d202e 100755
--- a/application/index/view/default/public/footer_nav.html
+++ b/application/index/view/default/public/footer_nav.html
@@ -39,10 +39,10 @@
 					{{if $k lt 4}}
 						<li>
 							<div class="am-gallery-item">
-								<p class="footer-nav-title ellipsis">{{$v.name}}</p>
+								<p class="footer-nav-title am-text-truncate">{{$v.name}}</p>
 								{{if !empty($v['items'])}}
 									{{foreach $v.items as $vs}}
-										<p class="ellipsis">
+										<p class="am-text-truncate">
 											<a href="{{$vs.url}}" {{if $vs['is_new_window_open'] eq 1}}target="_blank"{{/if}}>{{$vs.name}}</a>
 										</p>
 									{{/foreach}}
diff --git a/application/index/view/default/user/index.html b/application/index/view/default/user/index.html
index 70095c1bf..32167e2ed 100755
--- a/application/index/view/default/user/index.html
+++ b/application/index/view/default/user/index.html
@@ -153,7 +153,7 @@
                                                     <img src="{{$goods.images}}" />
                                                 </a>
                                                 <div class="goods-base">
-                                                    <a href="{{:MyUrl('index/order/detail', ['id'=>$order['id']])}}" target="_blank" class="goods-title ellipsis">{{$goods.title}}</a>
+                                                    <a href="{{:MyUrl('index/order/detail', ['id'=>$order['id']])}}" target="_blank" class="goods-title am-text-truncate">{{$goods.title}}</a>
                                                     <ul>
                                                         <li>
                                                             <span>{{$order.add_time_time}}</span>
@@ -212,7 +212,7 @@
                                                 <img src="{{$goods.images}}" />
                                             </a>
                                             <div class="goods-base">
-                                                <a href="{{:MyUrl('index/goods/index', ['id'=>$goods['goods_id']])}}" target="_blank" class="goods-title ellipsis">{{$goods.title}}</a>
+                                                <a href="{{:MyUrl('index/goods/index', ['id'=>$goods['goods_id']])}}" target="_blank" class="goods-title am-text-truncate">{{$goods.title}}</a>
                                                 <ul>
                                                     <li>
                                                         <span class="line-price">￥{{$goods.price}}</span>
diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css
index f2cd76ce3..92a4eac11 100755
--- a/public/static/index/default/css/common.css
+++ b/public/static/index/default/css/common.css
@@ -247,16 +247,6 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a
     font-weight: bold;
 }
 
-/* 文字自动隐藏 */
-.ellipsis {
-    -o-text-overflow: ellipsis;
-    text-overflow: ellipsis;      
-    overflow: hidden;
-    white-space: nowrap;
-    max-width: 100%;
-    color: #666;
-}
-
 /**
  * 灰色文字标记
  */
@@ -297,6 +287,9 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a
     color: #e2e2e2;
     margin-top:20px;
 }
+.am-footer-default p.am-text-truncate {
+    line-height: 24px;
+}
 .am-footer-default a {
     font-size: 12px;
     color: #b1b1b1;
diff --git a/public/static/index/default/css/search.css b/public/static/index/default/css/search.css
index 96b47cc1d..e01f43472 100755
--- a/public/static/index/default/css/search.css
+++ b/public/static/index/default/css/search.css
@@ -1,12 +1,5 @@
-ul, li, ol {list-style: none;}
-dl,dt,dd{ margin:0px auto; padding:0px;}
-[class*="am-u-"] {padding-left:0rem;padding-right:0rem;}
-.am-thumbnails {margin-left: 0rem;margin-right: 0rem;}
-.am-thumbnail {margin-bottom:0;}
-.am-thumbnails > li {padding: 0 0rem 0.2rem .2rem;}
-img{ max-width:100%;}
-.price{color: #e4393c;font-weight: 600;}
-
+.i-pic.limit img{ width:100%;}
+.i-pic.limit .price strong{ font-size: 14px; }
 .theme-popover {z-index: 1011;overflow:visible;background:#fff; width: 100%; }
 .sort-nav a:hover, .sort-nav a:focus { color: #d2364c; }
 .select .title-tips { font-size: 12px; color: #888; }
@@ -64,7 +57,7 @@ dl#select3 .dd-conent{ left:-200%; right:0px;}
 .am-pagination li{ float:none;}
 
 .search-side{display: none;}
-.limit p.title,.i-pic.check p.title{padding:0px 5px;margin:5px 0px;overflow:hidden;height:18px;line-height:18px ;}
+.limit p.title,.i-pic.check p.title{padding:0px 5px;}
 .search-pages-submit { margin: 10px 0; }
 
 @media only screen and (min-width: 640px) {
@@ -103,15 +96,6 @@ dl#select3 .dd-conent{ left:-200%; right:0px;}
     .scoll{ margin-top:70px;}
     .am-slider-default .am-direction-nav a {z-index:0;}
     span.am-icon-th-list{color:orangered;margin-right:1px ;}
-
-    /*改写的布局*/   
-    .flood li{width:33.3%;float: left; text-align: center;}
-    .smallnav img{max-width:60px;}
-    .smallnav{ font-size:14px;}
-
-    /*文字布局*/
-    .limit p.title,.i-pic.check p.title{padding:0px 10px;overflow:hidden;height:36px;line-height:18px ;}
-    .price.fl{font-size:16px ;}
 }
 
 @media only screen and (min-width:1025px) {
diff --git a/public/static/index/default/js/search.js b/public/static/index/default/js/search.js
index 2b860b552..bb20310a0 100755
--- a/public/static/index/default/js/search.js
+++ b/public/static/index/default/js/search.js
@@ -192,9 +192,9 @@ $(function()
                             html += '<img src="'+result.data.data[i]['images']+'" />';
                             html += '</a>';
                             html += '<a href="'+result.data.data[i]['goods_url']+'" target="_blank">';
-                            html += '<p class="title fl">'+result.data.data[i]['title']+'</p>';
+                            html += '<p class="am-text-truncate title fl">'+result.data.data[i]['title']+'</p>';
                             html += '</a>';
-                            html += '<p class="price fl"><b>¥</b><strong>'+result.data.data[i]['min_price']+'</strong></p>';
+                            html += '<p class="price fl"><strong>¥ '+result.data.data[i]['min_price']+'</strong></p>';
                             html += '<p class="number fl">销量<span>'+result.data.data[i]['sales_count']+'</span></p>';
                             html += '</div></li>';
 
-- 
GitLab