Merge branch 'feature/mars' of git.yoho.cn:fe/yohobuywap-node into feature/mars

@@ -12,7 +12,7 @@
         a.async = 1;
         a.src = j;
         m.parentNode.insertBefore(a, m);
-    }(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//cdn.yoho.cn/yas-jssdk/2.4.1/yas.js', '_yas'));
+    }(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//cdn.yoho.cn/yas-jssdk/2.4.2/yas.js', '_yas'));
 
     var _hmt = _hmt || [];
 
@@ -56,7 +56,7 @@
         uid = uid === 0 ? '' : uid;
         window._ozuid = uid; // 暴露ozuid
         if (window._yas) {
-            window._yas(1 * new Date(), '2.4.1', 'yohobuy_m', uid, '', '');
+            window._yas(1 * new Date(), '2.4.2', 'yohobuy_m', uid, '', '');
         }
 
         setTimeout(function() {

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Date: 2017-03-23 11:02:31
  * @Last Modified by: Targaryen
- * @Last Modified time: 2017-05-26 16:42:29
+ * @Last Modified time: 2017-07-18 14:29:33
  */
 /* 红人店铺数据处理 */
 
@@ -152,13 +152,18 @@ const _tools = {
      * @param {*} moduleData
      */
     tripleImage(moduleData) {
-        let displayType = _.get(moduleData, 'properties.displayType', 0);
+        let displayType = parseInt(_.get(moduleData, 'properties.displayType', 0), 10);
+
+        // 没有展示方式，不展示此模块，处理接口返回数据异常的情况
+        if (!displayType) {
+            return {};
+        }
 
         return {
             module_type: 'TripleImage',
             pics: _picsHandle(moduleData),
             isModuleMargin: _.get(moduleData, 'properties.isModuleMargin', 0),
-            displayType: parseInt(displayType, 10),
+            displayType: displayType,
         };
     },