Merge branch 'gray' into 'master'

Gray



See merge request !98

@@ -78,7 +78,11 @@ const handleBrandList = origin => {
             brands.push({
             brands.push({
                 name: subValue.brand_name_en || subValue.brand_name_cn || subValue.brand_name,
                 name: subValue.brand_name_en || subValue.brand_name_cn || subValue.brand_name,
                 logo: subValue.brand_ico,
                 logo: subValue.brand_ico,
-                domain: subValue.brand_domain
+                domain: subValue.brand_domain,
+                shopId: subValue.shop_id,
+                shopName: subValue.brand_name_en || subValue.brand_name_cn || subValue.brand_name,
+                isRedShop: subValue.is_red_shop,
+                shopTemplateType: subValue.shop_template_type
             });
             });
         });
         });
         dest.brandList.push({
         dest.brandList.push({

@@ -20,10 +20,7 @@ exports.index = (req, res) => {
 
 
 /* 查询 产品列表 */
 /* 查询 产品列表 */
 exports.fetchProducts = (req, res, next) => {
 exports.fetchProducts = (req, res, next) => {
-    const params = req.query;
-
-    params.gender = '';
-    model.products(params)
+    model.products(req.query)
         .then(result => res.json(result))
         .then(result => res.json(result))
         .catch(next);
         .catch(next);
 };
 };

@@ -100,7 +100,6 @@ module.exports = {
         },
         },
         console: {
         console: {
             level: 'debug',
             level: 'debug',
-            colorize: 'all',
             prettyPrint: true,
             prettyPrint: true,
             debugStdout: true
             debugStdout: true
         }
         }

@@ -4,15 +4,11 @@
  * @author: Aiden Xu<aiden.xu@yoho.cn>
  * @author: Aiden Xu<aiden.xu@yoho.cn>
  * @date: 2016/4/27
  * @date: 2016/4/27
  */
  */
-const channelGender = require('./doraemon/middleware/channel-gender').channelGender;
 
 
 module.exports = app => {
 module.exports = app => {
     app.use('/', require('./apps/channel')); // 一级频道模块
     app.use('/', require('./apps/channel')); // 一级频道模块
     // 商品模块
     // 商品模块
-    app.use('/'
-        , channelGender
-        , require('./apps/product')
-    );
+    app.use('/', require('./apps/product'));
     app.use('/', require('./apps/me')); // 个人中心
     app.use('/', require('./apps/me')); // 个人中心
     app.use('/api', require('./apps/api')); // 各模块公有 API
     app.use('/api', require('./apps/api')); // 各模块公有 API
     app.use('/editorial', require('./apps/editorial')); // 资讯
     app.use('/editorial', require('./apps/editorial')); // 资讯

 {
 {
   "name": "yohoblk-wap",
   "name": "yohoblk-wap",
-  "version": "2.0.42",
+  "version": "2.0.45",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -114,11 +114,29 @@ const getChannel = function() {
     });
     });
 };
 };
 
 
+const miniVersion = function (miniVersion) {
+    let appVersion = cookie.get('app_version');
+    let miniVersions = miniVersion.split('.');
+
+    if (appVersion && typeof appVersion === 'string') {
+        let versions = appVersion.split('.');
+
+        if (versions.length === 3 &&
+            (+versions[0] > +miniVersions[0] ||
+            (+versions[0] === +miniVersions[0] && +versions[1] > +miniVersions[1]) ||
+            (+versions[0] === +miniVersions[0] && +versions[1] === +miniVersions[1] && +versions[2] >= +miniVersions[2]))) {
+            return true;
+        }
+    }
+    return false;
+};
+
 export default {
 export default {
     getImgHost,
     getImgHost,
     getImgUrl,
     getImgUrl,
     applySuccuss,
     applySuccuss,
     visibilitychange,
     visibilitychange,
     getChannel,
     getChannel,
-    replaceHttp
+    replaceHttp,
+    miniVersion
 };
 };

@@ -5,6 +5,7 @@
  * @Last Modified time: 2016-08-02 17:42:26
  * @Last Modified time: 2016-08-02 17:42:26
  */
  */
 import yoho from 'yoho';
 import yoho from 'yoho';
+import cookie from 'yoho-cookie';
 import util from 'common/util';
 import util from 'common/util';
 
 
 function ImgSrcBinding(el, binding) {
 function ImgSrcBinding(el, binding) {
@@ -42,32 +43,31 @@ function BrandHrefBinding(el, binding) {
 
 
             href += `?openby:yohobuy=${JSON.stringify(goParams)}`;
             href += `?openby:yohobuy=${JSON.stringify(goParams)}`;
             el.href = href;
             el.href = href;
-            return;
         }
         }
 
 
         if (yoho.isYohoBuy && !shopId) {
         if (yoho.isYohoBuy && !shopId) {
             yoho.ready(function () {
             yoho.ready(function () {
-                yoho.getAppVersion({}, (version) => {
-                    if (version >= '6.5.5') {
-                        let { name } = binding.value;
-                        let goParams = {
-                            action: 'go.searchlist',
-                            params: {
-                                keyword: name
-                            }
-                        };
-
-                        href += `?openby:yohobuy=${JSON.stringify(goParams)}`;
-                        el.href = href;
-                    } else {
-                        el.href = href;
-                    }
-                });
+                if (util.miniVersion('6.5.5')) {
+                    let { name } = binding.value;
+
+                    let goParams = {
+                        action: 'go.searchlist',
+                        params: {
+                            keyword: name
+                        }
+                    };
+
+                    href += `?openby:yohobuy=${JSON.stringify(goParams)}`;
+                    el.href = href;
+                } else {
+                    el.href = href;
+                }
             });
             });
-            return;
         }
         }
 
 
-        el.href = href;
+        if (!yoho.isYohoBuy) {
+            el.href = href;
+        }
     } else {
     } else {
         el.href = `/product/shop/${binding.value}`;
         el.href = `/product/shop/${binding.value}`;
     }
     }

@@ -347,7 +347,7 @@ export default {
         _.each(this.filter.group_sort, item => {
         _.each(this.filter.group_sort, item => {
             temp = temp.concat(item.sub);
             temp = temp.concat(item.sub);
         });
         });
-        this.filterItems[0].choices = [{id: 1, name: '男'}, {id: 2, name: '女'}];
+        this.filterItems[0].choices = [{id: '1,3', name: '男'}, {id: '2,3', name: '女'}];
         this.filterItems[1].choices = this.filter.brand || [];
         this.filterItems[1].choices = this.filter.brand || [];
         this.filterItems[2].choices = temp;
         this.filterItems[2].choices = temp;
         this.filterItems[3].choices = this.filter.color || [];
         this.filterItems[3].choices = this.filter.color || [];