Browse Source

[edit][time]

zhangwei 3 years ago
parent
commit
13780affee
1 changed files with 6 additions and 8 deletions
  1. 6 8
      src/view/red-packet.vue

+ 6 - 8
src/view/red-packet.vue

@@ -172,7 +172,7 @@
           <div class="luck-content">
             <div class="luck-title" v-if="item.simpleUserInfoVO.nickName">{{ item.simpleUserInfoVO.nickName }}</div>
             <div class="luck-title" v-else>Twitter User</div>
-            <div class="luck-time">{{ moment(item.receiveTimestamp).format('MM-DD hh:mm:ss') }}</div>
+            <div class="luck-time">{{ moment(item.receiveTimestamp).format('MM-DD HH:mm:ss') }}</div>
           </div>
           <div class="luck-money">
             <img :src="require('../assets/svg/icon-dollar.svg')" alt />
@@ -390,25 +390,23 @@ function myReceivedState() {
       data.status = 'close'
       data.close_title = 'Better luck next time!'
     }
-  }
-  // 我领取未完成 and 大红包可以领取
-  if (data.detail.myReceived.taskFinishStatus == 0 && !data.detail.receiveTimeExpired) {
+
+  // 我领取未完成 
+  } else if (data.detail.myReceived.taskFinishStatus == 0 && data.detail.status == 1) {
     initTaskDetail()
     getValidity()
     data.detail.taskCondition = JSON.parse(data.detail.taskCondition)
     data.detail.amountValue = showLastTwoPlace(data.detail.amountValue)
     data.detail.receiveAmountValue = showLastTwoPlace(data.detail.receiveAmountValue)
-  }
 
   // 大红包不能领取了
-  if (data.detail.receiveTimeExpired) {
+  } else if (data.detail.receiveTimeExpired) {
     data.status = 'close'
     data.close_title = `This Giveaways`
     data.close_text = `expired on ${moment(data.detail.endTimestamp).format('MM-DD')}`
-  }
 
   // 我领取成功了
-  if (data.detail.myReceived.taskFinishStatus == 1) {
+  }else if (data.detail.myReceived.taskFinishStatus == 1) {
     data.status = 'success'
   }
 }