Merge branch 'feature/newDraw' into dev

components/Lottery/Instant/RecordsPupup.vue

@@ -26,7 +26,10 @@
                           <div style="margin: 0" class="records-popup__time">
                           <div style="margin: 0" class="records-popup__time">
                             {{ (session.drawTime * 1000) | formatDate('MM-DD') }}
                             {{ (session.drawTime * 1000) | formatDate('MM-DD') }}
                           </div>
                           </div>
-                          <div class="records-popup__session">第{{ session.drawPlay }}场直播福袋</div>
+                          <div class="records-popup__session">
+                            第{{ session.drawPlay }}场 <span v-if="session.showType === 6">直播福袋</span>
+                            <span v-if="session.showType === 7">直播宝箱</span>
+                          </div>
                         </div>
                         </div>
                         <div class="records-popup__prize-name">{{ session.prizeName }}</div>
                         <div class="records-popup__prize-name">{{ session.prizeName }}</div>
                       </div>
                       </div>

components/Lottery/Timing/JoinButton.vue

@@ -3,14 +3,11 @@
     <div class="btn-box" :style="{ '--btnBottom': btnBottom }">
     <div class="btn-box" :style="{ '--btnBottom': btnBottom }">
       <template v-if="+lotteryInfo.status === LOTTERY_STATUS.teaser">
       <template v-if="+lotteryInfo.status === LOTTERY_STATUS.teaser">
         <button v-if="lotteryInfo.condition === 1" class="join-btn pre">未开始</button>
         <button v-if="lotteryInfo.condition === 1" class="join-btn pre">未开始</button>
-        <button v-if="lotteryInfo.condition === 2" class="join-btn pre countdown">
-          <template v-if="hours > 0">{{ hours | filterNum }}:</template>
-          {{ minutes | filterNum }}:{{ seconds | filterNum }}后开始
-        </button>
+        <button v-if="lotteryInfo.condition === 2" class="join-btn pre">等待开奖</button>
       </template>
       </template>
       <template v-if="+lotteryInfo.status === LOTTERY_STATUS.start">
       <template v-if="+lotteryInfo.status === LOTTERY_STATUS.start">
         <template v-if="lotteryInfo.userTimes === 0 && lotteryInfo.isDraw">
         <template v-if="lotteryInfo.userTimes === 0 && lotteryInfo.isDraw">
-          <button class="join-btn pre">等待开奖</button>
+          <button class="join-btn pre">未开始</button>
         </template>
         </template>
         <template v-else>
         <template v-else>
           <div class="btn-mask"></div>
           <div class="btn-mask"></div>

components/Lottery/Timing/Rewards.vue

@@ -10,7 +10,8 @@
       <div class="intro__sub">本场活动奖品:</div>
       <div class="intro__sub">本场活动奖品:</div>
       <div class="intro__rewards">
       <div class="intro__rewards">
         <div v-for="item in lotteryInfo.prizeConfigs" :key="item.id" class="intro__rewards-item">
         <div v-for="item in lotteryInfo.prizeConfigs" :key="item.id" class="intro__rewards-item">
-          <img :src="item.icon" alt="" />
+          <img v-if="item.icon" :src="item.icon" alt="" />
+          <img v-else src="./img/gift.png" alt="" />
           <div>{{ item.name }}</div>
           <div>{{ item.name }}</div>
         </div>
         </div>
       </div>
       </div>

components/Lottery/Timing/TimingStatus.vue

@@ -19,7 +19,7 @@
     </template>
     </template>
     <template v-if="type === 2">
     <template v-if="type === 2">
       <div class="joinnum-box">
       <div class="joinnum-box">
-        <p>参与人数满 {{ lotteryInfo.joinNum }} 人自动开奖（当前参与 {{ lotteryInfo.activeNum }} 人）</p>
+        <p>参与人数满 {{ lotteryInfo.joinNum }} 人自动开奖 ( 当前参与 {{ lotteryInfo.activeNum }} 人 )</p>
       </div>
       </div>
     </template>
     </template>
   </section>
   </section>
@@ -134,9 +134,22 @@ export default {
     color: #999;
     color: #999;
   }
   }
   .joinnum-box {
   .joinnum-box {
-    font-size: 14px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 13px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #fff6da;
+    line-height: 18.5px;
     p {
     p {
-      color: #999999;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 0 9px;
+      height: 23px;
+      background: rgba(0, 0, 0, 0.21);
+      border-radius: 11.5px;
     }
     }
   }
   }
 }
 }

pages/list/index.vue

@@ -7,10 +7,12 @@
             {{ getStatus(item).label }}
             {{ getStatus(item).label }}
           </div>
           </div>
           <div class="session-list__time">
           <div class="session-list__time">
-            第{{ index + 1 }}场：
-            {{ (item.startTime * 1000) | formatDate('MM/DD HH:mm') }}
-            —
-            {{ (item.endTime * 1000) | formatDate('MM/DD HH:mm') }}
+            第{{ index + 1 }}场<span v-if="getStatus(item).label === '已结束'"
+              >：
+              {{ (item.startTime * 1000) | formatDate('MM/DD HH:mm') }}
+              —
+              {{ (item.endTime * 1000) | formatDate('MM/DD HH:mm') }}</span
+            >
           </div>
           </div>
         </div>
         </div>
       </li>
       </li>

pages/mini/list/index.vue

@@ -7,10 +7,12 @@
             {{ getStatus(item).label }}
             {{ getStatus(item).label }}
           </div>
           </div>
           <div class="session-list__time">
           <div class="session-list__time">
-            第{{ index + 1 }}场：
-            {{ (item.startTime * 1000) | formatDate('MM/DD HH:mm') }}
-            —
-            {{ (item.endTime * 1000) | formatDate('MM/DD HH:mm') }}
+            第{{ index + 1 }}场<span v-if="getStatus(item).label === '已结束'"
+              >：
+              {{ (item.startTime * 1000) | formatDate('MM/DD HH:mm') }}
+              —
+              {{ (item.endTime * 1000) | formatDate('MM/DD HH:mm') }}</span
+            >
           </div>
           </div>
         </div>
         </div>
       </li>
       </li>