Authored by 王水玲

Merge branch 'hotfix/installmentBank' into release/5.0.0

@@ -13,18 +13,6 @@ require('../common'); @@ -13,18 +13,6 @@ require('../common');
13 lazyLoad($('img.lazy')); 13 lazyLoad($('img.lazy'));
14 ellipsis.init(); 14 ellipsis.init();
15 15
16 -// 标题限制行数  
17 -function setDetailText() {  
18 - var $this, $title;  
19 -  
20 - $('.good-detail-text .name').each(function() {  
21 - $this = $(this);  
22 - $title = $this.find('a');  
23 -  
24 - $title[0].mlellipsis(2);  
25 - });  
26 -}  
27 -  
28 // 商品列表翻页加载数据 16 // 商品列表翻页加载数据
29 new ListData({ 17 new ListData({
30 url: '/home/installment/get-goods', 18 url: '/home/installment/get-goods',
@@ -33,12 +21,15 @@ new ListData({ @@ -33,12 +21,15 @@ new ListData({
33 uuid: uuidVal 21 uuid: uuidVal
34 }); 22 });
35 23
36 -function setDefaultHeight() {  
37 - var $detailImg = $('.good-detail-img'); 24 +// 标题限制行数
  25 +function setDetailText() {
  26 + var $this, $title;
  27 +
  28 + $('.good-detail-text .name').each(function() {
  29 + $this = $(this);
  30 + $title = $this.find('a');
38 31
39 - $detailImg.css({  
40 - height: $detailImg.find('img').height() - 1,  
41 - background: '#c3c3c3' 32 + $title[0].mlellipsis(2);
42 }); 33 });
43 } 34 }
44 35
@@ -55,10 +46,6 @@ $('.detail-tab span').on('click', function() { @@ -55,10 +46,6 @@ $('.detail-tab span').on('click', function() {
55 setDetailText(); 46 setDetailText();
56 labId = 2; 47 labId = 2;
57 lazyLoad($('img.lazy')); 48 lazyLoad($('img.lazy'));
58 -  
59 - setTimeout(function() {  
60 - setDefaultHeight();  
61 - }, 2000);  
62 } 49 }
63 50
64 // 统计:开通成功后首页头部tab切换 51 // 统计:开通成功后首页头部tab切换
@@ -116,11 +103,6 @@ setTimeout(function() { @@ -116,11 +103,6 @@ setTimeout(function() {
116 } 103 }
117 }, 3000); 104 }, 3000);
118 105
119 -setTimeout(function() {  
120 - setDefaultHeight();  
121 -}, 2500);  
122 -  
123 -  
124 window.setCookie('installmentUid', window.queryString.uid); 106 window.setCookie('installmentUid', window.queryString.uid);
125 window.setCookie('yhChannel', window.queryString.yh_channel); 107 window.setCookie('yhChannel', window.queryString.yh_channel);
126 window.setCookie('udid', window.queryString.udid); 108 window.setCookie('udid', window.queryString.udid);
@@ -103,13 +103,9 @@ @@ -103,13 +103,9 @@
103 height: auto; 103 height: auto;
104 } 104 }
105 105
106 - .good-thumb {  
107 - width: 100%;  
108 - height: 100%;  
109 - }  
110 -  
111 .good-detail-img { 106 .good-detail-img {
112 height: auto; 107 height: auto;
  108 + background: #c3c3c3;
113 109
114 img { 110 img {
115 height: 100%; 111 height: 100%;
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 82
83 .title-box { 83 .title-box {
84 margin-left: 22px; 84 margin-left: 22px;
85 - width: 240px; 85 + width: 210px;
86 86
87 .product-name { 87 .product-name {
88 overflow: hidden; 88 overflow: hidden;