fix
This commit is contained in:
@@ -140,7 +140,7 @@ globalToastEvent.on(ToastType.SHOW_ADDRESS, (id) => {
|
|||||||
<Address :show="addressShow" :prizeId="activePrizeId" @address-submit="handleAddressSubmitAfter"
|
<Address :show="addressShow" :prizeId="activePrizeId" @address-submit="handleAddressSubmitAfter"
|
||||||
@address-close="addressShow = false"></Address>
|
@address-close="addressShow = false"></Address>
|
||||||
<Ad :show="adShow" @close="adShow = false"></Ad>
|
<Ad :show="adShow" @close="adShow = false"></Ad>
|
||||||
<Lottery :show="lotteryShow" @close="lotteryShow = false"></Lottery>
|
<!-- <Lottery :show="lotteryShow" @close="lotteryShow = false"></Lottery> -->
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|||||||
@@ -9,15 +9,18 @@ import globalToastEvent, { ToastType } from '../globalToastEvent';
|
|||||||
import { globalStore } from "../globalstore.js";
|
import { globalStore } from "../globalstore.js";
|
||||||
import Login from '../components/Login.vue'
|
import Login from '../components/Login.vue'
|
||||||
import { isWeixin, isLogin, getParam, Storage, Request } from "../libs/utils"
|
import { isWeixin, isLogin, getParam, Storage, Request } from "../libs/utils"
|
||||||
|
import Lottery from '../components/Lottery.vue';
|
||||||
|
|
||||||
defineProps({
|
const props = defineProps({
|
||||||
show: true
|
show: true
|
||||||
})
|
})
|
||||||
|
|
||||||
const isMusicOn = ref(false);
|
const isMusicOn = ref(false);
|
||||||
const audioElement = ref(null);
|
const audioElement = ref(null);
|
||||||
const videoElement = ref(null);
|
const videoElement = ref(null);
|
||||||
const videoLoaded = ref(false);
|
const videoLoaded = ref(false);
|
||||||
const videoError = ref(false);
|
const videoError = ref(false);
|
||||||
|
const lotteryShow = ref(false)
|
||||||
|
|
||||||
// 初始化全局音频实例
|
// 初始化全局音频实例
|
||||||
const initGlobalAudio = () => {
|
const initGlobalAudio = () => {
|
||||||
@@ -330,6 +333,13 @@ watch(() => mergeId, async (newVal) => {
|
|||||||
}
|
}
|
||||||
}, { immediate: true })
|
}, { immediate: true })
|
||||||
|
|
||||||
|
globalToastEvent.on(ToastType.SHOW_LOTTERY, () => {
|
||||||
|
lotteryShow.value = true
|
||||||
|
})
|
||||||
|
|
||||||
|
watch(() => lotteryShow.value, async (newVal) => {
|
||||||
|
initUserGameInfos(true, true);
|
||||||
|
}, { immediate: true })
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -397,6 +407,7 @@ watch(() => mergeId, async (newVal) => {
|
|||||||
<MyPhoto @go-photo-square="showPhotoSquare" v-model:show="isMyPhotoVisible" />
|
<MyPhoto @go-photo-square="showPhotoSquare" v-model:show="isMyPhotoVisible" />
|
||||||
<PhotoSquare @go-my-photo="showMyPhoto" v-model:show="isPhotoSquareVisible" />
|
<PhotoSquare @go-my-photo="showMyPhoto" v-model:show="isPhotoSquareVisible" />
|
||||||
<Login :show="loginShow" @login-success="handleLoginSuccess" />
|
<Login :show="loginShow" @login-success="handleLoginSuccess" />
|
||||||
|
<Lottery :show="lotteryShow" @close="lotteryShow = false"></Lottery>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|||||||
Reference in New Issue
Block a user