alter

pages/welfare-community/list.vue

@@ -16,7 +16,7 @@
     <van-popup v-model="showVideoSuccess" position="top" style="background: transparent;color: #999;" :close-on-click-overlay="false">
       <div class="w290h215 dialog-view">
         <div class="txt3">恭喜您获得礼包</div>
-        <van-icon name="cross" color="#999999" size="15" class="icon-close" @click="showVideoSuccess=false" />
+        <van-icon name="cross" color="#999999" size="15" class="icon-close" @click="showVideoSuccess         =         false" />
         <div class="txt4">请在游戏中兑换<br />激活码为：{{ gameActivationCode }}。<span class="c3B86FF" @click="copyCode()">复制</span></div>
         <div class="buy-btn" @click="order('showVideoSuccess')">购买云机</div>
       </div>
@@ -33,7 +33,7 @@
     <van-popup v-model="showBuy" style="background: transparent;color: #999;" position="top" :close-on-click-overlay="false">
       <div class="w290h276 dialog-view">
         <div class="txt3">平台内下1单，立得惊喜礼包</div>
-        <van-icon name="cross" color="#999999" size="15" class="icon-close" @click="showBuy=false" />
+        <van-icon name="cross" color="#999999" size="15" class="icon-close" @click="showBuy         =         false" />
         <img class="w100h107" src="~/assets/image/activity/welfare-community/gift.png" alt="">
         <div class="buy-btn" style="margin:15px auto 0;" @click="order('showBuy')">下单得惊喜礼包</div>
       </div>
@@ -41,7 +41,7 @@
     <van-popup v-model="showBuySuccess" style="background: transparent;color: #999;" position="top" :close-on-click-overlay="false">
       <div class="w290h233 dialog-view">
         <div class="txt3">恭喜您获得礼包</div>
-        <van-icon name="cross" color="#999999" size="15" class="icon-close" @click="showBuySuccess=false" />
+        <van-icon name="cross" color="#999999" size="15" class="icon-close" @click="showBuySuccess         =         false" />
         <div class="txt4">请在游戏中兑换<br />激活码为：{{ gameActivationCode }}。<span class="c3B86FF" @click="copyCode()">复制</span></div>
         <div class="fsc mt20">
           <div class="fcc">
@@ -62,10 +62,11 @@
       </div>
     </van-popup>
     <van-popup v-model="showLogin" style="background: transparent;color: #999;" position="top" :close-on-click-overlay="false" @click-close-icon="returnUp">
-      <div class="w290h215 dialog-view">
+      <div class="w580h582">
+        <img class="w412h238" src="~/assets/image/activity/welfare-community/tip.png" />
         <van-icon name="cross" color="#999999" size="15" class="icon-close" @click="returnUp" />
-        <div class="txt3">领取礼包，请先<br />绑定手机号</div>
-        <div class="buy-btn" style="margin:30px auto 0;" @click="login">立即绑定</div>
+        <div class="txt6">领取礼包，请先绑定手机号</div>
+        <img class="buy-btn-2" src="~/assets/image/activity/welfare-community/btn.png" @click="login" />
       </div>
     </van-popup>
   </div>
@@ -160,6 +161,13 @@ export default {
     },
     async receive(item) {
       if (item.availableStatus === 2) {
+        this.gameActivationCode = item.gameActivationCode
+        if (item.buy === 1) {
+          this.showBuySuccess = true;
+        }
+        if (item.buy === 0) {
+          this.showVideoSuccess = true;
+        }
         return
       }
       if (item.availableStatus === 1) {
@@ -218,12 +226,12 @@ export default {
       try {
         const res = await this.$axios.$get('/activity/game/giftActivity/receiveGameGift?giftBagId=' + item.id, { headers: { Authorization: this.token } });
         this.gameActivationCode = res.data.gameActivationCode;
-        if (item.taskType === 1) {
-          this.showVideoSuccess = true;
-        }
-        if (item.taskType === 2) {
+        if (res.data.buy === 1) {
           this.showBuySuccess = true;
         }
+        if (res.data.buy === 0) {
+          this.showVideoSuccess = true;
+        }
       } catch (err) {
         if (err.response.data.status === 8500) {
           this.showBuy = true;
@@ -240,7 +248,12 @@ export default {
         const res = await this.$axios.$get('/activity/game/giftActivity/receiveGameGift?giftBagId=' + this.giftBagId, { headers: { Authorization: this.token } });
         this.gameActivationCode = res.data.gameActivationCode;
         this.getAppGameGiftActivityDetailsList();
-        this.showVideoSuccess = true;
+        if (res.data.buy === 1) {
+          this.showBuySuccess = true;
+        }
+        if (res.data.buy === 0) {
+          this.showVideoSuccess = true;
+        }
       } catch (err) {
         Toast({
           message: err.message,
@@ -261,11 +274,43 @@ export default {
   bottom: 70px;
 }
 
+.buy-btn-2 {
+  width: 207px;
+  height: 40px;
+  display: block;
+  margin: 27px auto 0;
+}
+.w580h582 {
+  width: 290px;
+  height: 291px;
+  background-color: #ffffff;
+  border-radius: 8px;
+  overflow: hidden;
+  margin: 188px auto 0;
+  position: relative;
+}
+
+.w412h238 {
+  width: 206px;
+  height: 119px;
+  display: block;
+  margin: 40px auto 17px;
+}
+
 .disabled {
-  background: #2B3C5C !important;
+  background: #2b3c5c !important;
   color: #999999 !important;
 }
 
+.txt6 {
+  height: 22px;
+  font-size: 16px;
+  font-weight: 500;
+  color: #363636;
+  line-height: 22px;
+  text-align: center;
+}
+
 .wh40 {
   width: 40px;
   height: 40px;
@@ -323,7 +368,7 @@ export default {
 }
 
 .dialog-view {
-  background: linear-gradient(360deg, #FFFFFF 0%, #DFEFFF 100%);
+  background: linear-gradient(360deg, #ffffff 0%, #dfefff 100%);
   box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.5);
   border-radius: 8px;
   position: relative;
@@ -364,7 +409,7 @@ export default {
 .buy-btn {
   width: 207px;
   height: 40px;
-  background: linear-gradient(90deg, #38AEFC 0%, #3B7FFF 100%);
+  background: linear-gradient(90deg, #38aefc 0%, #3b7fff 100%);
   border-radius: 20px;
   line-height: 40px;
   text-align: center;
@@ -408,6 +453,7 @@ export default {
   margin: 114px auto 0;
   width: 290px;
 }
+
 .icon-close {
   position: absolute;
   top: 20px;
@@ -417,7 +463,7 @@ export default {
 .gift-btn {
   width: 78px;
   height: 28px;
-  background: #3B7FFF;
+  background: #3b7fff;
   border-radius: 4px;
   font-size: 14px;
   color: #ffffff;
@@ -432,7 +478,7 @@ export default {
 
 .txt2 {
   font-size: 14px;
-  color: #CFD1D4;
+  color: #cfd1d4;
   line-height: 20px;
   margin-top: 5px;
 }
@@ -440,7 +486,7 @@ export default {
 .txt1 {
   font-size: 18px;
   font-weight: 500;
-  color: #CFD1D4;
+  color: #cfd1d4;
   line-height: 25px;
 }
 
@@ -468,8 +514,8 @@ export default {
 .m15 {
   margin: 15px;
   height: 83px;
-  background: #1E2022;
-  box-shadow: 0px 3px 7px 0px #1E2022;
+  background: #1e2022;
+  box-shadow: 0px 3px 7px 0px #1e2022;
   border-radius: 8px;
   display: flex;
   align-items: center;