Merge branch 'feature/12.14'

components/Lottery/Timing/JoinButton.vue

@@ -4,6 +4,7 @@
       <template v-if="+lotteryInfo.status === LOTTERY_STATUS.teaser">
         <button v-if="lotteryInfo.condition === 1" class="join-btn pre">未开始</button>
         <button v-if="lotteryInfo.condition === 2" class="join-btn pre">未开始</button>
+        <button v-if="lotteryInfo.condition === 3" class="join-btn pre">未开始</button>
       </template>
       <template v-if="+lotteryInfo.status === LOTTERY_STATUS.start">
         <template v-if="lotteryInfo.userTimes === 0 && lotteryInfo.isDraw">

components/Lottery/Timing/TimingStatus.vue

@@ -22,6 +22,11 @@
         <p>参与人数满 {{ lotteryInfo.joinNum }} 人自动开奖 ( 当前参与 {{ lotteryInfo.activeNum }} 人 )</p>
       </div>
     </template>
+    <template v-if="type === 3">
+      <div class="joinnum-box">
+        <p>当前参与 {{ lotteryInfo.activeNum }} 人 </p>
+      </div>
+    </template>
   </section>
 </template>
 

components/Records/DetailPopup.vue

@@ -23,10 +23,16 @@
           <span v-if="detailInfo.drawTime">{{ (detailInfo.drawTime * 1000) | formatDate('YYYY-MM-DD HH:mm') }}</span>
         </li>
         <li>
+          <label v-if="detailInfo.drawIntro">抽奖介绍：</label>
+          <label v-if="detailInfo.winningInstructions">中奖说明：</label>
+          <span v-if="detailInfo.drawIntro">{{ detailInfo.drawIntro }}</span>
+          <span v-if="detailInfo.winningInstructions">{{ detailInfo.winningInstructions }}</span>
+        </li>
+        <li>
           <label>获得奖品：</label>
           <div>
             <p>{{ detailInfo.prizeName }}</p>
-            <img v-lazy="detailInfo.prizeIcon" class="detail-popup__info-img" alt="" />
+            <img v-if="detailInfo.prizeIcon" v-lazy="detailInfo.prizeIcon" class="detail-popup__info-img" alt="" />
           </div>
         </li>
         <li>

pages/recordDetail/index.vue

@@ -17,10 +17,16 @@
             <span v-if="detailInfo.drawTime">{{ (detailInfo.drawTime * 1000) | formatDate('YYYY-MM-DD HH:mm') }}</span>
           </li>
           <li>
+            <label v-if="detailInfo.drawIntro">抽奖介绍：</label>
+            <label v-if="detailInfo.winningInstructions">中奖说明：</label>
+            <span v-if="detailInfo.drawIntro">{{ detailInfo.drawIntro }}</span>
+            <span v-if="detailInfo.winningInstructions">{{ detailInfo.winningInstructions }}</span>
+          </li>
+          <li>
             <label>获得奖品：</label>
             <div>
               <p>{{ detailInfo.prizeName }}</p>
-              <img v-lazy="detailInfo.prizeIcon" class="record-detail__info-img" alt="" />
+              <img v-if="detailInfo.prizeIcon" v-lazy="detailInfo.prizeIcon" class="record-detail__info-img" alt="" />
             </div>
           </li>
           <li>