Authored by yyq

Merge branch 'feature/giftCart' into release/6.1

... ... @@ -1036,11 +1036,11 @@ $('#order-submit').click(function() {
this.timer && clearInterval(this.timer);
this.$sendBtn.text('重新获取(' + (this.seconds--) + ')').addClass('timer');
this.$sendBtn.text('重新获取(' + (this.seconds--) + ')').addClass('timer');
this.timer = setInterval(function() {
if (that.seconds > 0) {
that.$sendBtn.text('重新获取(' + (that.seconds--) + ')').addClass('timer');
that.$sendBtn.text('重新获取(' + (that.seconds--) + ')').addClass('timer');
} else {
that.$sendBtn.text('重新获取').removeClass('timer');
clearInterval(that.timer);
... ...
... ... @@ -320,11 +320,11 @@ $('#order-submit').on('click', function() {
this.timer && clearInterval(this.timer);
this.$sendBtn.text('重新获取(' + (this.seconds--) + ')').addClass('timer');
this.$sendBtn.text('重新获取(' + (this.seconds--) + ')').addClass('timer');
this.timer = setInterval(function() {
if (that.seconds > 0) {
that.$sendBtn.text('重新获取(' + (that.seconds--) + ')').addClass('timer');
that.$sendBtn.text('重新获取(' + (that.seconds--) + ')').addClass('timer');
} else {
that.$sendBtn.text('重新获取').removeClass('timer');
clearInterval(that.timer);
... ...