Browse Source

Merge branch 'release/v5.5' of Software/android-cloud-H5 into master

huangxiaojing 2 years ago
parent
commit
3e0f985f57
30 changed files with 1137 additions and 40 deletions
  1. BIN
      assets/image/activity/double-eleven/advantage.png
  2. BIN
      assets/image/activity/double-eleven/bj.png
  3. BIN
      assets/image/activity/double-eleven/bj2.png
  4. BIN
      assets/image/activity/double-eleven/blacktechnology.png
  5. BIN
      assets/image/activity/double-eleven/btn-bj.png
  6. BIN
      assets/image/activity/double-eleven/btn.png
  7. BIN
      assets/image/activity/double-eleven/btn2.png
  8. BIN
      assets/image/activity/double-eleven/close.png
  9. BIN
      assets/image/activity/double-eleven/collect.png
  10. BIN
      assets/image/activity/double-eleven/couponbj.png
  11. BIN
      assets/image/activity/double-eleven/default.png
  12. BIN
      assets/image/activity/double-eleven/game.png
  13. BIN
      assets/image/activity/double-eleven/head.png
  14. BIN
      assets/image/activity/double-eleven/icon.png
  15. BIN
      assets/image/activity/double-eleven/nocoupon.png
  16. BIN
      assets/image/logo.png
  17. 559 0
      pages/activity/doubleEleven/index.vue
  18. 513 0
      pages/activity/doubleEleven/pc.vue
  19. 35 39
      pages/activity/invite-user/index.vue
  20. BIN
      static/androidscloudH5/image/39ce1a05e2bb4fb0833a4ff9c55511f3.png
  21. BIN
      static/favicon.ico
  22. BIN
      static/microserviceUserH5/static/img/beeMans/logo.png
  23. BIN
      static/microserviceUserH5/static/img/company/favicon2.ico
  24. BIN
      static/microserviceUserH5/static/img/company/logo_pic.png
  25. BIN
      static/microserviceUserH5/static/img/exchangePhoneActivity/logo.png
  26. BIN
      static/microserviceUserH5/static/img/favicon2.ico
  27. BIN
      static/microserviceUserH5/static/offImg/favicon2.ico
  28. 2 1
      static/microserviceUserH5/vcloud/agreement.html
  29. 14 0
      static/screenAndroid/WXtrialInterface.html
  30. 14 0
      static/screenIos/WXtrialInterface.html

BIN
assets/image/activity/double-eleven/advantage.png


BIN
assets/image/activity/double-eleven/bj.png


BIN
assets/image/activity/double-eleven/bj2.png


BIN
assets/image/activity/double-eleven/blacktechnology.png


BIN
assets/image/activity/double-eleven/btn-bj.png


BIN
assets/image/activity/double-eleven/btn.png


BIN
assets/image/activity/double-eleven/btn2.png


BIN
assets/image/activity/double-eleven/close.png


BIN
assets/image/activity/double-eleven/collect.png


BIN
assets/image/activity/double-eleven/couponbj.png


BIN
assets/image/activity/double-eleven/default.png


BIN
assets/image/activity/double-eleven/game.png


BIN
assets/image/activity/double-eleven/head.png


BIN
assets/image/activity/double-eleven/icon.png


BIN
assets/image/activity/double-eleven/nocoupon.png


BIN
assets/image/logo.png


+ 559 - 0
pages/activity/doubleEleven/index.vue

@@ -0,0 +1,559 @@
+<template>
+  <div>
+    <img src="~/assets/image/activity/double-eleven/head.png" width="100%">
+  <div class="double-eleven">
+    <van-overlay :show="login" style="background: transparent;">
+      <div class="wrapper">
+        <div class="wrapper-login">
+          请先登录
+        </div>
+      </div>
+    </van-overlay>
+      <div class="double-eleven-container">
+
+        <div class="default" v-if="!couponsList.length">
+          <img src="~/assets/image/activity/double-eleven/couponbj.png" width="100%" >
+          <div class="default-img" >
+            <img src="~/assets/image/activity/double-eleven/default.png" >
+            暂无优惠券哦~
+          </div>
+        </div>
+         <!-- <div class="coupon" >
+          <div class="let-title">
+            <div><span>7</span>折</div>
+            <div>折扣券</div>
+          </div>
+          <div class="content">
+            <div class="title">月卡套餐7折优惠券</div>
+            <div class="tips">满90元可用,优惠券有效期<span style="color:#D358A8">3</span>天</div>
+            <div class="number">剩余数量:2893张</div>
+          </div>
+          <div class="btn" @click="receiveCouponRewards({id:11})"></div>
+        </div> -->
+
+        <div class="coupon" v-for="item in couponsList" :key="item.id">
+          <!-- <div class="icon">{{item.couponName}}</div> -->
+          <!-- 类型(1.抵扣券 2.折扣券 3.红包券)" -->
+          <div class="let-title">
+            <div  v-if="item.couponType===1">¥<span>{{item.couponValue}}</span></div>
+            <div  v-else><span>{{item.deductionPrice}}</span>折</div>
+            <div v-if="item.maxValue" class="maxValue">满{{ item.maxValue }}元减</div>
+            <div v-else class="maxValue">{{ item.useThreshold }}</div>
+          </div>
+
+
+          <div class="content">
+            <div class="title">{{item.couponName}}</div>
+            <div class="tips">{{item.couponExplain}}</div>
+            <div class="number">剩余数量:{{item.remainder}}张</div>
+          </div>
+          <div v-if="item.receivingStatus===1" class="btn" @click="receiveCouponRewards(item)"></div>
+          <div v-else-if="item.receivingStatus===2" class="btn-collect"></div>
+          <div v-else-if="item.receivingStatus===3" class="btn-nocoupon"></div>
+        </div>
+
+       
+
+      <img src="~/assets/image/activity/double-eleven/game.png" width="100%" style="margin-top:30px">
+      <img src="~/assets/image/activity/double-eleven/blacktechnology.png" width="100%">
+      <img src="~/assets/image/activity/double-eleven/advantage.png" width="100%">
+      </div>
+  </div>
+
+  <van-popup v-model="show" style="background: transparent;" :close-on-click-overlay="false">
+         <div class="popup-container">
+          <div class="coupon">
+            <div class="let-title">
+            <div v-if="coupons.couponType===1">¥<span>{{coupons.couponValue}}</span></div>
+            <div v-else><span>{{coupons.deductionPrice}}</span>折</div>
+            <div v-if="coupons.maxValue" class="maxValue">满{{ coupons.maxValue }}元减</div>
+            <div v-else class="maxValue">{{ coupons.useThreshold }}</div>
+           </div>
+
+              <div class="content">
+                <div class="title">{{coupons.couponName}}</div>
+                <div class="tips">{{coupons.couponExplain}}</div>
+                <div class="number">有效期:{{coupons.validityPeriod}}</div>
+              </div>
+          </div>
+
+            <!-- <div class="coupon" >
+              <div class="let-title">
+                <div><span>7</span>折</div>
+                <div class="maxValue">满5000元减</div>
+              </div>
+              <div class="content">
+                <div class="title">月卡套餐7折优惠券</div>
+                <div class="tips">满90元可用,优惠券有效期<span style="color:#D358A8">3</span>天</div>
+                <div class="number">剩余数量:2893张</div>
+              </div>
+            </div> -->
+
+
+          <img src="~/assets/image/activity/double-eleven/btn2.png" width="100%"  @click="goOrder">
+         </div>
+
+            <div class="coupon-tips">优惠券可在【我的】-【卡券】内查看</div>
+            <img src="~/assets/image/activity/double-eleven/close.png" class="close" @click="show=false"/>
+         </van-popup>
+</div>
+</template>
+
+<script>
+import { Toast } from 'vant';
+const webUni = require('../../../plugins/uni');
+export default {
+  name: 'doubleEleven',
+  auth: false,
+  components: {
+  },
+  data() {
+    return {
+      show:false,
+      coupons:{},
+      login:false,
+      loading:false,
+      couponsList:[],
+      token:'',
+      client:''
+    };
+  },
+  async fetch() {
+    if (this.$route.query.type === 'pc') {
+      this.$router.push({ path: '/activity/doubleEleven/pc', query: { token: this.$route.query.token, type: 'pc' } })
+      return
+    }
+    if (this.$userAgent.isSzx && this.$userAgent.isAndroid) {
+      this.token = await window.native.getToken();
+    } else if (this.$userAgent.isSzx && this.$userAgent.isIos) {
+      window.webkit.messageHandlers.getToken.postMessage('获取token');
+
+     let _this = this
+      window.getIosToken=(token) => {
+      _this.token = token
+      resolve();
+      };
+    }else if(this.$route.query.token && this.$route.query.token != 'needToken'){
+      this.token = this.$route.query.token;
+    }
+
+    this.getCoupons()
+
+    if (this.$userAgent.isSzx && this.$userAgent.isAndroid) {
+      this.client = 1;
+    } else if (this.$userAgent.isSzx && this.$userAgent.isIos) {
+      this.client = 2;
+    } else if (this.$userAgent.isMiniProgram) {
+      this.client = 5;
+    } else {
+      this.client = 7;
+    }
+
+    this.visit()
+
+  },
+  head: {
+    title: '双十一 大额优惠券免费领',
+  },
+  created() {
+    // const _this = this
+    // setInterval(() => {
+    //   _this.getCoupons()
+    // }, 600000);
+  },
+  methods: {
+    visit() {
+      this.$axios.$post('/user/v5/userAccess/user/visit', 
+        {
+          loginType: this.token ? 1 : 2,
+          accessType: 13
+        },
+      );
+    },
+    goOrder()
+    {
+      const productId = !this.coupons.products || this.coupons.products.split(',').length > 1 ? -1 : parseInt(this.coupons.products)
+        if (this.$route.query.type === 'pc') {
+          window.vgeminipc.startPhoneMeal(productId)
+        } else if (this.$userAgent.isSzx && this.$userAgent.isAndroid) {
+          window.native.startPurchasePage(productId);
+        } else if (this.$userAgent.isSzx && this.$userAgent.isIos) {
+          window.webkit.messageHandlers.activity202211.postMessage({productId});
+        } else if (this.$userAgent.isMiniProgram) {
+          this.$wx.miniProgram.navigateTo({
+            url:
+              '/packageA/order/buy/index',
+          });
+        } else {
+          webUni.webView.navigateTo({
+            url: '/pages/order/order?productId=' + productId
+          });
+        }
+    },
+    async getCoupons()
+    {
+      const res = await this.$axios.$post('/activity/v5/couponActivity/getCouponActivityInfo', {},
+      { headers: { Authorization: this.token }});
+      if(res.status === 0)
+      {
+        res.data.forEach(element => {
+          if(element.receivingStatus !== 3)
+          {
+             element.remainder = element.remainder
+          }
+        });
+        this.couponsList = res.data;
+      }
+   
+
+    },
+    async receiveCouponRewards(row)
+    {
+      if(!this.token)
+        {
+          this.login = true
+          const _this = this
+          // setTimeout(() => {window.location.href='https://client.phone.androidscloud.com/cloud/phone/web/#/pages/login/index';_this.login = false},1000);
+
+          setTimeout(() => {window.location.href='https://prese.phone.androidscloud.com/cloud/phone/web/#/pages/index/index';_this.login = false},1000);
+          
+          return
+        }
+    
+      if(this.loading) return
+      this.loading = true
+      Toast.loading({ duration: 0, forbidClick: true,});
+        
+      try {
+          const data = { goodsId: row.id, };
+          const res = await this.$axios.$get('/activity/v5/couponActivity/receiveCouponRewards',{ params: { goodsId:row.id} ,headers: { Authorization: this.token }});
+
+           if(res.status === 0)
+           {
+             this.coupons = res.data
+             this.show = true
+           }
+           else{
+            Toast({
+              message: res.msg, 
+              position: 'top',
+              duration: 4000,
+            });
+          }
+
+
+          await this.getCoupons()
+          this.loading = false
+          Toast.clear();
+
+          }catch (error) {
+            Toast.clear();
+            this.loading = false
+            // await this.getCoupons()
+            Toast({
+              message: error.message,
+              position: 'top',
+              duration: 4000,
+            });
+          }
+
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.double-eleven{
+  background-image: url('../../../assets/image/activity/double-eleven/bj.png');
+  background-size: cover;
+  background-repeat: round;
+  min-height: 100vh;
+  overflow: hidden;
+  margin: 0 auto;
+  margin-top: -1px;
+}
+img{
+  display: block;
+}
+.double-eleven-container{
+ padding: 10px;
+ img{
+  margin-bottom: 30px;
+ }
+}
+
+.coupon{
+  width: 100%;
+  height: 105px;
+  background: #FDFFFD;
+  box-shadow: 0px 11px 12px 0px rgba(255,121,168,0.46);
+  border-radius: 12px;
+  margin-bottom: 10px;
+  // padding: 18px 10px 8px 10px;
+
+  .icon{
+    width: 70px;
+    height: 70px;
+    background: url('../../../assets/image/activity/double-eleven/icon.png') no-repeat;
+    background-size: 100% 100%;
+    line-height: 70px;
+    text-align: center;
+    font-size: 10px;
+    font-family: Yuanti SC;
+    font-weight: bold;
+    color: #F0F3FC;
+    display: inline-block;
+    margin-right: 5px;
+    vertical-align: top;
+  }
+
+  .let-title{
+    width: 100px;
+    height: 105px;
+    display: inline-block;
+    background: #F6E1E1;
+    font-size: 20px;
+    font-family: Source Han Sans;
+    font-weight: bold;
+    color: #F04545;
+    text-align: center;
+    padding: 16px 0;
+    border-radius: 12px 0 0 12px;
+    vertical-align: top;
+    span{
+      font-size: 24px;
+    }
+    .maxValue{
+      font-size: 17px;
+    }
+  }
+
+  .content{
+    width: calc(100% - 180px);
+    height: 105px;
+    display: inline-block;
+    // margin-top: -2px;
+    // margin-left: 5px;
+    padding: 10px 5px;
+   
+    .title{
+        font-size: 12px;
+        font-family: Source Han Sans CN;
+        font-weight: 800;
+        color: #333333;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+    .tips{
+      font-size: 10px;
+      font-family: Source Han Sans CN;
+      font-weight: 400;
+      color: #333333;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      line-height: 25px;
+    }
+
+    .number{
+      margin-top: 5px;
+      height: 20px;
+      line-height: 20px;
+      background: linear-gradient(90deg, #FF4BD3, #7492FE);
+      font-size: 10px;
+      font-family: Source Han Sans CN;
+      font-weight: 400;
+      color: #FFFFFF; 
+      padding: 0 5px;
+      width: fit-content;
+      margin-top: 3px;
+      // display: block;
+    }
+
+  }
+  .btn{
+    width: 60px;
+    height: 60px;
+    background: url('../../../assets/image/activity/double-eleven/btn.png') no-repeat;
+    background-size: 100% 100%;
+    line-height: 80px;
+    text-align: center;
+    font-size: 15px;
+    font-family: Yuanti SC;
+    font-weight: bold;
+    color: #F0F3FC;
+    display: inline-block;
+    margin-left: 2px;
+    vertical-align: top;
+    margin-top: 23px;
+    // vertical-align: initial;
+    // display: inline-block;
+    // vertical-align:text-bottom;
+    // float:right;
+  }
+  .btn-collect{
+    width: 60px;
+    height: 60px;
+    background: url('../../../assets/image/activity/double-eleven/collect.png') no-repeat;
+    background-size: 100% 100%;
+    line-height: 80px;
+    text-align: center;
+    font-size: 15px;
+    font-family: Yuanti SC;
+    font-weight: bold;
+    color: #F0F3FC;
+    display: inline-block;
+    margin-left: 2px;
+    vertical-align: top;
+    margin-top: 23px;
+  }
+
+  .btn-nocoupon{
+    width: 60px;
+    height: 60px;
+    background: url('../../../assets/image/activity/double-eleven/nocoupon.png') no-repeat;
+    background-size: 100% 100%;
+    line-height: 80px;
+    text-align: center;
+    font-size: 15px;
+    font-family: Yuanti SC;
+    font-weight: bold;
+    color: #F0F3FC;
+    display: inline-block;
+    margin-left: 2px;
+    vertical-align: top;
+    margin-top: 23px;
+  }
+}
+
+
+.popup-container{
+  width: 295px;
+  height: 407px;
+  background: url('../../../assets/image/activity/double-eleven/bj2.png') no-repeat;
+  background-size: 100% 100%;
+  padding-top: 210px;
+  padding-left: 20px;
+  padding-right: 20px;
+
+  .coupon{
+    width: 255px;
+    height: 95px;
+    margin-bottom: 20px;
+    .let-title{
+    width: 90px;
+    height: 95px;
+    display: inline-block;
+    background: #F6E1E1;
+    font-size: 18px;
+    font-family: Source Han Sans;
+    font-weight: bold;
+    color: #F04545;
+    text-align: center;
+    padding: 16px 0;
+    border-radius: 12px 0 0 12px;
+    vertical-align: top;
+    span{
+      font-size: 20px;
+    }
+    .maxValue{
+      font-size: 14px;
+    }
+  }
+    .content{
+      width: calc(100% - 100px);
+      margin-bottom: 25px;
+              .title{
+                  font-size: 14px !important; 
+                  font-family: Source Han Sans CN;
+                  font-weight: 800;
+                  color: #333333;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  white-space: nowrap;
+                  line-height: 23px;
+                
+              }
+            .tips{
+              font-size: 12px;
+              font-family: Source Han Sans CN;
+              font-weight: 400;
+              color: #333333;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              line-height: 20px;
+            }
+
+            .number{
+              margin-top: 7px;
+              height: 15px;
+              line-height: 15px;
+              background: linear-gradient(90deg, #FF4BD3, #7492FE);
+              font-size: 12px;
+              font-family: Source Han Sans CN;
+              font-weight: 400;
+              color: #FFFFFF; 
+              padding: 0 5px;
+              width: fit-content;
+            }
+
+    }
+  }
+}
+
+.coupon-tips{
+  font-size: 14px;
+  font-family: Source Han Sans CN;
+  font-weight: 400;
+  color: #FFFFFF;
+  line-height: 30px;
+  width: 100%;
+  text-align: center;
+  margin-top: 5px;
+}
+.close{
+    margin-top: 15px;
+    margin-left: calc(50% - 22px);
+    width: 44px;
+  }
+
+
+  .wrapper {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+  }
+
+  .wrapper-login{
+    width: 150px;
+    height: 40px;
+    background: #000000;
+    opacity: 0.6;
+    border-radius: 45px;
+    color: #ffffff;
+    line-height: 40px;
+    text-align:center;
+  }
+
+  .login{
+    background-color:transparent;
+  }
+  .default{
+    width:100%;
+    position: relative;
+    border-radius: 24px;
+    .default-img{
+      position: absolute;
+      top: calc(50% - 50px);
+      left: calc(50% - 50px);
+      color: #333;
+      img {
+        width: 100px;
+        margin-bottom: 20px;
+      }
+    }
+  }
+</style>

+ 513 - 0
pages/activity/doubleEleven/pc.vue

@@ -0,0 +1,513 @@
+<template>
+    <div class="double-eleven">
+      <img src="~/assets/image/activity/double-eleven/head.png" width="100%">
+    <div class="double-eleven-body">
+      <van-overlay :show="login" style="background: transparent;">
+        <div class="wrapper">
+          <div class="wrapper-login">
+            请先登录
+          </div>
+        </div>
+      </van-overlay>
+        <div class="double-eleven-container">
+
+          <div class="default" v-if="!couponsList.length">
+          <img src="~/assets/image/activity/double-eleven/couponbj.png" width="100%" >
+          <div class="default-img" >
+            <img src="~/assets/image/activity/double-eleven/default.png" >
+            暂无优惠券哦~
+          </div>
+          </div>
+  
+           <!-- <div class="coupon" >
+            <div class="let-title">
+              <div><span>7</span>折</div>
+              <div>折扣券</div>
+            </div>
+            <div class="content">
+              <div class="title">月卡套餐7折优惠券</div>
+              <div class="tips">满90元可用,优惠券有效期<span style="color:#D358A8">3</span>天</div>
+              <div class="number">剩余数量:2893张</div>
+            </div>
+            <div class="btn" @click="receiveCouponRewards({id:11})"></div>
+          </div> -->
+  
+          <div class="coupon" v-for="item in couponsList" :key="item.id">
+            <!-- <div class="icon">{{item.couponName}}</div> -->
+            <div class="let-title">
+              <div  v-if="item.couponType===1">¥<span>{{item.couponValue}}</span></div>
+              <div  v-else><span>{{item.deductionPrice}}</span>折</div>
+              <div v-if="item.maxValue" class="maxValue">满{{ item.maxValue }}元减</div>
+              <div v-else class="maxValue">{{ item.useThreshold }}</div>
+            </div>
+            <div class="content">
+              <div class="title-coupon">{{item.couponName}}</div>
+              <div class="tips">{{item.couponExplain}}</div>
+              <div class="number">剩余数量:{{item.remainder}}张</div>
+            </div>
+            <div v-if="item.receivingStatus===1" class="btn" @click="receiveCouponRewards(item)"></div>
+            <div v-else-if="item.receivingStatus===2" class="btn-collect"></div>
+            <div v-else-if="item.receivingStatus===3" class="btn-nocoupon"></div>
+          </div>
+  
+         
+  
+        <img src="~/assets/image/activity/double-eleven/game.png" width="100%" style="margin-top:30px">
+        <img src="~/assets/image/activity/double-eleven/blacktechnology.png" width="100%">
+        <img src="~/assets/image/activity/double-eleven/advantage.png" width="100%">
+        </div>
+    </div>
+  
+    <van-popup v-model="show" style="background: transparent;" :close-on-click-overlay="false">
+           <div class="popup-container">
+            <div class="coupon">
+              <div class="let-title">
+                <div v-if="coupons.couponType===1">¥<span>{{coupons.couponValue}}</span></div>
+                <div v-else><span>{{coupons.deductionPrice}}</span>折</div>
+                <div v-if="coupons.maxValue" class="maxValue">满{{ coupons.maxValue }}元减</div>
+                <div v-else class="maxValue">{{ coupons.useThreshold }}</div>
+              </div>
+                <div class="content">
+                  <div class="title-coupon">{{coupons.couponName}}</div>
+                  <div class="tips">{{coupons.couponExplain}}</div>
+                  <div class="number">有效期:{{coupons.validityPeriod}}</div>
+                </div>
+            </div>
+  
+              <!-- <div class="coupon" >
+                <div class="let-title">
+                  <div><span>7</span>折</div>
+                  <div class="maxValue">折扣券</div>
+                </div>
+                <div class="content">
+                  <div class="title-coupon">月卡套餐7折优惠券</div>
+                  <div class="tips">满90元可用,优惠券有效期<span style="color:#D358A8">3</span>天</div>
+                  <div class="number">剩余数量:2893张</div>
+                </div>
+              </div> -->
+  
+  
+            <img src="~/assets/image/activity/double-eleven/btn2.png" width="100%"  @click="goOrder">
+           </div>
+  
+              <div class="coupon-tips">优惠券可在【我的】-【卡券】内查看</div>
+              <img src="~/assets/image/activity/double-eleven/close.png" class="close" @click="show=false"/>
+           </van-popup>
+  </div>
+  </template>
+  
+  <script>
+  import { Toast } from 'vant';
+  export default {
+    name: 'doubleEleven',
+    auth: false,
+    components: {
+    },
+    data() {
+      return {
+        show:false,
+        coupons:{},
+        login:false,
+        loading:false,
+        couponsList:[],
+        token:'',
+        client:''
+      };
+    },
+    async fetch() {
+      if (this.$route.query.type === 'pc') {
+        this.token =  window.vgeminipc.getToken()
+      } else if(this.$route.query.token && this.$route.query.token != 'needToken'){
+        this.token = this.$route.query.token;
+      }
+  
+      this.getCoupons()
+  
+      if (this.$userAgent.isSzx && this.$userAgent.isAndroid) {
+        this.client = 1;
+      } else if (this.$userAgent.isSzx && this.$userAgent.isIos) {
+        this.client = 2;
+      } else if (this.$userAgent.isMiniProgram) {
+        this.client = 5;
+      } else {
+        this.client = 7;
+      }
+      this.visit()
+  
+    },
+    head: {
+      title: '双十一 大额优惠券免费领',
+    },
+    created() {
+      // const _this = this
+      // setInterval(() => {
+      //   _this.getCoupons()
+      // }, 600000);
+    },
+    methods: {
+    visit() {
+      this.$axios.$post('/user/v5/userAccess/user/visit', 
+        {
+          loginType: this.token ? 1 : 2,
+          accessType: 13
+        },
+      );
+    },
+      goOrder()
+      {
+        const productId = !this.coupons.products || this.coupons.products.split(',').length > 1 ? -1 : parseInt(this.coupons.products)
+        window.vgeminipc.startPhoneMeal(productId)
+      },
+      async getCoupons()
+      {
+        const res = await this.$axios.$post('/activity/v5/couponActivity/getCouponActivityInfo', {},
+        { headers: { Authorization: this.token }});
+        if(res.status === 0)
+        {
+          res.data.forEach(element => {
+            if(element.receivingStatus !== 3)
+            {
+              element.remainder = element.remainder
+            }
+          });
+          this.couponsList = res.data;
+        }
+    
+      },
+      async receiveCouponRewards(row)
+      {
+        if(!this.token)
+          {
+            this.login = true
+            const _this = this
+            // setTimeout(() => {window.location.href='http://client.phone.androidscloud.com/cloud/phone/web/#/pages/login/index';_this.login = false},1000);
+            setTimeout(() => {window.location.href='https://prese.phone.androidscloud.com/cloud/phone/web/#/pages/index/index';_this.login = false},1000);
+            return
+          }
+      
+        if(this.loading) return
+        this.loading = true
+        Toast.loading({ duration: 0, forbidClick: true,});
+          
+        try {
+            const data = { goodsId: row.id, };
+            const res = await this.$axios.$get('/activity/v5/couponActivity/receiveCouponRewards',{ params: { goodsId:row.id} ,headers: { Authorization: this.token }});
+             if(res.status === 0)
+             {
+               this.coupons = res.data
+               this.show = true
+             }
+             else{
+              Toast({
+                message: res.msg, 
+                position: 'top',
+                duration: 4000,
+              });
+            }
+  
+            await this.getCoupons()
+            this.loading = false
+            Toast.clear();
+  
+            }catch (error) {
+              Toast.clear();
+              this.loading = false
+              // await this.getCoupons()
+              Toast({
+                message: error.message,
+                position: 'top',
+                duration: 4000,
+              });
+            }
+  
+      }
+    },
+  };
+  </script>
+  
+  <style lang="scss" scoped>
+  @media (min-width: 0px) {
+  .double-eleven{
+    width: 400px;
+    position: relative;
+    overflow: hidden;
+    margin: 0 auto;
+  }
+  .double-eleven-body{
+    background-image: url('../../../assets/image/activity/double-eleven/bj.png');
+    background-size: cover;
+    background-repeat: round;
+    min-height: 100vh;
+    overflow: hidden;
+    margin: 0 auto;
+    margin-top: -1px;
+  }
+  img{
+    display: block;
+  }
+  .double-eleven-container{
+   padding: 10px;
+   img{
+    margin-bottom: 30px;
+   }
+  }
+  
+  .coupon{
+    width: 100%;
+    height: 100px;
+    background: #FDFFFD;
+    box-shadow: 0px 11px 12px 0px rgba(255,121,168,0.46);
+    border-radius: 12px;
+    margin-bottom: 10px;
+    display: flex;
+    // padding: 18px 10px 8px 10px;
+  
+  
+    .let-title{
+      width: 100px;
+      height: 100px;
+      display: inline-block;
+      background: #F6E1E1;
+      font-size: 24px;
+      font-family: Source Han Sans;
+      font-weight: bold;
+      color: #F04545;
+      text-align: center;
+      padding: 5px 0;
+      border-radius: 12px 0 0 12px;
+      vertical-align: top;
+      span{
+        font-size: 32px;
+      }
+      .maxValue{
+        font-size: 17px;
+      }
+    }
+  
+    .content{
+      width: calc(100% - 182px);
+      height: 50px;
+      display: inline-block;
+      // margin-top: -2px;
+      margin-left: 5px;
+      padding: 5px 5px;
+     
+      .title-coupon{
+          font-size: 24px !important;
+          font-family: Source Han Sans CN;
+          font-weight: 800;
+          color: #333333;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          line-height: 39px;
+      }
+      .tips{
+        font-size: 10px;
+        font-family: Source Han Sans CN;
+        font-weight: 400;
+        color: #333333;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        // line-height: 25px;
+      }
+  
+      .number{
+        margin-top: 5px;
+        height: 20px;
+        line-height: 20px;
+        background: linear-gradient(90deg, #FF4BD3, #7492FE);
+        font-size: 10px;
+        font-family: Source Han Sans CN;
+        font-weight: 400;
+        color: #FFFFFF; 
+        padding: 0 5px;
+        width: fit-content;
+        // display: block;
+      }
+  
+    }
+    .btn{
+      width: 60px;
+      height: 60px;
+      background: url('../../../assets/image/activity/double-eleven/btn.png') no-repeat;
+      background-size: 100% 100%;
+      line-height: 80px;
+      text-align: center;
+      font-size: 15px;
+      font-family: Yuanti SC;
+      font-weight: bold;
+      color: #F0F3FC;
+      display: inline-block;
+      margin-left: 2px;
+      margin-top: 19px;
+    }
+    .btn-collect{
+      width: 60px;
+      height: 60px;
+      background: url('../../../assets/image/activity/double-eleven/collect.png') no-repeat;
+      background-size: 100% 100%;
+      line-height: 80px;
+      text-align: center;
+      font-size: 15px;
+      font-family: Yuanti SC;
+      font-weight: bold;
+      color: #F0F3FC;
+      display: inline-block;
+      margin-left: 2px;
+      margin-top: 19px;
+    }
+  
+    .btn-nocoupon{
+      width: 60px;
+      height: 60px;
+      background: url('../../../assets/image/activity/double-eleven/nocoupon.png') no-repeat;
+      background-size: 100% 100%;
+      line-height: 80px;
+      text-align: center;
+      font-size: 15px;
+      font-family: Yuanti SC;
+      font-weight: bold;
+      color: #F0F3FC;
+      display: inline-block;
+      margin-left: 2px;
+      margin-top: 19px;
+    }
+  }
+  
+  
+  .popup-container{
+    width: 295px;
+    height: 407px;
+    background: url('../../../assets/image/activity/double-eleven/bj2.png') no-repeat;
+    background-size: 100% 100%;
+    padding-top: 210px;
+    padding-left: 20px;
+    padding-right: 20px;
+  
+    .coupon{
+      width: 255px;
+      height: 95px;
+      margin-bottom: 20px;
+      .let-title{
+      width: 90px;
+      height: 95px;
+      display: inline-block;
+      background: #F6E1E1;
+      font-size: 18px;
+      font-family: Source Han Sans;
+      font-weight: bold;
+      color: #F04545;
+      text-align: center;
+      padding: 16px 0;
+      border-radius: 12px 0 0 12px;
+      vertical-align: top;
+      span{
+        font-size: 24px;
+      }
+      .maxValue{
+        font-size: 14px;
+      }
+    }
+      .content{
+        width: calc(100% - 100px);
+        margin-bottom: 25px;
+        margin-right: 5px;
+                .title-coupon{
+                    font-size: 21px !important; 
+                    font-family: Source Han Sans CN;
+                    font-weight: 800;
+                    color: #333333;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                    line-height: 31px;
+                  
+                }
+              .tips{
+                font-size: 12px;
+                font-family: Source Han Sans CN;
+                font-weight: 400;
+                color: #333333;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                // line-height: 20px;
+              }
+  
+              .number{
+                margin-top: 7px;
+                height: 20px;
+                line-height: 20px;
+                background: linear-gradient(90deg, #FF4BD3, #7492FE);
+                font-size: 12px;
+                font-family: Source Han Sans CN;
+                font-weight: 400;
+                color: #FFFFFF; 
+                padding: 0 5px;
+                width: fit-content;
+              }
+  
+      }
+    }
+  }
+  
+  .coupon-tips{
+    font-size: 14px;
+    font-family: Source Han Sans CN;
+    font-weight: 400;
+    color: #FFFFFF;
+    line-height: 30px;
+    width: 100%;
+    text-align: center;
+    margin-top: 5px;
+  }
+  .close{
+      margin-top: 15px;
+      margin-left: calc(50% - 22px);
+      width: 44px;
+    }
+  
+  
+    .wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: 100%;
+    }
+  
+    .wrapper-login{
+      width: 150px;
+      height: 40px;
+      background: #000000;
+      opacity: 0.6;
+      border-radius: 45px;
+      color: #ffffff;
+      line-height: 40px;
+      text-align:center;
+    }
+  
+    .login{
+      background-color:transparent;
+    }
+
+    .default{
+    width:100%;
+    position: relative;
+    border-radius: 24px;
+    font-size: 14px;
+    .default-img{
+      position: absolute;
+      top: calc(50% - 60px);
+      left: calc(50% - 50px);
+      color: #333;
+      img {
+        width: 100px;
+        margin-bottom: 20px;
+      }
+    }
+  }
+}
+  </style>
+  

+ 35 - 39
pages/activity/invite-user/index.vue

@@ -2,10 +2,7 @@
   <v-container class="invite-user" fluid :class="`bg-${type}`">
     <activity-invite-user-box class="box1">
       <template #title>参与步骤</template>
-      <v-img
-        class="cybz-content"
-        :src="returnContent ? returnContent.img : null"
-      />
+      <v-img class="cybz-content" :src="returnContent ? returnContent.img : null" />
       <div class="cybz-content-text">
         <div class="cybz-content-text-item">分享好友</div>
         <div class="cybz-content-text-item">邀请购买云机</div>
@@ -14,22 +11,16 @@
         </div>
       </div>
       <v-btn class="share-button" rounded @click="share()">
-        <template v-if="!($userAgent.isSzx || $userAgent.isSzxBrowser)"
-          >复制链接</template
-        >分享好友
+        <template v-if="!($userAgent.isSzx || $userAgent.isSzxBrowser)">复制链接</template>分享好友
       </v-btn>
       <!-- <button @click="share()">邀请</button> -->
     </activity-invite-user-box>
     <activity-invite-user-box class="ox box2">
       <template #title>收益明细</template>
       <div class="grid grid-cols-2 gap-x-4 gap-y-8">
-        <div
-          v-for="(item, index) in dataList"
-          :key="index"
-          :class="{
+        <div v-for="(item, index) in dataList" :key="index" :class="{
             'col-span-2': index === 6,
-          }"
-        >
+          }">
           <div class="label text-sm">
             <span>{{ item.label }}</span>
           </div>
@@ -74,33 +65,18 @@
                 </td>
                 <td class="whitespace-nowrap break-normal">
                   <div class="flex">
-                    <span class="font-mono"
-                      >{{ item.activationCode | activationCodeMask }} </span
-                    ><span class="mx-1">|</span
-                    ><v-btn
-                      text
-                      small
-                      color="#991AD2"
-                      class="copy-btn"
-                      @click="copyCode(item)"
-                      >复制</v-btn
-                    >
+                    <span class="font-mono">{{ item.activationCode | activationCodeMask }} </span><span class="mx-1">|</span>
+                    <v-btn text small color="#991AD2" class="copy-btn" @click="copyCode(item)">复制</v-btn>
                   </div>
                 </td>
                 <td class="whitespace-nowrap break-normal text-right">
-                  <span v-if="item.activationUse" style="color: #dd1b0d"
-                    >已使用</span
-                  >
+                  <span v-if="item.activationUse" style="color: #dd1b0d">已使用</span>
                   <span v-else>未使用</span>
                 </td>
               </tr>
             </tbody>
           </table>
-          <div
-            v-if="myActivationCode.length"
-            v-intersect.quiet="codeLoadMoreIntersect"
-            class="flex item-center justify-center"
-          >
+          <div v-if="myActivationCode.length" v-intersect.quiet="codeLoadMoreIntersect" class="flex item-center justify-center">
             <!-- <v-progress-circular indeterminate  ></v-progress-circular> -->
             <v-btn :loading="codeIsLoading" text small>
               <template v-if="codeIsLoading">加载中</template>
@@ -145,6 +121,7 @@
 </template>
 
 <script>
+import { Toast } from 'vant';
 // import qs from 'qs';
 // import clipboard from 'clipboardy/browser';
 
@@ -153,7 +130,7 @@
 // import { getStarCoinOverview } from '~/api/activity/invite-user.js';
 // import { getContentByType } from '~/api/public/agreement.js';
 export default {
-  // auth: false,
+  auth: false,
   name: 'InviteUser',
   filters: {
     activationCodeMask(value) {
@@ -209,7 +186,10 @@ export default {
         this.type === 2 && this.getMyActivationCode(this.myCodeFrom),
       ]);
     } catch (error) {
-      this.$toast.error(error.message);
+      Toast({
+        message: error.message,
+        duration: 4000
+      });
     }
   },
   head: {
@@ -238,7 +218,7 @@ export default {
         },
       }[this.type];
     },
-    // contentImg() {
+    // contentImg() {.0
     //   return {
     //     1: require('@/assets/image/activity/invite-user/cybz-content@2x.png'),
     //     2: require('@/assets/image/activity/invite-user/cybz-content-2@2x.png'),
@@ -414,15 +394,31 @@ export default {
       // console.log(this);
       if (this.data.status !== 1) {
         if (this.data.status === 0) {
-          throw new Error('当前活动已过期');
+          Toast({
+            message: '当前活动已过期',
+            position: 'top'
+          });
+          return
         }
         if (this.data.status === 2) {
-          throw new Error('当前活动未开启');
+          Toast({
+            message: '当前活动未开启',
+            position: 'top'
+          });
+          return
         }
         if (this.data.status === 3) {
-          throw new Error('当前活动已结束');
+          Toast({
+            message: '当前活动已结束',
+            position: 'top'
+          });
+          return
         }
-        throw new Error('未知活动状态');
+        Toast({
+          message: '未知活动状态',
+          position: 'top'
+        });
+        return
       }
 
       this.$tongji.trackEvent('活动', '分享', '', 0);

BIN
static/androidscloudH5/image/39ce1a05e2bb4fb0833a4ff9c55511f3.png


BIN
static/favicon.ico


BIN
static/microserviceUserH5/static/img/beeMans/logo.png


BIN
static/microserviceUserH5/static/img/company/favicon2.ico


BIN
static/microserviceUserH5/static/img/company/logo_pic.png


BIN
static/microserviceUserH5/static/img/exchangePhoneActivity/logo.png


BIN
static/microserviceUserH5/static/img/favicon2.ico


BIN
static/microserviceUserH5/static/offImg/favicon2.ico


+ 2 - 1
static/microserviceUserH5/vcloud/agreement.html

@@ -47,9 +47,10 @@
       font-size: 0.27rem;
     }
 
-    p {
+    p, span, li, ul {
       font-size: 0.28rem;
       color: #333;
+      margin: 0;
     }
   </style>
 </head>

+ 14 - 0
static/screenAndroid/WXtrialInterface.html

@@ -575,6 +575,20 @@
             }, 3000);
             return;
           }
+          if (res.status === 5203) {
+            $.toast('正在排队中,请稍等', 'text');
+            setTimeout(() => {
+              quit();
+            }, 3000);
+            return;
+          }
+          if (res.status === 5204) {
+            $.toast('云机异常,正在为你重新分配云机', 'text');
+            setTimeout(() => {
+              quit();
+            }, 3000);
+            return;
+          }
           $('#countView').hide();
           $('.countdown-wrap').hide();
           downline();

+ 14 - 0
static/screenIos/WXtrialInterface.html

@@ -596,6 +596,20 @@
             }, 3000);
             return;
           }
+          if (res.status === 5203) {
+            $.toast('正在排队中,请稍等', 'text');
+            setTimeout(() => {
+              quit();
+            }, 3000);
+            return;
+          }
+          if (res.status === 5204) {
+            $.toast('云机异常,正在为你重新分配云机', 'text');
+            setTimeout(() => {
+              quit();
+            }, 3000);
+            return;
+          }
           $('#countView').hide();
           $('.countdown-wrap').hide();
           downline();