Merge remote-tracking branch 'origin/feature/featureTemplate' into gray

@@ -6,6 +6,9 @@ exports.index = function(req, res, next) {
         code: req.params.code,
         type: req.query.type
     }).then((result) => {
+        if (!result) {
+            return next();     
+        }
         res.render('feature', {
             module: 'activity',
             page: 'feature',

@@ -55,10 +55,9 @@ module.exports = {
                     cache: true
                 });
             }
-            if (data.code === 200) {
-                data = data.data;
-            }
-            if (data.floors) {
+            
+            data = data.data;
+            if (data && data.floors) {
                 data.floors.forEach(function(f) {
                     if (f.component && f.component[0] && f.component[0].type === 'productGroup' && f.component[0].defaultSkns) {
                         sknsArr.push(_getProductBySkns(f.component[0]));
@@ -69,6 +68,7 @@ module.exports = {
             if (sknsArr.length) {
                 yield Promise.all(sknsArr);
             }
+
             return data;
         })();
     }

@@ -71,7 +71,7 @@
 					
 					{{#isEqualOr type 'productGroup'}}
 						{{! 商品池}}
-						<div class="product-container item{{numOfOneRow}}" {{#if proBgImg}}style="background:url({{proBgImg}})repeat;"{{/if}}>
+						<div class="product-container item{{numOfOneRow}}" {{#if proBgImg}}style="background:url({{image2 proBgImg q=60}})repeat;"{{/if}}>
 							<div class="product-source" {{#unless defaultPros.length}} {{#if searchCondition }}cloneitem="{{searchCondition.limit}}"{{/if}}{{/unless}} condition='{{stringify searchCondition}}' fp="{{getAnalysis ../this @index}}">
 							<input class="imgwh" type="hidden" value="193x257">
 							{{#if defaultPros.length}}

@@ -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.3.3/yas.js', '_yas'));
+    }(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//cdn.yoho.cn/yas-jssdk/2.3.4/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.3.3', 'yohobuy_m', uid, '', '');
+            window._yas(1 * new Date(), '2.3.4', 'yohobuy_m', uid, '', '');
         }
 
         setTimeout(function() {