Merge branch 'release/5.6' of git.yoho.cn:fe/yohobuywap-node into release/5.6

@@ -30,8 +30,7 @@ const list = (req, res, next) => {
     if (brand) {
     if (brand) {
         arrs.push(model.getBrand({
         arrs.push(model.getBrand({
             brandId: brand,
             brandId: brand,
-            uid: req.user.uid || 0,
-            client_type: 'iphone' // todo
+            uid: req.user.uid || 0
         }));
         }));
     }
     }
 
 
@@ -75,8 +74,7 @@ const detail = (req, res, next) => {
     let skn = req.params[0];
     let skn = req.params[0];
     let params = {
     let params = {
         product_skn: skn,
         product_skn: skn,
-        uid: req.user.uid || 0,
-        client_type: 'iphone' // todo
+        uid: req.user.uid || 0
     };
     };
 
 
     model.detail(params).then((result) => {
     model.detail(params).then((result) => {
@@ -109,8 +107,7 @@ const gethtml = (req, res, next) => {
 
 
     let params = {
     let params = {
         product_skn: skn,
         product_skn: skn,
-        uid: req.user.uid || 0,
-        client_type: 'iphone' // todo
+        uid: req.user.uid || 0
     };
     };
 
 
     model.gethtml(params).then((html) => {
     model.gethtml(params).then((html) => {

@@ -15,7 +15,7 @@ exports.list = (param) => {
             filter: productProcess.processFilter(result.data.filter || []),
             filter: productProcess.processFilter(result.data.filter || []),
             list: result.data.product_list.map((data) => {
             list: result.data.product_list.map((data) => {
                 return {
                 return {
-                    product_url: `//m.yohobuy.com/product/global/${data.product_skn}.html`,
+                    product_url: data.is_global === 'Y' ? `//m.yohobuy.com/product/global/${data.product_skn}.html` : `//m.yohobuy.com/product/${data.product_skn}.html`, // eslint-disable-line
                     product_img: data.default_images,
                     product_img: data.default_images,
                     price: data.formart_final_price,
                     price: data.formart_final_price,
                     product_name: data.product_name,
                     product_name: data.product_name,

-require('product/global/detail.page.css');
+require('product/global/glodetail.page.css');
 
 
 const DetailController = require('./controller');
 const DetailController = require('./controller');
 
 

@@ -18,7 +18,7 @@ export class DetailView extends View {
         this.illustrateContents.hide().addClass('down-animate');
         this.illustrateContents.hide().addClass('down-animate');
 
 
         setTimeout(() => {
         setTimeout(() => {
-            new Swiper('.banner-swiper', {
+            let swiper = new Swiper('.banner-swiper', {
                 preloadImages: false,
                 preloadImages: false,
                 lazyLoading: true,
                 lazyLoading: true,
                 lazyLoadingInPrevNext: true,
                 lazyLoadingInPrevNext: true,
@@ -29,6 +29,14 @@ export class DetailView extends View {
                 prevButton: '.my-swiper-button-prev',
                 prevButton: '.my-swiper-button-prev',
                 spaceBetween: 3
                 spaceBetween: 3
             });
             });
+
+            $('.banner-swiper').click(function() {
+                $('.banner-top').toggleClass('hover');
+                swiper.onResize();
+            });
+            $('.banner-top-single').click(function() {
+                $('.banner-top-single').toggleClass('hover');
+            });
         }, 500);
         }, 500);
 
 
         let $cartBar = $('.cart-bar');
         let $cartBar = $('.cart-bar');