Merge branch 'feature/detailDate' into 'release/5.7.1'

Feature/detail date



See merge request !609

@@ -39,7 +39,6 @@
     {{/ goodsSubtitle}}
 
     <div class="price-date">
-
         <div class="goods-price data-bind">
             <h1 class="current-price"></h1>
             <h1 class="previous-price"></h1>
@@ -47,13 +46,13 @@
         <button class="limit-sale data-can-get-limit-code data-bind" id='limit-sale'>获取限购码</button>
         <button class="got-limit-sale data-code-empty data-bind">限购码已被抢光</button>
         <button class="got-limit-sale data-got-code data-bind">已获取限购码</button>
-        {{#if periodOfMarket}}
-        <div class="period-of-market">
-            <h1>上市期：</h1>
-            <h1 >{{periodOfMarket}}</h1>
-        </div>
-        {{/if}}
     </div>
+    {{#if periodOfMarket}}
+    <div class="period-of-market">
+        <h1>上市期：</h1>
+        <h1 >{{periodOfMarket}}</h1>
+    </div>
+    {{/if}}
 
     <div class="price-date data-bind">
         <div class="student-price">

@@ -52,14 +52,13 @@
 		<button class="limit-sale data-can-get-limit-code data-bind" id='limit-sale'>获取限购码</button>
         <button class="got-limit-sale data-code-empty data-bind">限购码已被抢光</button>
         <button class="got-limit-sale data-got-code data-bind">已获取限购码</button>
-
-        {{#if periodOfMarket}}
-        <div class="period-of-market">
-            <h1>上市期：</h1>
-            <h1 >{{periodOfMarket}}</h1>
-        </div>
-        {{/if}}
     </div>
+    {{#if periodOfMarket}}
+    <div class="period-of-market">
+        <h1>上市期：</h1>
+        <h1 >{{periodOfMarket}}</h1>
+    </div>
+    {{/if}}
 
     {{!--占位: 学生价／会员价--}}
 	<div id="placeholder-pricedata"></div>

@@ -568,9 +568,12 @@ $basicBtnC: #eb0313;
     }
 
     .period-of-market {
-        float: right;
-        color: #d0021b;
+        padding: 0 30px;
+        background-color: #fff;
+        line-height: 54px;
+        color: #b0b0b0;
         font-size: 24px;
+        border-bottom: 1px solid #e0e0e0;
 
         h1 {
             display: inline-block;