alter

pages/welfare-community/list.vue

@@ -16,7 +16,8 @@
     <van-popup v-model="showVideoSuccess" 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" />
+        <pre class="txt7">{{ giftBagDetailed }}</pre>
+        <van-icon name="cross" color="#999999" size="15" class="icon-close" @click="showVideoSuccess = false" />
         <div class="txt4">请在游戏中兑换<br />激活码为：{{ gameActivationCode | activationCodeMask }}。<span class="c3B86FF" @click="copyCode()">复制</span></div>
         <div class="buy-btn" @click="order('showVideoSuccess')">购买云机</div>
       </div>
@@ -32,8 +33,8 @@
     </van-popup>
     <van-popup v-model="showBuy" style="background: transparent;color: #999;" :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" />
+        <div class="txt3" style="margin-top: 47px;">平台内下1单，立得惊喜礼包</div>
+        <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 +42,8 @@
     <van-popup v-model="showBuySuccess" style="background: transparent;color: #999;" :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" />
+        <pre class="txt7">{{ giftBagDetailed }}</pre>
+        <van-icon name="cross" color="#999999" size="15" class="icon-close" @click="showBuySuccess = false" />
         <div class="txt4">请在游戏中兑换<br />激活码为：{{ gameActivationCode | activationCodeMask }}。<span class="c3B86FF" @click="copyCode()">复制</span></div>
         <div class="fsc mt20">
           <div class="fcc">
@@ -100,7 +102,8 @@ export default {
       gameActivationCode: '',
       adlist: [],
       time: 30,
-      timer: null
+      timer: null,
+      giftBagDetailed: ''
     }
   },
   head: {
@@ -179,6 +182,7 @@ export default {
       this.$router.push({ path: '/welfare-community', query: { token: this.$route.query.token, user: this.user } })
     },
     async receive(item) {
+      this.giftBagDetailed = item.giftBagDetailed.replace(/ /g, "\n");
       if (item.availableStatus === 2) {
         this.gameActivationCode = item.gameActivationCode
         if (item.buy === 1) {
@@ -285,6 +289,15 @@ export default {
 </script>
 
 <style scoped>
+.txt7 {
+  font-size: 14px;
+  font-weight: 500;
+  color: #3B7FFF;
+  line-height: 20px;
+  text-align: center;
+  margin: 20px auto;
+}
+
 .w80h67 {
   width: 80px;
   height: 67px;
@@ -299,6 +312,7 @@ export default {
   display: block;
   margin: 27px auto 0;
 }
+
 .w580h582 {
   width: 290px;
   height: 291px;
@@ -376,7 +390,7 @@ export default {
 
 .w290h233 {
   width: 290px;
-  height: 233px;
+  padding: 39px 0 26px;
 }
 
 .w290h276 {
@@ -456,14 +470,14 @@ export default {
   color: #363636;
   line-height: 25px;
   text-align: center;
-  margin-top: 47px;
 }
 
 .w290h215 {
   width: 290px;
-  height: 215px;
+  padding: 40px 0 30px;
   position: relative;
 }
+
 .icon-close {
   position: absolute;
   top: 20px;