Merge branch 'master' into release/5.6

@@ -217,6 +217,7 @@ const category = (req, res, next) => {
         order: '0',
         page: 1,
         limit: 12,
+        isApp: params.app_version
     }, params);
 
     if (uid) {

@@ -11,13 +11,6 @@ const isProduction = process.env.NODE_ENV === 'production';
 const isTest = process.env.NODE_ENV === 'test';
 
 const domains = {
-    // liveApi: 'http://testapi.live.yohops.com:9999/',
-    // singleApi: 'http://api-test3.yohops.com:9999/',
-    // api: 'http://api-test3.yohops.com:9999/',
-    // service: 'http://service-test3.yohops.com:9999/',
-    // liveApi: 'http://api.live.yoho.cn/',
-    // singleApi: 'http://single.yoho.cn/',
-
     api: 'http://dev-api.yohops.com:9999/',
     service: 'http://dev-service.yohops.com:9999/',
 
@@ -30,7 +23,7 @@ const domains = {
 
 module.exports = {
     app: 'h5',
-    appVersion: '5.5.1', // 调用api的版本
+    appVersion: '5.5.2', // 调用api的版本
     port: 6001,
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//127.0.0.1:5001',

@@ -50,7 +50,7 @@
     "xml2js": "^0.4.17",
     "yoho-express-session": "^2.0.0",
     "yoho-md5": "^2.0.0",
-    "yoho-node-lib": "=0.2.14",
+    "yoho-node-lib": "=0.2.16",
     "yoho-zookeeper": "^1.0.8"
   },
   "devDependencies": {

@@ -102,6 +102,11 @@ exports.processProductList = (list, options) => {
             return;
         }
 
+        // H5 暂时不支持全球购商品，先过滤掉 2017.04.09
+        if (product.is_global === 'Y') {
+            return;
+        }
+
         // 商品信息有问题，则不显示
         if (!(
             (product.product_id && _.get(product, 'goods_list.length', 0)) || product.recommend_type