Merge branch 'feature/question' into test

src/components/Lottery/Instant/Introduction.vue

@@ -18,6 +18,19 @@
               </li>
               </li>
             </ul>
             </ul>
           </div>
           </div>
+          <div class="introduction__title">下一场活动奖品：</div>
+          <div class="introduction__prize">
+            <ul
+              class="introduction__list"
+              :class="{ 'introduction__list--center': lotteryInfo.nextPlayPrizeConfigs.length < 3 }"
+            >
+              <li v-for="(item, index) in lotteryInfo.nextPlayPrizeConfigs" :key="index">
+                <img v-lazy="item.icon || img" class="introduction__item-img" alt />
+                <p v-if="item.prizeAlias" class="introduction__item-level">{{ item.prizeAlias }}</p>
+                <p class="introduction__item-name">{{ item.name }}</p>
+              </li>
+            </ul>
+          </div>
         </template>
         </template>
         <div v-if="rulePosition === 'bottom'" class="introduction__intro">
         <div v-if="rulePosition === 'bottom'" class="introduction__intro">
           <p class="introduction__intro-rule">活动规则</p>
           <p class="introduction__intro-rule">活动规则</p>

src/components/Lottery/Instant/IntroductionPopup.vue

@@ -27,6 +27,21 @@
                 </ul>
                 </ul>
               </div>
               </div>
             </div>
             </div>
+            <div class="introduction-popup__box">
+              <div class="introduction-popup__title">下一场活动奖品：</div>
+              <div class="introduction-popup__prize">
+                <ul
+                  class="introduction-popup__list"
+                  :class="{ 'introduction-popup__list--center': lotteryInfo.nextPlayPrizeConfigs.length < 3 }"
+                >
+                  <li v-for="(item, index) in lotteryInfo.nextPlayPrizeConfigs" :key="index">
+                    <img v-lazy="item.icon || img" class="introduction-popup__item-img" alt />
+                    <p v-if="item.prizeAlias" class="introduction-popup__item-level">{{ item.prizeAlias }}</p>
+                    <p class="introduction-popup__item-name">{{ item.name }}</p>
+                  </li>
+                </ul>
+              </div>
+            </div>
           </template>
           </template>
           <div v-if="rulePosition === 'bottom'" class="introduction-popup__intro">
           <div v-if="rulePosition === 'bottom'" class="introduction-popup__intro">
             <p class="introduction-popup__intro-rule">活动规则</p>
             <p class="introduction-popup__intro-rule">活动规则</p>

src/components/Lottery/Timing/Rewards.vue

@@ -17,6 +17,16 @@
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
+      <div class="rule">
+        <div class="rule__sub">下一场活动奖品:</div>
+        <div class="intro__rewards">
+          <div v-for="item in lotteryInfo.nextPlayPrizeConfigs" :key="item.id" class="intro__rewards-item">
+            <img v-if="item.icon" :src="item.icon" alt="" />
+            <img v-else src="./img/gift.png" alt="" />
+            <div>{{ item.name }}</div>
+          </div>
+        </div>
+      </div>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>