Authored by 郭成尧

Merge branch 'hotfix/coin' into 'release/6.3'

coin tip



See merge request !1171
... ... @@ -23,6 +23,5 @@
<div class="tab-item-c hide" id="mars-tab"></div>
</div>
<div class="tip-app hide">
<span class="close-tip"></span>
</div>
</div>
\ No newline at end of file
... ...
... ... @@ -17,8 +17,7 @@ class IconMall extends Page {
$yohonowTab: $('#yohonow-tab'),
$marsTab: $('#mars-tab'),
$detail: $('.detail'),
$tipApp: $('.tip-app'),
$closeTip: $('.close-tip')
$tipApp: $('.tip-app')
};
this.view = {
... ... @@ -140,7 +139,7 @@ class IconMall extends Page {
// this.selector.$detail.on('click', this.openDetail.bind(this));
$(window).on('scroll touchmove touchstart touchend', this.move.bind(this));
$(document).on('click', '.go-btn', this.goConversion.bind(this));
this.selector.$closeTip.on('click', this.closeTip.bind(this));
this.selector.$tipApp.on('click', this.closeTip.bind(this));
this.selector.$tipApp.on('mousewheel touchmove', this.banSliding(this));
}
... ... @@ -235,10 +234,10 @@ class IconMall extends Page {
closeTip(e) {
let $this = $(e.currentTarget);
if ($this.parent().hasClass('now-tip')) {
$this.parent().removeClass('now-tip').addClass('hide');
if ($this.hasClass('now-tip')) {
$this.removeClass('now-tip').addClass('hide');
} else {
$this.parent().removeClass('mars-tip').addClass('hide');
$this.removeClass('mars-tip').addClass('hide');
}
}
... ...