Authored by yyq

Merge branch 'feature/giftCart' into release/6.1

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