Merge branch 'feature/timingStyle'

src/components/Lottery/Instant/Introduction.vue

@@ -18,8 +18,8 @@
               </li>
               </li>
             </ul>
             </ul>
           </div>
           </div>
-          <div class="introduction__title">下一场活动奖品：</div>
-          <div class="introduction__prize">
+          <div v-if="lotteryInfo.nextPlayPrizeConfigs.length > 0" class="introduction__title">下一场活动奖品：</div>
+          <div v-if="lotteryInfo.nextPlayPrizeConfigs.length > 0" class="introduction__prize">
             <ul
             <ul
               class="introduction__list"
               class="introduction__list"
               :class="{ 'introduction__list--center': lotteryInfo.nextPlayPrizeConfigs.length < 3 }"
               :class="{ 'introduction__list--center': lotteryInfo.nextPlayPrizeConfigs.length < 3 }"

src/components/Lottery/Timing/Rewards.vue

@@ -17,7 +17,7 @@
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
-      <div class="rule">
+      <div v-if="lotteryInfo.nextPlayPrizeConfigs.length > 0" class="rule">
         <div class="rule__sub">下一场活动奖品:</div>
         <div class="rule__sub">下一场活动奖品:</div>
         <div class="intro__rewards">
         <div class="intro__rewards">
           <div v-for="item in lotteryInfo.nextPlayPrizeConfigs" :key="item.id" class="intro__rewards-item">
           <div v-for="item in lotteryInfo.nextPlayPrizeConfigs" :key="item.id" class="intro__rewards-item">
@@ -57,9 +57,9 @@ export default {
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>
 .main {
 .main {
-  width: 100%;
+  width: calc(100% - 48px);
   height: 100%;
   height: 100%;
-  padding: 0 13px;
+  // padding: 0 13px;
   // overflow-x: auto;
   // overflow-x: auto;
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
@@ -141,7 +141,7 @@ export default {
     }
     }
   }
   }
   .rule {
   .rule {
-    height: 44%;
+    // height: 44%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
     &__sub {
     &__sub {

src/components/Lottery/Timing/type/Treasure.vue

@@ -169,7 +169,7 @@ export default {
     border-radius: 22px;
     border-radius: 22px;
   }
   }
   .reward-box {
   .reward-box {
-    width: 100%;
+    width: calc(100% - 48px);
     position: absolute;
     position: absolute;
     bottom: 3%;
     bottom: 3%;
   }
   }