Merge remote-tracking branch 'origin/hotfix/plusstar' into grey

@@ -104,9 +104,10 @@ const getResources = (params, options) => {
                     }
                     }
 
 
                     list = {
                     list = {
+                        id: res.template_id,
                         title: res.data.title,
                         title: res.data.title,
-                        more_url: res.data.more_url,
-                        more_name: res.data.more_name,
+                        moreUrl: res.data.more_url,
+                        moreName: res.data.more_name,
                         image: res.data.image
                         image: res.data.image
                     };
                     };
 
 
@@ -115,8 +116,8 @@ const getResources = (params, options) => {
                 case 'titleFloor':
                 case 'titleFloor':
                     list = {
                     list = {
                         name: res.data.title.name,
                         name: res.data.title.name,
-                        more_url: res.data.title.more_url,
-                        more_name: res.data.title.more_name
+                        moreUrl: res.data.title.more_url,
+                        moreName: res.data.title.more_name
                     };
                     };
 
 
                     if (res.data.title.name === '热门商品') {
                     if (res.data.title.name === '热门商品') {

@@ -45,7 +45,7 @@
 	    <div class="focus-left-right">
 	    <div class="focus-left-right">
 	        {{#each result.focus2.data}}
 	        {{#each result.focus2.data}}
 			    <a href="{{url}}" title="{{title}}">
 			    <a href="{{url}}" title="{{title}}">
-			        <img class="lazy" data-original="{{image src 250 250}}">
+			        <img src="{{image src 250 250}}">
 			    </a>
 			    </a>
 	    	{{/each}}
 	    	{{/each}}
 		</div>
 		</div>

 var $ = require('yoho-jquery'),
 var $ = require('yoho-jquery'),
     tip = require('../plugin/tip'),
     tip = require('../plugin/tip'),
     Swiper = require('yoho-swiper'),
     Swiper = require('yoho-swiper'),
-    loading = require('../plugin/loading'),
-    lazyLoad = require('yoho-jquery-lazyload');
+    loading = require('../plugin/loading');
 
 
 var plusstar = {},
 var plusstar = {},
     $footer = $('#yoho-footer');
     $footer = $('#yoho-footer');
 
 
+require('yoho-jquery-lazyload');
 require('../common');
 require('../common');
 
 
 plusstar = {
 plusstar = {
@@ -82,16 +82,8 @@ plusstar = {
                 that.resInit();
                 that.resInit();
 
 
                 loading.hideLoadingMask();
                 loading.hideLoadingMask();
-                lazyLoad($('img.lazy'));
-
-                // 处理左右滑动，未加载的图片
-                setTimeout(function() {
-                    $('img.lazy').each(function() {
-                        if ($(this).attr('src') !== $(this).data('original')) {
-                            $(this).attr('src', $(this).data('original'));
-                        }
-                    });
-                }, 40);
+
+                $('.plusstar-resources').find('img.lazy').lazyload();
 
 
                 // 设置滚动条的位置
                 // 设置滚动条的位置
                 if (window.localStorage) {
                 if (window.localStorage) {

@@ -163,13 +163,11 @@
             a {
             a {
                 display: inline-block;
                 display: inline-block;
                 margin: 0 15px;
                 margin: 0 15px;
-                width: 213px;
-                height: 213px;
             }
             }
 
 
             img {
             img {
-                width: 100%;
-                height: 100%;
+                width: 213px;
+                height: 213px;
             }
             }
         }
         }
 
 
@@ -180,7 +178,11 @@
             a {
             a {
                 display: inline-block;
                 display: inline-block;
                 width: 50%;
                 width: 50%;
-                overflow: hidden;
+
+                img {
+                    width: 320px;
+                    height: 320px;
+                }
             }
             }
         }
         }