From dff45a59d734b7a9c445adae4b0fbef470b0ce84 Mon Sep 17 00:00:00 2001
From: wangkesi <wangkesi@3ncto.com>
Date: Thu, 11 Oct 2018 16:54:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/goods-classify.vue | 52 ++++++++++++++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/view/goods-classify.vue b/src/view/goods-classify.vue
index c16970b..66201a5 100644
--- a/src/view/goods-classify.vue
+++ b/src/view/goods-classify.vue
@@ -27,9 +27,9 @@
 									</a>
 									<div class="info f-flex">
 										<div>
-											<p class="title f-ellipsis-1">{{goods.name}}</p>
+											<p class="title f-ellipsis-1 ellipsis">{{goods.name}}</p>
 											<p class="rule f-ellipsis-1">{{goods.shortDesc}}</p>
-											<div class="full f-ellipsis-1">
+											<div class="card-name">
 												<i :style="{marginRight:(i+1)==goods.labelList.length?'0':'0.1rem'}" v-if="label.labelText" v-for="(label,i) in goods.labelList">{{label.labelText}}</i>
 											</div>
 										</div>
@@ -261,6 +261,33 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.card-name {
+    height: 0.3rem;
+    font-size: 0.2rem;
+    font-style: normal;
+    font-weight: 400;
+    color: #f4a353;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    word-wrap: break-word;
+    i {
+        font-style: normal;
+        background: rgba(255, 242, 229, 1);
+        padding: 1px 3px;
+    }
+}
+.ellipsis {
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    line-height: 1;
+    word-wrap: break-word;
+    height: 0.3rem;
+}
 .goods {
     background-color: #fff;
     .top {
@@ -371,21 +398,34 @@ export default {
                         // line-height: 1;
                     }
                     .full {
-                        height: 0.3rem;
+                        height: 0.2rem;
                         font-size: 0.2rem;
+                        font-style: normal;
+                        font-weight: 400;
                         color: rgba(244, 163, 83, 1);
-                        margin: 0.16rem 0 0.1rem;
+                        text-overflow: ellipsis;
+                        overflow: hidden;
+                        display: -webkit-box;
+                        -webkit-box-orient: vertical;
+                        -webkit-line-clamp: 1;
+                        word-wrap: break-word;
+                        margin-top: 0.16rem;
+                        line-height: 1;
                         i {
+                            font-weight: 400;
+                            color: #f4a353;
+                            overflow: hidden;
+                            height: 0.22rem;
+                            font-style: normal;
                             background: rgba(255, 242, 229, 1);
                             padding: 1px 3px;
-                            font-style: normal;
                         }
                     }
                     .price {
                         font-size: 0;
                         min-width: 1.5rem;
                         span {
-							display: inline-block;
+                            display: inline-block;
                             font-size: 0.34rem;
                         }
                         .money {