[edit][bugs]

src/view/red-packet.vue

@@ -13,7 +13,7 @@
 
       <div class="list">
         <div class="item" v-for="item, i in data.detail.taskCondition" v-bind:key="i">
-          <template v-if="item.type == 1 && item.relatedUser && item.relatedUsers.length > 0">
+          <template v-if="item.type == 1 && item.relatedUsers && item.relatedUsers.length > 0">
             <div class="item-content">
               <div class="item-follow-title">
                 <img :src="require('../assets/svg/icon-follow.svg')" alt />
@@ -405,11 +405,10 @@ function init() {
         if (data.detail.myReceived) {
           data.status = 'opened'
           data.money = data.detail.myReceived.amountValue
-          
+
           // 我的红包已经过期了
           if (data.detail.myReceived.taskFinishStatus == 2) {
-            data.status = 'close'
-            data.close_title = res.msg
+            data.status = 'not-open'
           }
           // 我领取成功了
           if (data.detail.myReceived.taskFinishStatus == 1) {
@@ -424,20 +423,20 @@ function init() {
             data.detail.receiveAmountValue = showLastTwoPlace(data.detail.receiveAmountValue)
           }
 
-        // 我没有领取
+          // 我没有领取
         } else {
-          // 红包进行中
+          // 任务进行中
           if (data.detail.status == 1) {
             data.status = 'not-open'
 
-          // 红包已经结束了
-          }else if (data.detail.status == 2) {
+            // 任务已经结束了
+          } else if (data.detail.status == 2) {
             data.status = 'close'
             data.close_title = `This Giveways`
             data.close_text = `expired on ${moment(data.detail.endTimestamp).format('MM-DD')}`
           }
 
-          // 红包已经被领完了
+          // 任务已经被领完了
           if (data.detail.totalCount == data.detail.receiveCount) {
             data.status = 'close'
             data.close_title = 'Better luck next time!'
@@ -483,29 +482,7 @@ onMounted(() => {
 
 // 点击领取
 function clickOpenRedPacket() {
-  // getChromeStorage("userInfo", (_res) => {
-  //   // 1.没有登陆
-  //   if (!_res) {
-  //     // 2.查看cookie里是否有  
-  //     getChromeCookie(LANDING_PAGE, (res_arr) => {
-  //       // 
-  //       // if (res_arr.length > 0) {
-  //       //   let _res = res_arr.filter((item) => { return item.postId == data.postId })[0] || null
-  //       //   if (_res) {
-  //       //     data.status = 'opened'
-  //       //     data.money = _res.receiveAmount
-  //       //   }
-  //       // } else {
-
-  //       // }
-  //       // handleRedPacket()
-  //     })
-  //   } else {
-  //     handleRedPacket()
-  //   }
-  // })
   handleRedPacket()
-
 }
 
 function handleRedPacket() {
@@ -582,8 +559,8 @@ function handleFinishRedPacket() {
           for (let i in _data) {
             switch (_data[i].type.toString()) {
               case '1':
+                data.detail.taskCondition[0].relatedUsers = _data[i].detail
                 if (_data[i].finished) {
-                  data.detail.taskCondition[0].relatedUsers = _data[i].detail
                   data.done.follow = true
                 } else {
                   alert('关注未完成')
@@ -713,10 +690,10 @@ body {
 
     .header {
       text-align: center;
-      height: 120px;
+      height: 150px;
       width: 100%;
       background: #fff;
-      padding-top: 30px;
+      // padding-top: 30px;
       background-size: 100% 100%;
       position: relative;
 
@@ -754,6 +731,7 @@ body {
       }
 
       .title {
+        margin-top: 30px;
         color: #fff7e4;
         opacity: 0.6;
 
@@ -911,10 +889,10 @@ body {
 
     .header {
       text-align: center;
-      height: 120px;
+      height: 150px;
       width: 100%;
       background: #fff;
-      padding-top: 30px;
+      // padding-top: 30px;
       background-size: 100% 100%;
 
       .title {
@@ -925,6 +903,7 @@ body {
         font-size: 18px;
         line-height: 21px;
         letter-spacing: -0.3px;
+        margin-top: 30px;
       }
 
       .money {
@@ -1005,14 +984,16 @@ body {
 
           .item-follow-area {
             display: flex;
-            margin-bottom: 13px;
+            margin-bottom: 4px;
+            // flex-wrap: wrap;
 
             .item-follow {
               cursor: pointer;
               border: 1px solid #ebebeb;
               border-radius: 1000px;
-              height: 28px;
+              height: 26px;
               margin-right: 5px;
+              margin-bottom: 5px;
               display: flex;
               align-items: center;
 
@@ -1065,8 +1046,8 @@ body {
     .people {
       cursor: pointer;
       padding-left: 16px;
-      height: 44px;
-      line-height: 44px;
+      height: 38px;
+      line-height: 38px;
       background: #fff;
       border-bottom: 1px solid #f0f0f0;
       box-shadow: 0px 1px 0px #f2f2f2;
@@ -1110,7 +1091,7 @@ body {
     .footer {
       background: #ffffff;
       display: flex;
-      padding: 20px 22px 20px 17px;
+      padding: 19px 22px 19px 17px;
 
       .first {
         flex: 1;