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

@@ -149,7 +149,7 @@ function rePosFooter() {
     window._ozuid = uid;//暴露ozuid
 
     if (window._yas) {
-        window._yas(1 * new Date(), '1.0.13', 'yohobuy_m', uid, '');
+        window._yas(1 * new Date(), '1.0.13.1', 'yohobuy_m', uid, '');
     }
 }());
 

@@ -156,6 +156,7 @@
             width: pxToRem(400px);
             height: pxToRem(58px) * 2;
             padding: pxToRem(20px) 0;
+            resize: none;
         }
     }
 

@@ -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%;
             }
         }
     }
@@ -211,7 +208,7 @@ $basicBtnC:#eb0313;
             line-height: pxToRem(88px);
         }
         .currentPrice {
-            color: red;
+            color: #d0021b;
             margin-right: pxToRem(10px);
         }
         .previousPrice {
@@ -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) {
+            &:nth-child(1) {
                 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(3) {
                 text-align: left;
-                .vip-img{
+                .vip-img {
                     background: image-url('product/platinum.png') no-repeat;
                 }
             }

@@ -39,8 +39,8 @@
     <div class="price-date">
         {{# goodsPrice}}
         <div class="goodsPrice">
-            <h1 class="currentPrice">¥{{currentPrice}}</h1>
-            <h1 class="previousPrice">¥{{previousPrice}}</h1>
+            <h1 class="currentPrice">{{currentPrice}}</h1>
+            <h1 class="previousPrice">{{previousPrice}}</h1>
         </div>
         {{/ goodsPrice}}
 

@@ -28,7 +28,7 @@
         a.async=1;
         a.src=j;
         m.parentNode.insertBefore(a,m);
-    })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13/yas-debug.js','_yas');
+    })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13.1/yas.js','_yas');
 </script>
 {{> layout/use}}
 {{> layout/analysis}} 

@@ -15,7 +15,6 @@
         </div>
     </div>
 
-    <!-- 如果需要导航按钮 -->
     <div class="my-swiper-button-prev prev-grey"></div>
     <div class="my-swiper-button-next next-grey"></div>
 </div>
\ No newline at end of file

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