Authored by hf

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -1170,9 +1170,12 @@ @@ -1170,9 +1170,12 @@
1170 'detail' : { 1170 'detail' : {
1171 'list' : [ 1171 'list' : [
1172 { 1172 {
1173 - 'fieldName' : '头像',  
1174 - 'firstModel' : '', //头像图片url  
1175 - 'secondModel' =>'' 1173 + 'params':[
  1174 + {
  1175 + 'param' =>'头像'
  1176 + },
  1177 + ...
  1178 + ]
1176 }, 1179 },
1177 ... 1180 ...
1178 ] 1181 ]
@@ -5,13 +5,11 @@ @@ -5,13 +5,11 @@
5 */ 5 */
6 var $ = require('jquery'), 6 var $ = require('jquery'),
7 Swiper = require('yoho.iswiper'), 7 Swiper = require('yoho.iswiper'),
8 - lazyLoad = require('yoho.lazyload'),  
9 - Handlebars = require('yoho.handlebars'); 8 + lazyLoad = require('yoho.lazyload');
10 9
11 var goodsSwiper, 10 var goodsSwiper,
12 sizeSwiper, 11 sizeSwiper,
13 - refSwiper,  
14 - handleHelper; 12 + refSwiper;
15 13
16 require('./desc'); 14 require('./desc');
17 require('./comments-consults'); 15 require('./comments-consults');
@@ -38,27 +36,6 @@ goodsSwiper = new Swiper('.banner-swiper', { @@ -38,27 +36,6 @@ goodsSwiper = new Swiper('.banner-swiper', {
38 } 36 }
39 })(); 37 })();
40 38
41 -// $('#nav-tab li').on('click', function() {  
42 -// var index = $(this).index();  
43 -  
44 -// if ($(this).hasClass('comment-nav') && 0 === commentsNum) {  
45 -// alert('暂无商品评价');  
46 -// } else {  
47 -// if (!$(this).hasClass('focus')) {  
48 -  
49 -// $('#nav-tab li').each(function() {  
50 -// $(this).removeClass('focus');  
51 -// });  
52 -// $('#feedback-content .content').each(function() {  
53 -// $(this).addClass('hide');  
54 -// });  
55 -  
56 -// $(this).addClass('focus');  
57 -// $('#feedback-content .content:eq(' + index + ')').removeClass('hide');  
58 -// }  
59 -// }  
60 -// });  
61 -  
62 $('.goodsDiscount .dropdown').on('click', function() { 39 $('.goodsDiscount .dropdown').on('click', function() {
63 if ($('.goodsDiscount .discount-folder').is(':hidden')) { 40 if ($('.goodsDiscount .discount-folder').is(':hidden')) {
64 $('.goodsDiscount .first-item span').removeClass('icon-down'); 41 $('.goodsDiscount .first-item span').removeClass('icon-down');
@@ -82,13 +59,4 @@ refSwiper = new Swiper('#reference-swiper-container',{ @@ -82,13 +59,4 @@ refSwiper = new Swiper('#reference-swiper-container',{
82 }); 59 });
83 60
84 61
85 -handleHelper = Handlebars.registerHelper('addOne', function(index) {  
86 - return index + 1;  
87 -});  
88 -  
89 62
90 -//srcoll to load more  
91 -// $(window).scroll(function () {  
92 -// if ($(window).scrollTop() + winH >= $(document).height() - 50) {  
93 -// }  
94 -// });  
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <div class="vipLevel"> 35 <div class="vipLevel">
36 {{# list}} 36 {{# list}}
37 <span class="vip-img"> 37 <span class="vip-img">
38 - <div class="img" alt=""></div> 38 + <div class="img" alt="" style="background-size:cover;"></div>
39 </span> 39 </span>
40 <span class="vip-price">{{text}}</span> 40 <span class="vip-price">{{text}}</span>
41 {{/ list}} 41 {{/ list}}
@@ -74,14 +74,18 @@ @@ -74,14 +74,18 @@
74 {{#list}} 74 {{#list}}
75 {{#if @first}} 75 {{#if @first}}
76 <div class="swiper-slide first-group" > 76 <div class="swiper-slide first-group" >
77 - <img class="lazy avatar" data-original="{{firstModel}}" alt="">  
78 - <img class="lazy avatar" data-original="{{secondModel}}" alt=""> 77 + {{#params}}
  78 + {{#if @first}}
  79 + {{else}}
  80 + <img class="lazy avatar" data-original="{{param}}" />
  81 + {{/if}}
  82 + {{/params}}
79 </div> 83 </div>
80 {{^}} 84 {{^}}
81 <div class="swiper-slide" > 85 <div class="swiper-slide" >
82 - <div class="model-field cell">{{fieldName}}</div>  
83 - <div class="first-model cell">{{firstModel}}</div>  
84 - <div class="second-model cell">{{secondModel}}</div> 86 + {{#params}}
  87 + <div class=" cell">{{param}}</div>
  88 + {{/params}}
85 </div> 89 </div>
86 {{/if}} 90 {{/if}}
87 {{/list}} 91 {{/list}}