Authored by yyq

Merge branch 'feature/rangeRejust' into release/4.6

@@ -53,9 +53,9 @@ setTimeout(function() { @@ -53,9 +53,9 @@ setTimeout(function() {
53 info.initInfosEvt($infosContainer); 53 info.initInfosEvt($infosContainer);
54 54
55 //文字介绍收起与展开 55 //文字介绍收起与展开
56 -moreHammer = new Hammer(document.getElementById('more-intro')); 56 +moreHammer = new Hammer(document.getElementById('more-intro-click-range'));
57 moreHammer.on('tap', function(e) { 57 moreHammer.on('tap', function(e) {
58 - var $this = $(e.target).closest('#more-intro'); 58 + var $this = $(e.target).closest('#more-intro-click-range');
59 59
60 $this.toggleClass('spread'); 60 $this.toggleClass('spread');
61 61
@@ -189,6 +189,11 @@ @@ -189,6 +189,11 @@
189 border-top: none; 189 border-top: none;
190 line-height: 40px; 190 line-height: 40px;
191 height: auto; 191 height: auto;
  192 +
  193 + a {
  194 + width: 100%;
  195 + text-align: right;
  196 + }
192 } 197 }
193 198
194 .mg-text { 199 .mg-text {
@@ -11,15 +11,17 @@ @@ -11,15 +11,17 @@
11  11 
12 </a> 12 </a>
13 </p> 13 </p>
14 - <p id="intro" class="intro">  
15 - {{intro}}  
16 - </p>  
17 - {{#if intro}}  
18 - <span id="more-intro" class="more-intro">  
19 - <span id="intro-more-txt">more</span>  
20 - <i class="icon iconfont">&#xe609;</i>  
21 - </span>  
22 - {{/if}} 14 + <div id="more-intro-click-range" class="clearfix">
  15 + <p id="intro" class="intro">
  16 + {{intro}}
  17 + </p>
  18 + {{#if intro}}
  19 + <span id="more-intro" class="more-intro">
  20 + <span id="intro-more-txt">more</span>
  21 + <i class="icon iconfont">&#xe609;</i>
  22 + </span>
  23 + {{/if}}
  24 + </div>
23 </div> 25 </div>
24 </div> 26 </div>
25 {{# newArrival}} 27 {{# newArrival}}