Merge branch 'feature/wsl5.3' of git.yoho.cn:fe/yoho-blk into feature/wsl5.3

@@ -52,6 +52,8 @@ const online = (req, res, next) => {
         } else {
             res.display('pay-success', {
                 defaultHeader: false,
+                module: 'shopping',
+                page: 'pay-over',
                 content: {
                     cost: order.paymentAmount,
                     orderNum: order.orderCode,
@@ -123,6 +125,8 @@ const callback = (req, res) => {
 
             res.display('pay-success', {
                 defaultHeader: false,
+                module: 'shopping',
+                page: 'pay-over',
                 content: {
                     cost: order.paymentAmount,
                     orderNum: order.orderCode,

@@ -42,5 +42,8 @@
                 </p>
             </div>
         {{/ content}}
+
+        <!--最近浏览-->
+        <div class="recommend-product"></div>
     </div>
 </div>

@@ -5,4 +5,7 @@
     <a href="/" class="go-to-shop">
         <span class="btn white">去购物</span>
     </a>
-</div>
\ No newline at end of file
+</div>
+
+<!--最近浏览-->
+<div class="recommend-product"></div>
\ No newline at end of file

@@ -31,3 +31,6 @@
         <span class="btn {{#unless selectedNum}}disable{{/unless}}" id="checkout_btn">去结算</span>
     </div>
 </div>
+
+<!--最近浏览-->
+<div class="recommend-product"></div>

@@ -7,6 +7,7 @@
 var $ = require('yoho-jquery');
 var Cart = require('./cart/cart');
 var Stepper = require('./cart/stepper');
+var recProduct = require('../product/item/recommend-product');
 
 require('../common/return-top');
 
@@ -142,4 +143,9 @@ $(function() {
 
     // 变动商品数量
     Stepper.init();
+
+    // 为您优选、最近浏览
+    recProduct.init({
+        dom: '.recommend-product'
+    });
 });

+var recProduct = require('../product/item/recommend-product');
+
+// 为您优选、最近浏览
+recProduct.init({
+    dom: '.recommend-product'
+});

@@ -4,7 +4,7 @@
     }
 
     .cart-header {
-        margin: 12px auto 48px;
+        margin: 12px auto 0;
         width: 100%;
         padding: 30px;
         border-bottom: 1px solid #eee;
@@ -18,6 +18,7 @@
             span {
                 font-weight: normal;
             }
+
             .not-checked {
                 color: #999;
             }

@@ -29,6 +29,8 @@ $hoverColor: #379ed6;
     }
 
     .cart-pro-list {
+        margin-top: 48px;
+
         .title {
             border-bottom: 1px solid #eee;
             font-size: 16px;