Authored by ccbikai

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -103,8 +103,8 @@ @@ -103,8 +103,8 @@
103 .card-label { 103 .card-label {
104 margin: 0 0 10px; 104 margin: 0 0 10px;
105 font-size: 24px; 105 font-size: 24px;
106 - line-height: 28px;  
107 - height: 65px; 106 + line-height: 1.4;
  107 + height: 67.1999999999px;
108 font-weight: normal; 108 font-weight: normal;
109 } 109 }
110 } 110 }
@@ -429,6 +429,8 @@ @@ -429,6 +429,8 @@
429 this.cartCount = result.data.goods_count; 429 this.cartCount = result.data.goods_count;
430 430
431 selector.playAnimation(); 431 selector.playAnimation();
  432 + } else {
  433 + result.message = '添加购物车失败 >_<';
432 } 434 }
433 435
434 this.showFeatureSelector = false; 436 this.showFeatureSelector = false;