Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/video_app into test
This commit is contained in:
@@ -34,7 +34,7 @@
|
|||||||
<!-- <button @click="showLingPop">showLingPop</button> -->
|
<!-- <button @click="showLingPop">showLingPop</button> -->
|
||||||
<almost-lottery :lottery-size="lotteryConfig.lotterySize" :action-size="lotteryConfig.actionSize"
|
<almost-lottery :lottery-size="lotteryConfig.lotterySize" :action-size="lotteryConfig.actionSize"
|
||||||
:selfTime="selfTime"
|
:selfTime="selfTime"
|
||||||
:ring-count="2" :duration="1" :self-rotaty="false" :img-circled="true" :canvasCached="true"
|
:ring-count="8" :duration="3.5" :self-rotaty="false" :img-circled="true" :canvasCached="true"
|
||||||
:prize-list="prizeList" :prize-index="prizeIndex" :lotteryBg="lotteryBg" :actionBg="actionBg"
|
:prize-list="prizeList" :prize-index="prizeIndex" :lotteryBg="lotteryBg" :actionBg="actionBg"
|
||||||
@reset-index="prizeIndex = -1" @draw-before="handleDrawBefore" @draw-start="handleDrawStart"
|
@reset-index="prizeIndex = -1" @draw-before="handleDrawBefore" @draw-start="handleDrawStart"
|
||||||
@draw-end="handleDrawEnd" @finish="handleDrawFinish" v-if="prizeList.length" />
|
@draw-end="handleDrawEnd" @finish="handleDrawFinish" v-if="prizeList.length" />
|
||||||
|
|||||||
@@ -78,6 +78,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
|
this.page=1;
|
||||||
this.enable = true
|
this.enable = true
|
||||||
this.getCourseList()
|
this.getCourseList()
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user