|
@@ -187,7 +187,7 @@ export default {
|
|
|
if(this.current <= endNum || this.current <= speed){//数字减小,有可能导致current小于speed
|
|
if(this.current <= endNum || this.current <= speed){//数字减小,有可能导致current小于speed
|
|
|
this.current = endNum.toFixed(toFixed);
|
|
this.current = endNum.toFixed(toFixed);
|
|
|
clearInterval(countTimer);
|
|
clearInterval(countTimer);
|
|
|
- this.$emit('scrollEnd');
|
|
|
|
|
|
|
+ this.$emit('scroll-end');
|
|
|
}else{
|
|
}else{
|
|
|
this.current = (parseFloat(this.current) - parseFloat(speed)).toFixed(toFixed);
|
|
this.current = (parseFloat(this.current) - parseFloat(speed)).toFixed(toFixed);
|
|
|
}
|
|
}
|
|
@@ -195,7 +195,7 @@ export default {
|
|
|
if(this.current >= endNum){
|
|
if(this.current >= endNum){
|
|
|
this.current = endNum.toFixed(toFixed);
|
|
this.current = endNum.toFixed(toFixed);
|
|
|
clearInterval(countTimer);
|
|
clearInterval(countTimer);
|
|
|
- this.$emit('scrollEnd');
|
|
|
|
|
|
|
+ this.$emit('scroll-end');
|
|
|
}else{
|
|
}else{
|
|
|
this.current = (parseFloat(this.current) + parseFloat(speed)).toFixed(toFixed);
|
|
this.current = (parseFloat(this.current) + parseFloat(speed)).toFixed(toFixed);
|
|
|
}
|
|
}
|
|
@@ -327,7 +327,7 @@ export default {
|
|
|
// that.totalCount--;
|
|
// that.totalCount--;
|
|
|
if(that.totalCount <= 0) {
|
|
if(that.totalCount <= 0) {
|
|
|
that.clearInterval();
|
|
that.clearInterval();
|
|
|
- this.$emit('scrollEnd');
|
|
|
|
|
|
|
+ this.$emit('scroll-end');
|
|
|
}
|
|
}
|
|
|
}, that.during);
|
|
}, that.during);
|
|
|
},
|
|
},
|
|
@@ -388,7 +388,7 @@ export default {
|
|
|
that.relNum = that.calculation(that.relNum, m * that.speed, '+');
|
|
that.relNum = that.calculation(that.relNum, m * that.speed, '+');
|
|
|
}, that.during)
|
|
}, that.during)
|
|
|
f.addEventListener('webkitTransitionEnd', () => {
|
|
f.addEventListener('webkitTransitionEnd', () => {
|
|
|
- this.$emit('scrollEnd');
|
|
|
|
|
|
|
+ this.$emit('scroll-end');
|
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
|
that.relNum = that.calculation(that.relNum, m * that.speed, '+');
|
|
that.relNum = that.calculation(that.relNum, m * that.speed, '+');
|
|
|
}, that.during);
|
|
}, that.during);
|