|
@@ -11,7 +11,7 @@
|
|
|
<div><span>倒计时:</span></div>
|
|
|
<div>
|
|
|
<count-down
|
|
|
- :current-time="countDownNow"
|
|
|
+ :current-time="countDownStart"
|
|
|
:start-time="countDownStart"
|
|
|
:end-time="countDownEnd"
|
|
|
:tip-text="'距离开始文字1'"
|
|
@@ -58,8 +58,8 @@ export default {
|
|
|
return {
|
|
|
timeReduce: 48 * 60 * 60 * 1000,
|
|
|
countDownNow: new Date().getTime(),
|
|
|
- countDownStart: '',
|
|
|
- countDownEnd: '',
|
|
|
+ countDownStart: 0,
|
|
|
+ countDownEnd: 0,
|
|
|
activeName: '',
|
|
|
defaultAcitveTime: 48,
|
|
|
qrcodeUrl: '',
|
|
@@ -73,7 +73,7 @@ export default {
|
|
|
if (val && Object.keys(val).length) {
|
|
|
this.hideCuntdown = true
|
|
|
this.payTime = this.calcTimes(val.effectTime)
|
|
|
- this.countDownEnd = new Date(this.payTime).getTime() || ''
|
|
|
+ this.countDownEnd = new Date(this.payTime).getTime() || 0
|
|
|
this.countDownStart = new Date().getTime()
|
|
|
|
|
|
this.activeName = val.name
|
|
@@ -105,7 +105,7 @@ export default {
|
|
|
|
|
|
if (status && this.activeInfo && this.activeInfo.effectTime) {
|
|
|
this.payTime = this.calcTimes(this.activeInfo.effectTime)
|
|
|
- this.countDownEnd = new Date(this.payTime).getTime()
|
|
|
+ this.countDownEnd = new Date(this.payTime).getTime() || 0
|
|
|
this.countDownStart = new Date().getTime()
|
|
|
}
|
|
|
},
|
|
@@ -169,7 +169,6 @@ export default {
|
|
|
margin-top: 30px;
|
|
|
cursor: pointer;
|
|
|
.count-down {
|
|
|
- margin-top: 5px;
|
|
|
// height: 20px;
|
|
|
display: flex;
|
|
|
align-items: center;
|