Authored by weiqingting

Merge branch 'release/4.9.1.0'

... ... @@ -129,7 +129,7 @@
<div class="price">
<span class="sale-price">¥{{round student_price}} <i class='s-biaoqian'></i></span>
<p class="s-price-block">
<span class="market-price">¥{{round market_price}}</span>
<span class="market-price">¥{{round sales_price}}</span>
</p>
</div>
</div>
... ...
... ... @@ -55,7 +55,7 @@
<div class="price">
<span class="sale-price">¥{{round student_price}} <i class='s-biaoqian'></i></span>
<p class="s-price-block">
<span class="market-price">¥{{round market_price}}</span>
<span class="market-price">¥{{round sales_price}}</span>
</p>
</div>
</div>
... ...
... ... @@ -476,9 +476,9 @@ AsideSlider.prototype._bindAsideSlider = function($initialator, $slider) {
if (typeof isShow === 'string') {
isShow = isShow === 'true' ? true : false;
}
$('input').blur();
if (isShow) {
this.isFirst=true;
$('input').blur();
this.asideSlideIn($slider);
} else {
tip.show('请先选择省份');
... ...