Merge branch 'feature/openapp' into release/5.7

@@ -58,6 +58,9 @@ exports.index = (req, res, next) => {
             break;
             break;
     }
     }
 
 
+    // 唤起 APP 的路径
+    res.locals.appPath = `yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.h5","params":{"url":"http://guang.m.yohobuy.com${req.path}","param":${JSON.stringify(req.query)}}}`;
+
     plusstarModel.getAllChannels({
     plusstarModel.getAllChannels({
         gender: gender,
         gender: gender,
         app_type: 0
         app_type: 0

@@ -45,6 +45,8 @@ const getListData = (req, res, next) => {
                 });
                 });
             });
             });
 
 
+            // 唤起 APP 的路径
+            res.locals.appPath = `yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.h5","type": 7,"params":{"url":"http://guang.m.yohobuy.com${req.path}","param":${JSON.stringify(req.query)}}}`;
 
 
             res.render('plustar/list', {
             res.render('plustar/list', {
                 module: 'guang',
                 module: 'guang',

@@ -207,9 +207,13 @@ const category = (req, res, next) => {
 
 
     /* 勿修改，唤起 APP 使用 */
     /* 勿修改，唤起 APP 使用 */
     let appParams = Object.assign({}, req.query, {
     let appParams = Object.assign({}, req.query, {
-        title: req.query.title || req.query.sort_name || ''
+        title: req.query.title || req.query.sort_name || '',
+        productPool: req.query.filter_poolId,
+        actiontype: req.query.actiontype || '1'
     });
     });
 
 
+    delete appParams.filter_poolId;
+
     let appPath = 'yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.list","params":' +
     let appPath = 'yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.list","params":' +
         JSON.stringify(appParams) +
         JSON.stringify(appParams) +
         '}';
         '}';

@@ -15,6 +15,15 @@ const _ = require('lodash');
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
 const qs = require('querystring');
 const qs = require('querystring');
 
 
+const channelToAppChannel = (channel) => {
+    return {
+        boys: '1',
+        girls: '2',
+        kids: '3',
+        lifestyle: '4'
+    }[channel] || '1';
+};
+
 // 新品到着(blk)
 // 新品到着(blk)
 const blkNewGoods = (req, res, next) => {
 const blkNewGoods = (req, res, next) => {
     let params = Object.assign({
     let params = Object.assign({
@@ -55,6 +64,14 @@ const blkNewGoods = (req, res, next) => {
 const newGoods = (req, res, next) => {
 const newGoods = (req, res, next) => {
     let channel = req.yoho.channel;
     let channel = req.yoho.channel;
 
 
+    let appParams = Object.assign({}, req.query, {
+        channel: channelToAppChannel(channel),
+        uid: undefined // eslint-disable-line
+    });
+
+    // 唤起 APP 的路径
+    res.locals.appPath = `yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.new","params":${JSON.stringify(appParams)}}`;
+
     newModel.getNewFocus(channel).then((result) => {
     newModel.getNewFocus(channel).then((result) => {
         res.render('new/new', {
         res.render('new/new', {
             module: 'product',
             module: 'product',
@@ -97,6 +114,14 @@ const _newGoods = (req, res, next) => {
     let channel = req.yoho.channel;
     let channel = req.yoho.channel;
     let uid = req.user.uid;
     let uid = req.user.uid;
 
 
+    let appParams = Object.assign({}, req.query, {
+        channel: channelToAppChannel(channel),
+        uid: undefined // eslint-disable-line
+    });
+
+    // 唤起 APP 的路径
+    res.locals.appPath = `yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.new","params":${JSON.stringify(appParams)}}`;
+
     newModel.indexData(uid, channel).then(result => {
     newModel.indexData(uid, channel).then(result => {
         let shopList = _.get(result, 'shop_list', []);
         let shopList = _.get(result, 'shop_list', []);
         let banner = _.get(result, 'ads[0]', {});
         let banner = _.get(result, 'ads[0]', {});

@@ -41,6 +41,9 @@ const index = (req, res, next) => {
             break;
             break;
     }
     }
 
 
+    // 唤起 APP 的路径
+    res.locals.appPath = 'yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.top100","params":{"page":"0"}}';
+
     newsaleModel.getHotRank(codeKey).then((result) => {
     newsaleModel.getHotRank(codeKey).then((result) => {
 
 
         res.render('newsale/hotrank', {
         res.render('newsale/hotrank', {

@@ -33,6 +33,9 @@ exports.index = (req, res, next) => {
     let yhChannel = req.query.yh_channel || yhChannelEmpty;
     let yhChannel = req.query.yh_channel || yhChannelEmpty;
     let contentcode = req.query.content_code;
     let contentcode = req.query.content_code;
 
 
+    // 唤起 APP 的路径
+    res.locals.appPath = `yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.newoutlet","params":${JSON.stringify(req.query)}}`;
+
     outletModel.getContent(categoryId, yhChannel, contentcode).then(result => {
     outletModel.getContent(categoryId, yhChannel, contentcode).then(result => {
         res.render('outlet', Object.assign({
         res.render('outlet', Object.assign({
             localCss: true,
             localCss: true,

@@ -12,6 +12,15 @@ const headerModel = require('../../../doraemon/models/header');
 const saleModel = require(`${mRoot}/sale`);
 const saleModel = require(`${mRoot}/sale`);
 const qs = require('querystring');
 const qs = require('querystring');
 
 
+const channelToAppChannel = (channel) => {
+    return {
+        boys: '1',
+        girls: '2',
+        kids: '3',
+        lifestyle: '4'
+    }[channel] || '1';
+};
+
 // const queryParam = {
 // const queryParam = {
 //     brand: '0',
 //     brand: '0',
 //     gender: '1,2,3',
 //     gender: '1,2,3',
@@ -71,6 +80,15 @@ let index = (req, res, next) => {
 
 
     params.channel = req.query.channel || params.channel;
     params.channel = req.query.channel || params.channel;
 
 
+    let appParams = Object.assign({}, req.query, {
+        channel: channelToAppChannel(params.channel),
+        uid: undefined // eslint-disable-line
+    });
+
+    // 唤起 APP 的路径
+    res.locals.appPath = `yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.sale","params":${JSON.stringify(appParams)}}`;
+
+
     saleModel.getSaleData(params.channel).then((result) => {
     saleModel.getSaleData(params.channel).then((result) => {
 
 
         // 扩展头部频道选择数据
         // 扩展头部频道选择数据
@@ -118,6 +136,10 @@ let indexRedirect = (req, res) => {
 let breakingYards = (req, res, next) => {
 let breakingYards = (req, res, next) => {
     let params = _processPublicData(req, '断码区', 'break-code');
     let params = _processPublicData(req, '断码区', 'break-code');
 
 
+    // 唤起 APP 的路径
+    res.locals.appPath = 'yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.shortsize"}';
+
+
     saleModel.getBreakCodeData({
     saleModel.getBreakCodeData({
         yhChannel: params.channel
         yhChannel: params.channel
     }).then((result) => {
     }).then((result) => {
@@ -159,6 +181,9 @@ let discountDetail = (req, res, next) => {
     saleModel.getDiscountDetailData(id, req.yoho.channel).then((result) => {
     saleModel.getDiscountDetailData(id, req.yoho.channel).then((result) => {
         params.renderData.pageHeader.navTitle = result.title;
         params.renderData.pageHeader.navTitle = result.title;
 
 
+        // 唤起 APP 的路径
+        res.locals.appPath = `yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.discountmarketpro","params":{"id":"${id}","cover_url":"${result.activity.cover_url.split('?')[0]}","title":"${result.title}"}}`;
+
         res.render('sale/discount-detail', Object.assign(params.renderData, result, {
         res.render('sale/discount-detail', Object.assign(params.renderData, result, {
             localCss: true
             localCss: true
         }));
         }));

@@ -34,6 +34,9 @@ const list = (req, res, next) => {
     params.isApp = req.yoho.isApp;
     params.isApp = req.yoho.isApp;
     params.physical_channel = req.yoho.channel && searchProcess.getChannelType(req.yoho.channel);
     params.physical_channel = req.yoho.channel && searchProcess.getChannelType(req.yoho.channel);
 
 
+    // 唤起 APP 的路径
+    res.locals.appPath = `yohobuy://yohobuy.com/goapp?openby:yohobuy={"action":"go.list","params":${JSON.stringify(params)}}`;
+
     return searchModel.searchKeyActivity(params.query || '').then(activityResult => {
     return searchModel.searchKeyActivity(params.query || '').then(activityResult => {
         let activity = _.get(activityResult, 'urlobj.appUrl', '');
         let activity = _.get(activityResult, 'urlobj.appUrl', '');