From 0c4a5baff529949e73c932c8bc64aefde99d4b16 Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Fri, 1 Feb 2019 07:39:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(=C3=87ard):=20=E4=BF=AE=E5=A4=8Dcentered?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=97=A0=E6=95=88=EF=BC=8C=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?title=E3=80=81desc=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6=20@rex-z?=
 =?UTF-8?q?sd=20(#1270)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/card/index.less | 13 +++++--------
 packages/card/index.wxml | 10 ++++++----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/card/index.less b/packages/card/index.less
index 0384290d..35f293aa 100644
--- a/packages/card/index.less
+++ b/packages/card/index.less
@@ -8,13 +8,13 @@
   background-color: @background-color-light;
   box-sizing: border-box;
 
-  &--center {
-    align-items: center;
-    justify-content: center;
-  }
-
   &__header {
     display: flex;
+
+    &--center {
+      align-items: center;
+      justify-content: center;
+    }
   }
 
   &__thumb {
@@ -36,7 +36,6 @@
 
   &__content {
     position: relative;
-    height: 90px;
     min-width: 0; /* hack for flex box ellipsis */
     flex: 1;
   }
@@ -47,13 +46,11 @@
   }
 
   &__title {
-    max-height: 32px;
     font-weight: bold;
     line-height: 16px;
   }
 
   &__desc {
-    max-height: 20px;
     line-height: 20px;
     color: @gray-darker;
   }
diff --git a/packages/card/index.wxml b/packages/card/index.wxml
index d4e67631..46d9d813 100644
--- a/packages/card/index.wxml
+++ b/packages/card/index.wxml
@@ -1,5 +1,7 @@
-<view class="custom-class van-card {{ centered ? 'van-card--center' : '' }}">
-  <view class="van-card__header">
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="custom-class van-card">
+  <view class="{{ utils.bem('card__header', { center: centered }) }}">
     <view class="van-card__thumb" bind:tap="onClickThumb">
       <image
         wx:if="{{ thumb }}"
@@ -20,10 +22,10 @@
     </view>
 
     <view class="van-card__content">
-      <view wx:if="{{ title }}" class="van-card__title van-multi-ellipsis--l2 title-class">{{ title }}</view>
+      <view wx:if="{{ title }}" class="van-card__title title-class">{{ title }}</view>
       <slot wx:else name="title" />
 
-      <view wx:if="{{ desc }}" class="van-card__desc van-ellipsis desc-class">{{ desc }}</view>
+      <view wx:if="{{ desc }}" class="van-card__desc desc-class">{{ desc }}</view>
       <slot wx:else name="desc" />
 
       <slot name="tags" />