Merge branch 'feature/miniBanner' into dev

components/Lottery/Instant/type/TypeGashaponMini.vue

 <template>
   <section class="lottery-instant">
     <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>
       <div class="lottery-instant__layout-gashapon">
         <div class="content-main">
@@ -93,7 +93,6 @@ export default {
       sid: this.$route.query.sid || null, // 引用id
       stype: this.$route.query.stype || null, // 引用类型
       ballListGashapon, // 扭蛋球图片
-      isShowBanner: true
     }
   },
   computed: {

components/Lottery/Instant/type/TypeGuessMini.vue

 <template>
   <section class="lottery-instant">
     <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" />
       <CountdownBar class="lottery-instant__countdown"></CountdownBar>
       <div class="lottery-instant__layout-guess">
@@ -100,7 +100,6 @@ export default {
       timer: null,
       blindBoxList: blindBoxListGuess,
       starConfig,
-      isShowBanner: true
     }
   },
   computed: {

components/Lottery/Instant/type/TypeGuessMini2.vue

 <template>
   <section class="lottery-instant">
     <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" />
       <CountdownBar class="lottery-instant__countdown"></CountdownBar>
       <div class="lottery-instant__layout-guess">
@@ -100,7 +100,6 @@ export default {
       timer: null,
       blindBoxList: blindBoxListGuess,
       starConfig,
-      isShowBanner: true
     }
   },
   computed: {

components/Lottery/Instant/type/TypeScratchMini.vue

 <template>
   <section class="lottery-instant">
     <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>
       <div class="lottery-instant__layout-scratch">
         <div class="lottery-instant__content-scratch">
@@ -119,7 +119,6 @@ export default {
       playId: this.$route.query.sessionId || null, // 场次id
       sid: this.$route.query.sid || null, // 引用id
       stype: this.$route.query.stype || null, // 引用类型
-      isShowBanner: true
     }
   },
   computed: {

components/Lottery/Timing/type/LuckyBag.vue

@@ -78,7 +78,6 @@ export default {
   },
   data() {
     return {
-      isShowBanner: true
     }
   },
   computed: {
@@ -88,6 +87,10 @@ export default {
       lotteryInfo: 'lottery/lotteryInfo',
       isBindPhone: 'users/isBindPhone'
     }),
+    isShowBanner() {
+      const { isShowBanner } = this.lotteryInfo
+      return !!isShowBanner
+    },
     backUrl() {
       return this.$route.query.backUrl || ''
     },

components/Lottery/Timing/type/Treasure.vue

@@ -77,7 +77,6 @@ export default {
   },
   data() {
     return {
-      isShowBanner: true
     }
   },
   computed: {
@@ -87,6 +86,10 @@ export default {
       lotteryInfo: 'lottery/lotteryInfo',
       isBindPhone: 'users/isBindPhone'
     }),
+    isShowBanner() {
+      const { isShowBanner } = this.lotteryInfo
+      return !!isShowBanner
+    },
     backUrl() {
       return this.$route.query.backUrl || ''
     },

pages/list/index.vue

@@ -2,7 +2,7 @@
   <div class="session-list">
     <ul class="session-list__wrapper">
       <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}`">
             {{ getStatus(item).label }}
           </div>
@@ -89,9 +89,13 @@ export default {
       }
       return LOTTERY_STATUS_TXT[LOTTERY_STATUS.start]
     },
-    bannerImg(url) {
-      const img = url || CONFIG.defBanner
-      return `${img}${CONFIG.ossImageServe}`
+    bannerImg(item) {
+      if (item.isShowBanner) {
+        const img = item.banner || CONFIG.defBanner
+        return `${img}${CONFIG.ossImageServe}`
+      } else {
+        return `${CONFIG.defBanner}${CONFIG.ossImageServe}`
+      }
     },
     jumpToLottery(sessionId) {
       const params = new URLSearchParams({ ...this.$route.query, sessionId }).toString()

pages/mini/list/index.vue

@@ -2,7 +2,7 @@
   <div class="session-list">
     <ul class="session-list__wrapper">
       <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}`">
             {{ getStatus(item).label }}
           </div>
@@ -75,9 +75,13 @@ export default {
       }
       return LOTTERY_STATUS_TXT[LOTTERY_STATUS.start]
     },
-    bannerImg(url) {
-      const img = url || CONFIG.defBanner
-      return `${img}${CONFIG.ossImageServe}`
+    bannerImg(item) {
+      if (item.isShowBanner) {
+        const img = item.banner || CONFIG.defBanner
+        return `${img}${CONFIG.ossImageServe}`
+      } else {
+        return `${CONFIG.defBanner}${CONFIG.ossImageServe}`
+      }
     },
     jumpToLottery(sessionId) {
       const params = new URLSearchParams({ ...this.$route.query, sessionId }).toString()