huangxiaojing преди 2 години
родител
ревизия
d4914e9484
променени са 1 файла, в които са добавени 46 реда и са изтрити 13 реда
  1. 46 13
      pages/welfare-community/list.vue

+ 46 - 13
pages/welfare-community/list.vue

@@ -7,26 +7,26 @@
           <img class="wh56" :src="iconURL(item.giftBagFileKey)" alt="" />
         </div>
         <div class="ml12">
-          <div class="txt1">{{item.giftBagName.length > 8 ? item.giftBagName.slice(0, 8) + '...' : item.giftBagName}}</div>
-          <div class="txt2">{{item.giftBagDetailed}}</div>
+          <div class="txt1">{{         item.giftBagName.length > 8 ? item.giftBagName.slice(0, 8) + '...' : item.giftBagName         }}</div>
+          <div class="txt2">{{         item.giftBagDetailed         }}</div>
         </div>
       </div>
-      <div :class="item.availableStatus === 1 ? 'gift-btn disabled' : 'gift-btn'" @click="receive(item)">{{['领取', '已领完', '查看'][item.availableStatus]}}</div>
+      <div :class="item.availableStatus === 1 ? 'gift-btn disabled' : 'gift-btn'" @click="receive(item)">{{         ['领取', '已领完', '查看'][item.availableStatus]         }}</div>
     </div>
     <img class="w80h67" src="~/assets/image/activity/welfare-community/return.png" alt="" @click="returnUp">
     <van-popup v-model="showVideoSuccess" style="background: transparent;color: #999;" closeable close-icon-position="top-right" :close-on-click-overlay="false">
       <div class="w290h215 dialog-view">
         <div class="txt3">恭喜您获得礼包</div>
-        <div class="txt4">请在游戏中兑换<br />激活码为:{{gameActivationCode}}。<span class="c3B86FF">复制</span></div>
+        <div class="txt4">请在游戏中兑换<br />激活码为:{{         gameActivationCode         }}。<span class="c3B86FF">复制</span></div>
         <div class="buy-btn">购买云机</div>
       </div>
     </van-popup>
     <van-popup v-model="showAd" style="background: transparent;color: #999;" :close-on-click-overlay="false">
       <div v-for="(item, index) in adlist" :key="item.id">
         <div v-if="index === 0" class="fwc">
-          <div v-if="time" class="countdown">{{time}}s后关闭广告</div>
-          <video ref="videoPlayer" class="w290h330" src="https://file.phone.androidscloud.com:8121/document/newFile/download/0//d1cb3a61add6434b8954?fileKey=LowLevelMultipartUpload_23670475553534361666" :controls="false" :autoplay="false" :muted="true" :loop="false" @ended="ended" />
-          <van-icon name="close" color="#999999" size="34" style="margin:15px auto 0;" @click="showAd=false;getAppGameGiftActivityDetailsList()" />
+          <div v-if="time" class="countdown">{{         time         }}s后关闭广告</div>
+          <video ref="videoPlayer" class="w290h330" :src="item.adVideoBase.videoUrl" :controls="false" :autoplay="false" :muted="true" :loop="false" @ended="ended" />
+          <van-icon name="close" color="#999999" size="34" style="margin:15px auto 0;" @click="showAd         =         time >         0         ?         true         :         false;         getAppGameGiftActivityDetailsList()" />
         </div>
       </div>
     </van-popup>
@@ -40,7 +40,7 @@
     <van-popup v-model="showBuySuccess" style="background: transparent;color: #999;" closeable close-icon-position="top-right" :close-on-click-overlay="false">
       <div class="w290h233 dialog-view">
         <div class="txt3">恭喜您获得礼包</div>
-        <div class="txt4">请在游戏中兑换<br />激活码为:{{gameActivationCode}}。<span class="c3B86FF">复制</span></div>
+        <div class="txt4">请在游戏中兑换<br />激活码为:{{         gameActivationCode         }}。<span class="c3B86FF">复制</span></div>
         <div class="fsc mt20">
           <div class="fcc">
             <img class="wh40" src="~/assets/image/activity/welfare-community/icon_iphone@2x.png" alt="" />
@@ -54,7 +54,7 @@
           <img class="w12h10 mt15" src="~/assets/image/activity/welfare-community/arrow@2x.png" alt="">
           <div class="fcc">
             <img class="wh40" src="~/assets/image/activity/welfare-community/icon_xiazai@2x.png" alt="">
-            <span class="txt5">下载{{gameName}}游戏</span>
+            <span class="txt5">下载{{         gameName         }}游戏</span>
           </div>
         </div>
       </div>
@@ -62,7 +62,7 @@
     <van-popup v-model="showLogin" style="background: transparent;color: #999;" closeable close-icon-position="top-right" :close-on-click-overlay="false" @click-close-icon="returnUp">
       <div class="w290h215 dialog-view">
         <div class="txt3">领取礼包,请先<br />绑定手机号</div>
-        <div class="buy-btn" style="margin:30px auto 0;">立即绑定</div>
+        <div class="buy-btn" style="margin:30px auto 0;" @click="login">立即绑定</div>
       </div>
     </van-popup>
   </div>
@@ -113,6 +113,11 @@ export default {
         window.webkit.messageHandlers.order.postMessage({});
       }
     },
+    login() {
+      if (this.$userAgent.isSzx && this.$userAgent.isIos) {
+        window.webkit.messageHandlers.showLogin.postMessage({});
+      }
+    },
     ended() {
       this.showAd = false
       this.getAppGameGiftActivityDetailsList();
@@ -134,7 +139,7 @@ export default {
           this.showBuy = true
         }
         if (item.taskType === 1) {
-          this.adlist = await this.$axios.$post('/publics/v5/advertising/getAdInfoByAdPlace', { id: 1, adPlace: 2008, os: 1 }, { headers: { Authorization: this.token } });
+          this.adlist = await this.$axios.$post('/public/v5/advertising/getAdInfoByAdPlace', { id: 1, adPlace: 24, os: this.$userAgent.isAndroid ? 1 : 2 }, { headers: { Authorization: this.token } });
           this.showAd = true
           this.$nextTick(() => {
             this.$refs.videoPlayer.play();
@@ -192,6 +197,7 @@ export default {
   left: 0;
   bottom: 0;
 }
+
 .disabled {
   background: #2B3C5C !important;
   color: #999999 !important;
@@ -201,53 +207,64 @@ export default {
   width: 40px;
   height: 40px;
 }
+
 .mt20 {
   margin-top: 20px;
 }
+
 .fsc {
   display: flex;
   align-items: flex-start;
   justify-content: center;
 }
+
 .ml10 {
   margin-left: 10px;
 }
+
 .w12h10 {
   width: 12px;
   height: 10px;
 }
+
 .txt5 {
   font-size: 12px;
   color: #666666;
   margin-top: 3px;
 }
+
 .fcc {
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
 }
+
 .w100h107 {
   width: 100px;
   height: 107px;
   display: block;
   margin: 17px auto 0;
 }
+
 .w290h233 {
   width: 290px;
   height: 233px;
 }
+
 .w290h276 {
   width: 290px;
   height: 276px;
 }
+
 .dialog-view {
   background: linear-gradient(360deg, #FFFFFF 0%, #DFEFFF 100%);
-  box-shadow: 0px 2px 6px 0px rgba(0,0,0,0.5);
+  box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.5);
   border-radius: 8px;
   position: relative;
   overflow: hidden;
 }
+
 .countdown {
   width: 92px;
   height: 25px;
@@ -261,23 +278,27 @@ export default {
   line-height: 25px;
   color: #cccccc;
 }
+
 .mt15 {
   margin-top: 15px;
 }
+
 .fwc {
   display: flex;
   flex-direction: column;
   justify-content: center;
   position: relative;
 }
+
 .w290h330 {
   width: 290px;
   height: 330px;
 }
+
 .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;
@@ -286,9 +307,11 @@ export default {
   font-size: 16px;
   margin: 20px auto 0;
 }
+
 .c3B86FF {
   color: #3b86ff;
 }
+
 .txt4 {
   width: 290px;
   font-size: 14px;
@@ -297,6 +320,7 @@ export default {
   margin-top: 12px;
   text-align: center;
 }
+
 .txt3 {
   width: 290px;
   font-size: 18px;
@@ -306,10 +330,12 @@ export default {
   text-align: center;
   margin-top: 47px;
 }
+
 .w290h215 {
   width: 290px;
   height: 215px;
 }
+
 .gift-btn {
   width: 78px;
   height: 28px;
@@ -321,21 +347,25 @@ export default {
   text-align: center;
   justify-self: end;
 }
+
 .ml12 {
   margin-left: 12px;
 }
+
 .txt2 {
   font-size: 14px;
   color: #CFD1D4;
   line-height: 20px;
   margin-top: 5px;
 }
+
 .txt1 {
   font-size: 18px;
   font-weight: 500;
   color: #CFD1D4;
   line-height: 25px;
 }
+
 .wh60 {
   width: 60px;
   height: 60px;
@@ -344,16 +374,19 @@ export default {
   padding: 2px;
   box-sizing: border-box;
 }
+
 .wh56 {
   width: 56px;
   height: 56px;
   border-radius: 50%;
 }
+
 .bg101010 {
   background: #101010;
   min-height: 100vh;
   overflow: hidden;
 }
+
 .m15 {
   margin: 15px;
   height: 83px;