fix: 连续点击按钮数据报错
This commit is contained in:
@@ -83,15 +83,9 @@ return state.prizeConfig.prizeList;
|
|||||||
},
|
},
|
||||||
// 更新奖项数据
|
// 更新奖项数据
|
||||||
updatePrizeConfig(prizeConfigItem: IPrizeConfig) {
|
updatePrizeConfig(prizeConfigItem: IPrizeConfig) {
|
||||||
// const index = this.prizeConfig.prizeList.findIndex(item => item.id === prizeConfigItem.id);
|
const prizeListLength=this.prizeConfig.prizeList.length;
|
||||||
// this.prizeConfig.prizeList[index] = prizeConfigItem;
|
if(prizeConfigItem.isUsed&&prizeListLength){
|
||||||
// if(prizeConfigItem.isUsed&&index+1<this.prizeConfig.prizeList.length){
|
for(let i=0;i<prizeListLength;i++){
|
||||||
// // 设置下一个为currentPrize
|
|
||||||
// this.setCurrentPrize(this.prizeConfig.prizeList[index+1]);
|
|
||||||
// }
|
|
||||||
if(prizeConfigItem.isUsed&&this.prizeConfig.prizeList.length){
|
|
||||||
// 设置下一个为currentPrize
|
|
||||||
for(let i=0;i<this.prizeConfig.prizeList.length;i++){
|
|
||||||
if(!this.prizeConfig.prizeList[i].isUsed){
|
if(!this.prizeConfig.prizeList[i].isUsed){
|
||||||
this.setCurrentPrize(this.prizeConfig.prizeList[i]);
|
this.setCurrentPrize(this.prizeConfig.prizeList[i]);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ const submitTemporaryPrize = () => {
|
|||||||
temporaryPrize.value.isShow = true
|
temporaryPrize.value.isShow = true
|
||||||
temporaryPrize.value.id=new Date().getTime().toString()
|
temporaryPrize.value.id=new Date().getTime().toString()
|
||||||
prizeConfig.setCurrentPrize(temporaryPrize.value)
|
prizeConfig.setCurrentPrize(temporaryPrize.value)
|
||||||
prizeConfig.setCurrentPrize(temporaryPrize.value)
|
|
||||||
}
|
}
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
prizeListContainerRef.value.style.height = getPrizeListHeight() + 'px'
|
prizeListContainerRef.value.style.height = getPrizeListHeight() + 'px'
|
||||||
|
|||||||
@@ -255,8 +255,6 @@ return new Promise((resolve) => {
|
|||||||
resolve('')
|
resolve('')
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
|
|
||||||
// 整体自动旋转
|
|
||||||
}
|
}
|
||||||
function onWindowResize() {
|
function onWindowResize() {
|
||||||
camera.value.aspect = window.innerWidth / window.innerHeight
|
camera.value.aspect = window.innerWidth / window.innerHeight
|
||||||
@@ -303,7 +301,6 @@ function rollBall(rotateY: number, duration: number) {
|
|||||||
})
|
})
|
||||||
.onComplete(() => {
|
.onComplete(() => {
|
||||||
resolve('')
|
resolve('')
|
||||||
canOperate.value = true
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -333,7 +330,7 @@ function resetCamera() {
|
|||||||
.onUpdate(render)
|
.onUpdate(render)
|
||||||
.start()
|
.start()
|
||||||
.onComplete(() => {
|
.onComplete(() => {
|
||||||
canOperate.value = true // 相机恢复原位
|
canOperate.value = true
|
||||||
// camera.value.lookAt(scene.value.position)
|
// camera.value.lookAt(scene.value.position)
|
||||||
camera.value.position.y = 0
|
camera.value.position.y = 0
|
||||||
camera.value.position.x = 0
|
camera.value.position.x = 0
|
||||||
@@ -372,7 +369,7 @@ const startLottery = () => {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
// 验证是否已抽完全部奖项
|
// 验证是否已抽完全部奖项
|
||||||
if (currentPrize.value.isUsed) {
|
if (currentPrize.value.isUsed||!currentPrize.value) {
|
||||||
toast.open({
|
toast.open({
|
||||||
message: '抽奖抽完了',
|
message: '抽奖抽完了',
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
@@ -405,11 +402,10 @@ const stopLottery = async () => {
|
|||||||
clearInterval(intervalTimer.value)
|
clearInterval(intervalTimer.value)
|
||||||
intervalTimer.value = null
|
intervalTimer.value = null
|
||||||
canOperate.value = false
|
canOperate.value = false
|
||||||
// TWEEN.removeAll();
|
|
||||||
rollBall(0, 1)
|
rollBall(0, 1)
|
||||||
// 抽奖池是否为全体人员
|
// 抽奖池是否为全体人员
|
||||||
// personPool=currentPrize.value.isAll ? notThisPrizePersonList.value : notPersonList.value
|
|
||||||
// 每次最多抽十个
|
// 每次最多抽十个
|
||||||
|
luckyCount.value = 10
|
||||||
const leftover = currentPrize.value.count - currentPrize.value.isUsedCount
|
const leftover = currentPrize.value.count - currentPrize.value.isUsedCount
|
||||||
leftover < luckyCount.value ? luckyCount.value = leftover : luckyCount
|
leftover < luckyCount.value ? luckyCount.value = leftover : luckyCount
|
||||||
if (personPool.value.length < leftover) {
|
if (personPool.value.length < leftover) {
|
||||||
@@ -446,6 +442,10 @@ const stopLottery = async () => {
|
|||||||
item.element = useElementStyle(item.element, person, cardIndex, patternList.value, patternColor.value, luckyColor.value, { width: cardSize.value.width * 2, height: cardSize.value.height * 2 }, textSize.value * 2, 'lucky')
|
item.element = useElementStyle(item.element, person, cardIndex, patternList.value, patternColor.value, luckyColor.value, { width: cardSize.value.width * 2, height: cardSize.value.height * 2 }, textSize.value * 2, 'lucky')
|
||||||
})
|
})
|
||||||
.start()
|
.start()
|
||||||
|
.onComplete(() => {
|
||||||
|
canOperate.value = true
|
||||||
|
currentStatus.value = 3
|
||||||
|
})
|
||||||
new TWEEN.Tween(item.rotation)
|
new TWEEN.Tween(item.rotation)
|
||||||
.to({
|
.to({
|
||||||
x: 0,
|
x: 0,
|
||||||
@@ -459,23 +459,21 @@ const stopLottery = async () => {
|
|||||||
resetCamera()
|
resetCamera()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
currentStatus.value = 3
|
|
||||||
}
|
}
|
||||||
// 继续
|
// 继续
|
||||||
const continueLottery = async () => {
|
const continueLottery = async () => {
|
||||||
|
if (!canOperate.value) {
|
||||||
|
return
|
||||||
|
}
|
||||||
currentPrize.value.isUsedCount += luckyCount.value
|
currentPrize.value.isUsedCount += luckyCount.value
|
||||||
|
luckyCount.value = 0
|
||||||
if (currentPrize.value.isUsedCount >= currentPrize.value.count) {
|
if (currentPrize.value.isUsedCount >= currentPrize.value.count) {
|
||||||
currentPrize.value.isUsed = true
|
currentPrize.value.isUsed = true
|
||||||
|
currentPrize.value.isUsedCount = currentPrize.value.count
|
||||||
}
|
}
|
||||||
personConfig.addAlreadyPersonList(luckyTargets.value, currentPrize.value)
|
personConfig.addAlreadyPersonList(luckyTargets.value, currentPrize.value)
|
||||||
prizeConfig.updatePrizeConfig(currentPrize.value)
|
prizeConfig.updatePrizeConfig(currentPrize.value)
|
||||||
|
|
||||||
prizeConfig.setCurrentPrize(currentPrize.value)
|
|
||||||
luckyCount.value = 10
|
|
||||||
await enterLottery()
|
await enterLottery()
|
||||||
// startLottery()
|
|
||||||
currentStatus.value = 1
|
|
||||||
}
|
}
|
||||||
const quitLottery = () => {
|
const quitLottery = () => {
|
||||||
enterLottery()
|
enterLottery()
|
||||||
@@ -659,10 +657,12 @@ onUnmounted(() => {
|
|||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
font-size: 32px;
|
font-size: 32px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.header-title {
|
.header-title {
|
||||||
-webkit-animation: tracking-in-expand-fwd 0.8s cubic-bezier(0.215, 0.610, 0.355, 1.000) both;
|
-webkit-animation: tracking-in-expand-fwd 0.8s cubic-bezier(0.215, 0.610, 0.355, 1.000) both;
|
||||||
animation: tracking-in-expand-fwd 0.8s cubic-bezier(0.215, 0.610, 0.355, 1.000) both;
|
animation: tracking-in-expand-fwd 0.8s cubic-bezier(0.215, 0.610, 0.355, 1.000) both;
|
||||||
}
|
}
|
||||||
|
|
||||||
.start {
|
.start {
|
||||||
// 居中
|
// 居中
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -951,6 +951,7 @@ strong {
|
|||||||
transform: scale(1);
|
transform: scale(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@-webkit-keyframes tracking-in-expand-fwd {
|
@-webkit-keyframes tracking-in-expand-fwd {
|
||||||
0% {
|
0% {
|
||||||
letter-spacing: -0.5em;
|
letter-spacing: -0.5em;
|
||||||
@@ -958,15 +959,18 @@ strong {
|
|||||||
transform: translateZ(-700px);
|
transform: translateZ(-700px);
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
40% {
|
40% {
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
}
|
}
|
||||||
|
|
||||||
100% {
|
100% {
|
||||||
-webkit-transform: translateZ(0);
|
-webkit-transform: translateZ(0);
|
||||||
transform: translateZ(0);
|
transform: translateZ(0);
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes tracking-in-expand-fwd {
|
@keyframes tracking-in-expand-fwd {
|
||||||
0% {
|
0% {
|
||||||
letter-spacing: -0.5em;
|
letter-spacing: -0.5em;
|
||||||
@@ -974,15 +978,15 @@ strong {
|
|||||||
transform: translateZ(-700px);
|
transform: translateZ(-700px);
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
40% {
|
40% {
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
}
|
}
|
||||||
|
|
||||||
100% {
|
100% {
|
||||||
-webkit-transform: translateZ(0);
|
-webkit-transform: translateZ(0);
|
||||||
transform: translateZ(0);
|
transform: translateZ(0);
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Reference in New Issue
Block a user