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

@@ -9,8 +9,12 @@
 const onlineModel = require('../models/onlineService');
 const onlineModel = require('../models/onlineService');
 const headerModel = require('../../../doraemon/models/header'); // 头部model
 const headerModel = require('../../../doraemon/models/header'); // 头部model
 const _ = require('lodash');
 const _ = require('lodash');
+const helpers = global.yoho.helpers;
 
 
 const getOnlineServiceInfo = (req, res, next) => {
 const getOnlineServiceInfo = (req, res, next) => {
+    let serviceUrl = _.get(req.app.locals.wap, 'clientService.new', false) ?
+        helpers.urlFormat('/service/im') :
+        'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=';
 
 
     onlineModel.getOnlineServiceInfo().then((result) => {
     onlineModel.getOnlineServiceInfo().then((result) => {
 
 
@@ -25,7 +29,7 @@ const getOnlineServiceInfo = (req, res, next) => {
             title: '在线客服',
             title: '在线客服',
             pageFooter: true,
             pageFooter: true,
             service: result,
             service: result,
-            serviceUrl: 'http://chat80.live800.com/live800/chatClient/chatbox.jsp?companyID=493979&configID=123576&jid=9277320930'
+            serviceUrl: serviceUrl
         });
         });
     }).catch(next);
     }).catch(next);
 };
 };

@@ -6,15 +6,20 @@
 
 
 'use strict';
 'use strict';
 
 
+const helpers = global.yoho.helpers;
+const _ = require('lodash');
 const headerModel = require('../../../doraemon/models/header'); // 头部model
 const headerModel = require('../../../doraemon/models/header'); // 头部model
 const orderDetailModel = require('../models/orderDetail');
 const orderDetailModel = require('../models/orderDetail');
 
 
 const orderDetailData = (req, res, next) => {
 const orderDetailData = (req, res, next) => {
     let uid = req.user.uid;
     let uid = req.user.uid;
     let orderCode = req.query.order_code;
     let orderCode = req.query.order_code;
+    let serviceUrl = _.get(req.app.locals.wap, 'clientService.new', false) ?
+        helpers.urlFormat('/service/im') :
+        'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=';
 
 
     orderDetailModel.orderDetailData(uid, orderCode).then(result => {
     orderDetailModel.orderDetailData(uid, orderCode).then(result => {
-        result.serviceUrl = 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=';
+        result.serviceUrl = serviceUrl;
         res.render('orderDetail', {
         res.render('orderDetail', {
             module: 'home',
             module: 'home',
             page: 'order-detail',
             page: 'order-detail',

@@ -32,6 +32,9 @@ const bind = {
 
 
         let openId = req.query.openId;
         let openId = req.query.openId;
         let sourceType = req.query.sourceType;
         let sourceType = req.query.sourceType;
+        let serviceUrl = _.get(req.app.locals.wap, 'clientService.new', false) ?
+            helpers.urlFormat('/service/im') :
+            'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=';
 
 
         res.render('bind/index', {
         res.render('bind/index', {
             bindIndex: true, // js标识
             bindIndex: true, // js标识
@@ -44,7 +47,7 @@ const bind = {
             openId: openId, // openId
             openId: openId, // openId
             areaCode: '+86', // 默认区号
             areaCode: '+86', // 默认区号
             countrys: RegService.getAreaData(), // 国别码
             countrys: RegService.getAreaData(), // 国别码
-            serviceUrl: 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=', // 在线客服
+            serviceUrl: serviceUrl, // 在线客服
             module: 'passport',
             module: 'passport',
             page: 'bind',
             page: 'bind',
             title: '绑定手机号'
             title: '绑定手机号'

@@ -182,6 +182,10 @@ let codeAction = (req, res, next) => {
         });
         });
     }
     }
 
 
+    let serviceUrl = _.get(req.app.locals.wap, 'clientService.new', false) ?
+        helpers.urlFormat('/service/im') :
+        'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=';
+
     res.render('reg/code', {
     res.render('reg/code', {
         page: 'code',
         page: 'code',
         title: '注册-验证码',
         title: '注册-验证码',
@@ -191,7 +195,7 @@ let codeAction = (req, res, next) => {
         areaCode: area, // 默认的区号
         areaCode: area, // 默认的区号
         phoneNum: mobile, // 手机号
         phoneNum: mobile, // 手机号
         token: token, // 访问令牌
         token: token, // 访问令牌
-        serviceUrl: 'http://chat8.live800.com/live800/chatClient/chatbox.jsp?companyID=620092&configID=149091&jid=8732423409&info=' // 在线客服
+        serviceUrl: serviceUrl // 在线客服
     });
     });
 };
 };
 
 

@@ -45,14 +45,14 @@ const shop = {
 
 
             params.brand = brandId;
             params.brand = brandId;
 
 
-            let searchParam = {
+            let searchParam = Object.assign({
                 isApp: req.yoho.isApp,
                 isApp: req.yoho.isApp,
                 brand: brandId,
                 brand: brandId,
                 type: 'newest',
                 type: 'newest',
                 order: '1',
                 order: '1',
                 page: 1,
                 page: 1,
-                limit: 4
-            };
+                limit: 4,
+            }, params);
 
 
             if (req.query.from !== 'search' && brandLogo.type === '2' && brandLogo.shopId) {
             if (req.query.from !== 'search' && brandLogo.type === '2' && brandLogo.shopId) {
                 req.query.shop_id = brandLogo.shopId;
                 req.query.shop_id = brandLogo.shopId;