Skip to content

activities / web-lottery

Go to a project
Commit 628c7d5d by Lays-lzq
Options

Merge branch 'feature/miniBanner' into dev

parents e3a0764f 1836f7b5
Showing with 28 additions and 18 deletions
components/Lottery/Instant/type/TypeGashaponMini.vue
<template> <template>
<section class="lottery-instant"> <section class="lottery-instant">
<div class="lottery-instant__main"> <div class="lottery-instant__main">
<Banner v-if="isShowBanner" class="lottery-instant__banner"></Banner> <Banner class="lottery-instant__banner"></Banner>
<CountdownBar class="lottery-instant__countdown"></CountdownBar> <CountdownBar class="lottery-instant__countdown"></CountdownBar>
<div class="lottery-instant__layout-gashapon"> <div class="lottery-instant__layout-gashapon">
<div class="content-main"> <div class="content-main">
...@@ -93,7 +93,6 @@ export default { ...@@ -93,7 +93,6 @@ export default {
sid: this.$route.query.sid || null, // 引用id sid: this.$route.query.sid || null, // 引用id
stype: this.$route.query.stype || null, // 引用类型 stype: this.$route.query.stype || null, // 引用类型
ballListGashapon, // 扭蛋球图片 ballListGashapon, // 扭蛋球图片
isShowBanner: true
} }
}, },
computed: { computed: {
......
components/Lottery/Instant/type/TypeGuessMini.vue
<template> <template>
<section class="lottery-instant"> <section class="lottery-instant">
<div class="lottery-instant__main"> <div class="lottery-instant__main">
<Banner v-if="isShowBanner" class="lottery-instant__banner"></Banner> <Banner class="lottery-instant__banner"></Banner>
<img class="lottery-instant__title" src="@/assets/images/lottery/guess/game-title.png" /> <img class="lottery-instant__title" src="@/assets/images/lottery/guess/game-title.png" />
<CountdownBar class="lottery-instant__countdown"></CountdownBar> <CountdownBar class="lottery-instant__countdown"></CountdownBar>
<div class="lottery-instant__layout-guess"> <div class="lottery-instant__layout-guess">
...@@ -100,7 +100,6 @@ export default { ...@@ -100,7 +100,6 @@ export default {
timer: null, timer: null,
blindBoxList: blindBoxListGuess, blindBoxList: blindBoxListGuess,
starConfig, starConfig,
isShowBanner: true
} }
}, },
computed: { computed: {
......
components/Lottery/Instant/type/TypeGuessMini2.vue
<template> <template>
<section class="lottery-instant"> <section class="lottery-instant">
<div class="lottery-instant__main"> <div class="lottery-instant__main">
<Banner v-if="isShowBanner" class="lottery-instant__banner"></Banner> <Banner class="lottery-instant__banner"></Banner>
<img class="lottery-instant__title" src="@/assets/images/lottery/guess/game-title.png" /> <img class="lottery-instant__title" src="@/assets/images/lottery/guess/game-title.png" />
<CountdownBar class="lottery-instant__countdown"></CountdownBar> <CountdownBar class="lottery-instant__countdown"></CountdownBar>
<div class="lottery-instant__layout-guess"> <div class="lottery-instant__layout-guess">
...@@ -100,7 +100,6 @@ export default { ...@@ -100,7 +100,6 @@ export default {
timer: null, timer: null,
blindBoxList: blindBoxListGuess, blindBoxList: blindBoxListGuess,
starConfig, starConfig,
isShowBanner: true
} }
}, },
computed: { computed: {
......
components/Lottery/Instant/type/TypeScratchMini.vue
<template> <template>
<section class="lottery-instant"> <section class="lottery-instant">
<div class="lottery-instant__main"> <div class="lottery-instant__main">
<Banner v-if="isShowBanner" class="lottery-instant__banner"></Banner> <Banner class="lottery-instant__banner"></Banner>
<CountdownBar class="lottery-instant__countdown"></CountdownBar> <CountdownBar class="lottery-instant__countdown"></CountdownBar>
<div class="lottery-instant__layout-scratch"> <div class="lottery-instant__layout-scratch">
<div class="lottery-instant__content-scratch"> <div class="lottery-instant__content-scratch">
...@@ -119,7 +119,6 @@ export default { ...@@ -119,7 +119,6 @@ export default {
playId: this.$route.query.sessionId || null, // 场次id playId: this.$route.query.sessionId || null, // 场次id
sid: this.$route.query.sid || null, // 引用id sid: this.$route.query.sid || null, // 引用id
stype: this.$route.query.stype || null, // 引用类型 stype: this.$route.query.stype || null, // 引用类型
isShowBanner: true
} }
}, },
computed: { computed: {
......
components/Lottery/Timing/type/LuckyBag.vue
...@@ -78,7 +78,6 @@ export default { ...@@ -78,7 +78,6 @@ export default {
}, },
data() { data() {
return { return {
isShowBanner: true
} }
}, },
computed: { computed: {
...@@ -88,6 +87,10 @@ export default { ...@@ -88,6 +87,10 @@ export default {
lotteryInfo: 'lottery/lotteryInfo', lotteryInfo: 'lottery/lotteryInfo',
isBindPhone: 'users/isBindPhone' isBindPhone: 'users/isBindPhone'
}), }),
isShowBanner() {
const { isShowBanner } = this.lotteryInfo
return !!isShowBanner
},
backUrl() { backUrl() {
return this.$route.query.backUrl || '' return this.$route.query.backUrl || ''
}, },
......
components/Lottery/Timing/type/Treasure.vue
...@@ -77,7 +77,6 @@ export default { ...@@ -77,7 +77,6 @@ export default {
}, },
data() { data() {
return { return {
isShowBanner: true
} }
}, },
computed: { computed: {
...@@ -87,6 +86,10 @@ export default { ...@@ -87,6 +86,10 @@ export default {
lotteryInfo: 'lottery/lotteryInfo', lotteryInfo: 'lottery/lotteryInfo',
isBindPhone: 'users/isBindPhone' isBindPhone: 'users/isBindPhone'
}), }),
isShowBanner() {
const { isShowBanner } = this.lotteryInfo
return !!isShowBanner
},
backUrl() { backUrl() {
return this.$route.query.backUrl || '' return this.$route.query.backUrl || ''
}, },
......
pages/list/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="session-list"> <div class="session-list">
<ul class="session-list__wrapper"> <ul class="session-list__wrapper">
<li v-for="(item, index) in sessionList" :key="index" @click="jumpToLottery(item.id)"> <li v-for="(item, index) in sessionList" :key="index" @click="jumpToLottery(item.id)">
<div v-lazy:background-image="bannerImg(item.banner)" class="session-list__item-wrap"> <div v-lazy:background-image="bannerImg(item)" class="session-list__item-wrap">
<div class="session-list__status" :class="`session-list__status--${getStatus(item).className}`"> <div class="session-list__status" :class="`session-list__status--${getStatus(item).className}`">
{{ getStatus(item).label }} {{ getStatus(item).label }}
</div> </div>
...@@ -89,9 +89,13 @@ export default { ...@@ -89,9 +89,13 @@ export default {
} }
return LOTTERY_STATUS_TXT[LOTTERY_STATUS.start] return LOTTERY_STATUS_TXT[LOTTERY_STATUS.start]
}, },
bannerImg(url) { bannerImg(item) {
const img = url || CONFIG.defBanner if (item.isShowBanner) {
return `${img}${CONFIG.ossImageServe}` const img = item.banner || CONFIG.defBanner
return `${img}${CONFIG.ossImageServe}`
} else {
return `${CONFIG.defBanner}${CONFIG.ossImageServe}`
}
}, },
jumpToLottery(sessionId) { jumpToLottery(sessionId) {
const params = new URLSearchParams({ ...this.$route.query, sessionId }).toString() const params = new URLSearchParams({ ...this.$route.query, sessionId }).toString()
......
pages/mini/list/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="session-list"> <div class="session-list">
<ul class="session-list__wrapper"> <ul class="session-list__wrapper">
<li v-for="(item, index) in sessionList" :key="index" @click="jumpToLottery(item.id)"> <li v-for="(item, index) in sessionList" :key="index" @click="jumpToLottery(item.id)">
<div v-lazy:background-image="bannerImg(item.banner)" class="session-list__item-wrap"> <div v-lazy:background-image="bannerImg(item)" class="session-list__item-wrap">
<div class="session-list__status" :class="`session-list__status--${getStatus(item).className}`"> <div class="session-list__status" :class="`session-list__status--${getStatus(item).className}`">
{{ getStatus(item).label }} {{ getStatus(item).label }}
</div> </div>
...@@ -75,9 +75,13 @@ export default { ...@@ -75,9 +75,13 @@ export default {
} }
return LOTTERY_STATUS_TXT[LOTTERY_STATUS.start] return LOTTERY_STATUS_TXT[LOTTERY_STATUS.start]
}, },
bannerImg(url) { bannerImg(item) {
const img = url || CONFIG.defBanner if (item.isShowBanner) {
return `${img}${CONFIG.ossImageServe}` const img = item.banner || CONFIG.defBanner
return `${img}${CONFIG.ossImageServe}`
} else {
return `${CONFIG.defBanner}${CONFIG.ossImageServe}`
}
}, },
jumpToLottery(sessionId) { jumpToLottery(sessionId) {
const params = new URLSearchParams({ ...this.$route.query, sessionId }).toString() const params = new URLSearchParams({ ...this.$route.query, sessionId }).toString()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment