Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -31,51 +31,6 @@ $basicBtnC:#eb0313;
     right: auto;
 }
 
-.tag-container {
-    position: absolute;
-    left: pxToRem(108px);
-    top: pxToRem(40px);
-    height: pxToRem(35px);
-    // width: pxToRem(70px);
-    color: #fff;
-    font-size: pxToRem(20px);
-    line-height: pxToRem(35px);
-    z-index: 2;
-    .good-tag {
-        display: inline-block;
-        box-sizing: border-box;
-        margin-left: .5px;
-        font-size: pxToRem(23px);
-        text-align: center;
-        line-height: pxToRem(35px);
-        padding: 0 8px;
-    }
-    .new-tag {
-        background-color: #78dc7e;
-        color: #fff;
-    }
-    .renew-tag {
-        background-color: #78dc7e;
-        color: #fff;
-    }
-    .sale-tag {
-        background-color: #ff575c;
-        color: #fff;
-    }
-    .new-festival-tag {
-        background-color: #000;
-        color: #fff;
-    }
-    .limit-tag {
-        border: 1px solid #000;
-        color: #000;
-    }
-    .soonSoldOut-tag {
-        background-color: #ffac5b;
-        color: #fff;
-    }
-}
-
 .good-detail-page {
     overflow: hidden;
     background-color: #f0f0f0;
@@ -116,10 +71,10 @@ $basicBtnC:#eb0313;
                     font-size: pxToRem(24px);
                     background-color: $tableCellC;
                     float: left;
-                    &:last-child{
+                    &:last-child {
                         border-bottom: none;
                     }
-                    &:nth-child(even){
+                    &:nth-child(even) {
                         border-right: none;
                     }
                 }
@@ -127,10 +82,52 @@ $basicBtnC:#eb0313;
             }
         }
     }
-    .gap-block {
-        min-height: 30rem/$pxConvertRem;
-        background-color: #f0f0f0;
+
+    .tag-container {
+        position: absolute;
+        left: pxToRem(108px);
+        top: pxToRem(40px);
+        height: pxToRem(35px);
+        // width: pxToRem(70px);
+        color: #fff;
+        font-size: pxToRem(20px);
+        line-height: pxToRem(35px);
+        z-index: 2;
+        .good-tag {
+            display: inline-block;
+            box-sizing: border-box;
+            margin-left: .5px;
+            font-size: pxToRem(23px);
+            text-align: center;
+            line-height: pxToRem(35px);
+            padding: 0 8px;
+        }
+        .new-tag {
+            background-color: #78dc7e;
+            color: #fff;
+        }
+        .renew-tag {
+            background-color: #78dc7e;
+            color: #fff;
+        }
+        .sale-tag {
+            background-color: #ff575c;
+            color: #fff;
+        }
+        .new-festival-tag {
+            background-color: #000;
+            color: #fff;
+        }
+        .limit-tag {
+            border: 1px solid #000;
+            color: #000;
+        }
+        .soonSoldOut-tag {
+            background-color: #ffac5b;
+            color: #fff;
+        }
     }
+    
     .banner-container {
         position: relative;
         background-color: #fff;
@@ -169,7 +166,7 @@ $basicBtnC:#eb0313;
             height: 100%;
             li {
                 float: left;
-                height: 100%;
+                // height: 100%;
             }
         }
     }
@@ -254,24 +251,24 @@ $basicBtnC:#eb0313;
                 display: inline-block;
                 line-height: pxToRem(88px);
             }
-            .vip-img { 
-                    width: pxToRem(53px);
-                    height: pxToRem(32px);
+            .vip-img {
+                width: pxToRem(53px);
+                height: pxToRem(32px);
             }
             &:nth-child(3) {
                 text-align: right;
-                .vip-img{
+                .vip-img {
                     background: image-url('product/silver.png') no-repeat;
                 }
             }
             &:nth-child(2) {
-                .vip-img{
+                .vip-img {
                     background: image-url('product/golden.png') no-repeat;
                 }
             }
-            &:nth-child(1) { 
+            &:nth-child(1) {
                 text-align: left;
-                .vip-img{
+                .vip-img {
                     background: image-url('product/platinum.png') no-repeat;
                 }
             }

@@ -12,7 +12,9 @@
             {{/list}}
     </div>
     {{/detail}}
+    {{#if desc}}
     <div class="desc-text">{{desc}}</div>
+    {{/if}}
 </div>
 
 {{/goodsDescription}}