Merge branch 'feature/newDraw' into dev

components/Lottery/Instant/Main.vue

@@ -269,7 +269,7 @@ export default {
   methods: {
     ...mapActions({ jumpToLogin: 'users/jumpToLogin', updateInfo: 'lottery/updateInfo' }),
     // 中奖后， 关闭窗口回调
-    winCloseCallback(){
+    winCloseCallback() {
       this.isShowWin = false
       if (this.winInfo.id !== 0 && !this.isBindPhone) {
         this.isShowBindPhone = true

components/Lottery/Timing/JoinButton.vue

@@ -3,11 +3,11 @@
     <div class="btn-box" :style="{ '--btnBottom': btnBottom }">
       <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 === 2" class="join-btn pre">未开始</button>
       </template>
       <template v-if="+lotteryInfo.status === LOTTERY_STATUS.start">
         <template v-if="lotteryInfo.userTimes === 0 && lotteryInfo.isDraw">
-          <button class="join-btn pre">未开始</button>
+          <button class="join-btn pre">等待开奖</button>
         </template>
         <template v-else>
           <div class="btn-mask"></div>

components/Lottery/Timing/Main.vue

@@ -147,6 +147,7 @@ export default {
             this.isBtnLoading = false
           } else {
             this.$toast.fail(errorMessage)
+            this.isBtnLoading = false
           }
         })
       }

components/Lottery/Timing/MiniMain.vue

@@ -156,6 +156,7 @@ export default {
             this.isBtnLoading = false
           } else {
             this.$toast.fail(errorMessage)
+            this.isBtnLoading = false
           }
         })
       }