Merge branch 'feature/individuation' into 'gray'

'个性化调整'



See merge request !1395

@@ -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 = {};
 
 

@@ -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;
     }
     }
 }
 }