Merge branch 'hotfix/coin' into 'release/6.3'
coin tip See merge request !1171
Showing
2 changed files
with
5 additions
and
7 deletions
@@ -17,8 +17,7 @@ class IconMall extends Page { | @@ -17,8 +17,7 @@ class IconMall extends Page { | ||
17 | $yohonowTab: $('#yohonow-tab'), | 17 | $yohonowTab: $('#yohonow-tab'), |
18 | $marsTab: $('#mars-tab'), | 18 | $marsTab: $('#mars-tab'), |
19 | $detail: $('.detail'), | 19 | $detail: $('.detail'), |
20 | - $tipApp: $('.tip-app'), | ||
21 | - $closeTip: $('.close-tip') | 20 | + $tipApp: $('.tip-app') |
22 | }; | 21 | }; |
23 | 22 | ||
24 | this.view = { | 23 | this.view = { |
@@ -140,7 +139,7 @@ class IconMall extends Page { | @@ -140,7 +139,7 @@ class IconMall extends Page { | ||
140 | // this.selector.$detail.on('click', this.openDetail.bind(this)); | 139 | // this.selector.$detail.on('click', this.openDetail.bind(this)); |
141 | $(window).on('scroll touchmove touchstart touchend', this.move.bind(this)); | 140 | $(window).on('scroll touchmove touchstart touchend', this.move.bind(this)); |
142 | $(document).on('click', '.go-btn', this.goConversion.bind(this)); | 141 | $(document).on('click', '.go-btn', this.goConversion.bind(this)); |
143 | - this.selector.$closeTip.on('click', this.closeTip.bind(this)); | 142 | + this.selector.$tipApp.on('click', this.closeTip.bind(this)); |
144 | this.selector.$tipApp.on('mousewheel touchmove', this.banSliding(this)); | 143 | this.selector.$tipApp.on('mousewheel touchmove', this.banSliding(this)); |
145 | } | 144 | } |
146 | 145 | ||
@@ -235,10 +234,10 @@ class IconMall extends Page { | @@ -235,10 +234,10 @@ class IconMall extends Page { | ||
235 | closeTip(e) { | 234 | closeTip(e) { |
236 | let $this = $(e.currentTarget); | 235 | let $this = $(e.currentTarget); |
237 | 236 | ||
238 | - if ($this.parent().hasClass('now-tip')) { | ||
239 | - $this.parent().removeClass('now-tip').addClass('hide'); | 237 | + if ($this.hasClass('now-tip')) { |
238 | + $this.removeClass('now-tip').addClass('hide'); | ||
240 | } else { | 239 | } else { |
241 | - $this.parent().removeClass('mars-tip').addClass('hide'); | 240 | + $this.removeClass('mars-tip').addClass('hide'); |
242 | } | 241 | } |
243 | } | 242 | } |
244 | 243 |
-
Please register or login to post a comment