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

@@ -100,8 +100,8 @@ $basicBtnC:#eb0313;
             margin-left: .5px;
             margin-left: .5px;
             font-size: pxToRem(23px);
             font-size: pxToRem(23px);
             text-align: center;
             text-align: center;
-            line-height: pxToRem(35px);
-            padding: 0 8px;
+            line-height: pxToRem(33px);
+            padding: 0 5px;
         }
         }
         .new-tag {
         .new-tag {
             background-color: #78dc7e;
             background-color: #78dc7e;
@@ -121,6 +121,7 @@ $basicBtnC:#eb0313;
         }
         }
         .limit-tag {
         .limit-tag {
             border: 1px solid #000;
             border: 1px solid #000;
+            background-color: #fff;
             color: #000;
             color: #000;
         }
         }
         .soonSoldOut-tag {
         .soonSoldOut-tag {
@@ -219,6 +220,7 @@ $basicBtnC:#eb0313;
     .periodOfMarket {
     .periodOfMarket {
         font-size: pxToRem(24px);
         font-size: pxToRem(24px);
         float: right;
         float: right;
+        color: #d0021b;
         h1 {
         h1 {
             display: inline-block;
             display: inline-block;
             line-height: pxToRem(88px);
             line-height: pxToRem(88px);

@@ -2,7 +2,7 @@
 <div class="good-detail-page yoho-page">
 <div class="good-detail-page yoho-page">
     <div class="banner-container">
     <div class="banner-container">
         <div class="tag-container">
         <div class="tag-container">
-            <!-- <p class="good-tag soonSoldOut-tag">即将售罄</p> -->
+            <!-- <p class="good-tag new-tag">NEW</p> -->
             {{# tags}}
             {{# tags}}
                 {{# is_new}}
                 {{# is_new}}
                     <p class="good-tag new-tag">NEW</p>
                     <p class="good-tag new-tag">NEW</p>
@@ -44,12 +44,12 @@
         </div>
         </div>
         {{/ goodsPrice}}
         {{/ goodsPrice}}
 
 
-        {{# periodOfMarket}}
+        {{#if periodOfMarket}}
         <div class="periodOfMarket">
         <div class="periodOfMarket">
             <h1>上市期：</h1>
             <h1>上市期：</h1>
-            <h1 >{{.}}</h1>
+            <h1 >{{peridOfMarket}}</h1>
         </div>
         </div>
-        {{/ periodOfMarket}}
+        {{/if}}
     </div>
     </div>
 
 
     {{# vipLevel}}
     {{# vipLevel}}
@@ -113,8 +113,8 @@
     </div> 
     </div> 
     {{/ enterStore}}
     {{/ enterStore}}
 
 
-    <div id="productDesc"></div>
-    <!-- {{> product/product-description}} -->
+    <!-- <div id="productDesc"></div> -->
+    {{> product/product-description}}
     {{> product/recommend-for-you}}
     {{> product/recommend-for-you}}
 
 
     {{#cartInfo}}
     {{#cartInfo}}