Merge branch 'gray' into 'master'

Gray



See merge request !1397

@@ -13,7 +13,8 @@ exports.category = (req, res, next) => {
         channel: req.query.channel,
         channel: req.query.channel,
         season: req.query.season,
         season: req.query.season,
         isApp: req.yoho.isApp,
         isApp: req.yoho.isApp,
-        scene: req.query.scene || 1
+        scene: req.query.scene || 1,
+        imageType: req.query.imageType || 2
     };
     };
     let renders = {};
     let renders = {};
 
 
@@ -49,7 +50,8 @@ exports.shop = (req, res, next) => {
         channel: req.query.channel,
         channel: req.query.channel,
         season: req.query.season,
         season: req.query.season,
         isApp: req.yoho.isApp,
         isApp: req.yoho.isApp,
-        scene: req.query.scene || 1
+        scene: req.query.scene || 1,
+        imageType: req.query.imageType || 2
     };
     };
     let renders = {};
     let renders = {};
 
 

@@ -34,6 +34,7 @@ router.get('/index/new/pay', authMW, payController.pay);// 统一支付 URL，æ”
 router.get('/index/new/pay/alipayresult', authMW, payController.payAli);// 支付宝付款支付成功
 router.get('/index/new/pay/alipayresult', authMW, payController.payAli);// 支付宝付款支付成功
 
 
 router.get('/index/new/orderEnsure', authMW, disableBFCache, order.orderEnsure); // 订单结算
 router.get('/index/new/orderEnsure', authMW, disableBFCache, order.orderEnsure); // 订单结算
+router.get('/index/new/orderEnsureAjax', authMW, disableBFCache, order.orderEnsure); // 订单结算ajax
 router.post('/index/new/orderCompute', authMW, order.orderCompute); // 结算页参数改变，重新运算
 router.post('/index/new/orderCompute', authMW, order.orderCompute); // 结算页参数改变，重新运算
 router.post('/index/new/orderSub', authMW, order.orderSub); // 订单提交
 router.post('/index/new/orderSub', authMW, order.orderSub); // 订单提交
 
 

@@ -334,6 +334,9 @@ class IndexModel extends global.yoho.BaseModel {
                 id: id,
                 id: id,
                 uid: uid,
                 uid: uid,
                 udid: udid
                 udid: udid
+            },
+            param: {
+                cache: true
             }
             }
         });
         });
     }
     }

 {
 {
   "name": "yohobuywap-node",
   "name": "yohobuywap-node",
-  "version": "6.6.3",
+  "version": "6.6.5",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -168,7 +168,7 @@ let cartObj = {
 
 
         $.ajax({
         $.ajax({
             type: 'get',
             type: 'get',
-            url: '/cart/index/new/orderEnsure',
+            url: '/cart/index/new/orderEnsureAjax',
             timeout: 10000, // 10s overtime
             timeout: 10000, // 10s overtime
             data: {
             data: {
                 cartType: cartType
                 cartType: cartType

@@ -202,7 +202,7 @@ setTimeout(() => {
                         }
                         }
                     }
                     }
 
 
-                    $('#addtoCart, #ticketsToCart').on('touchstart', function() {
+                    $('#addtoCart, #ticketsToCart').on('click', function() {
                         let productCode = $('#limitProductCode').val();
                         let productCode = $('#limitProductCode').val();
                         let seckill = $('.seckill-time').length;
                         let seckill = $('.seckill-time').length;
 
 

@@ -143,6 +143,7 @@
                 font-size: 13px;
                 font-size: 13px;
                 color: #ccc;
                 color: #ccc;
                 font-weight: normal;
                 font-weight: normal;
+                text-decoration: line-through;
             }
             }
 
 
             .cart-icon {
             .cart-icon {
@@ -286,6 +287,6 @@
 
 
     .tide-border-top {
     .tide-border-top {
         margin: 35px 30px 10px 40px;
         margin: 35px 30px 10px 40px;
-        border-top: 2px solid #b0b0b0;
+        border-top: 10px solid #b0b0b0;
     }
     }
 }
 }