Merge branch 'feature/new-product-detail' into release/5.3.1

@@ -5,8 +5,8 @@
     </div>
     </div>
 
 
     <div class="content">
     <div class="content">
-        商品一旦在 30 日内到货，我们将会第一时间<br/>
-        通知您，请及时关注哦！
+        商品一旦在 30 日内到货，我们将第一时间通知您，<br/>
+        请下载有货APP关注消息哦！
     </div>
     </div>
 
 
     <div class="content">
     <div class="content">
@@ -14,8 +14,13 @@
         <span>添加收藏夹</span>
         <span>添加收藏夹</span>
     </div>
     </div>
 
 
+    <div class="content">
+        <div class="qr-img"></div>
+    </div>
+
      <div class="row">
      <div class="row">
             <a class='ok' data-pid="{{pid}}" data-sku="{{sku}}">订阅</a>
             <a class='ok' data-pid="{{pid}}" data-sku="{{sku}}">订阅</a>
             <a class='cancel btn-close'>取消</a>
             <a class='cancel btn-close'>取消</a>
      </div>
      </div>
+
 </div>
 </div>

@@ -886,6 +886,8 @@ bindEvent.add(function() {
     $('#keep-shopping').click(function() {
     $('#keep-shopping').click(function() {
         $('#type-chose').slideDown(SLIDETIME);
         $('#type-chose').slideDown(SLIDETIME);
         $('#balance').slideUp(SLIDETIME);
         $('#balance').slideUp(SLIDETIME);
+
+        cartEvent.emit('selling');
     });
     });
 
 
     // 电子票立即购买
     // 电子票立即购买

@@ -1651,8 +1651,6 @@
                 &.active{
                 &.active{
                     margin-bottom: 0px;
                     margin-bottom: 0px;
                     color:#000;
                     color:#000;
-                    height: 27px;
-                    border-bottom: 1px solid #fff;
                     border-top: 2px solid #444;
                     border-top: 2px solid #444;
                     border-right: 1px solid #444;
                     border-right: 1px solid #444;
                     border-left: 1px solid #444;
                     border-left: 1px solid #444;
@@ -2385,7 +2383,7 @@
 
 
        .comment-tabs{
        .comment-tabs{
             padding-top: 12px;
             padding-top: 12px;
-            border-bottom: 1.5px solid #444;
+            border-bottom: 1px solid #444;
             height: 35px;
             height: 35px;
        }
        }
 
 
@@ -2670,6 +2668,14 @@
         font-size: 12px;
         font-size: 12px;
         line-height: 20px;
         line-height: 20px;
         margin-top: 20px;
         margin-top: 20px;
+
+        .qr-img{
+            display: inline-block;
+            width: 100px;
+            height: 100px;
+            background: resolve("layout/qr.png");
+            background-size: 100px;
+        }
     }
     }
 
 
     .checked {
     .checked {
@@ -2716,6 +2722,9 @@
             cursor: pointer;
             cursor: pointer;
         }
         }
     }
     }
+
+
+
 }
 }