Merge branch 'release/4.9.1.0'

@@ -95,13 +95,17 @@
 
 
 .good-detail-text {
 .good-detail-text {
     .name a {
     .name a {
-        display: block;
+        display: -webkit-box;
+        overflow: hidden;
+        word-break: break-all;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
         margin: 15px 0 10px;
         margin: 15px 0 10px;
         min-height: 50px;
         min-height: 50px;
         color: #444;
         color: #444;
         font-size: 22px;
         font-size: 22px;
         line-height: 30px;
         line-height: 30px;
-        height: 60px;
+        height: 55px;
         padding: 5px 0; /* 商品标题限制行数的bug修复 增加元素的clientHeight */        
         padding: 5px 0; /* 商品标题限制行数的bug修复 增加元素的clientHeight */        
     }
     }
     .price {
     .price {
@@ -122,15 +126,23 @@
             display: inline-block;
             display: inline-block;
             text-align: center;
             text-align: center;
             background: resolve('product/price-tag.png') no-repeat center;
             background: resolve('product/price-tag.png') no-repeat center;
-            background-size: cover;
+            background-size: contain;
             color: #fff;
             color: #fff;
-            font-size: 18px;
-            width: 77px;
-            height: 26px;
-            line-height: 26px;
+            width: 70px;
+            height: 24px;
+            position: relative;
+            top: 2px;
         }
         }
     }
     }
     .student-price {
     .student-price {
+        .sale-price.no-price {
+            color: #d62927;
+        }
+        .sale-price {
+            display: inline-block;
+            height: 24px;
+            line-height: 24px;
+        }
         .market-price {
         .market-price {
             margin: 0px;
             margin: 0px;
             display: block;
             display: block;

@@ -35,7 +35,7 @@
             <div class="price {{#if students}}student-price{{/if}}">
             <div class="price {{#if students}}student-price{{/if}}">
                 {{#if students}}
                 {{#if students}}
                     <span class="sale-price {{^price}}no-price{{/price}}">¥{{studentPrice}}</span>
                     <span class="sale-price {{^price}}no-price{{/price}}">¥{{studentPrice}}</span>
-                    <span class="students-price-tag">学生价</span>
+                    <span class="students-price-tag"></span>
                     {{#salePrice}}
                     {{#salePrice}}
                         <span class="market-price">¥{{.}}</span>
                         <span class="market-price">¥{{.}}</span>
                     {{/salePrice}}
                     {{/salePrice}}