heyang преди 3 години
родител
ревизия
aa612fb7b2
променени са 2 файла, в които са добавени 20 реда и са изтрити 14 реда
  1. 16 10
      microserviceUserH5/vcloud/actFission.html
  2. 4 4
      microserviceUserH5/vcloud/springFestivalActivity.html

+ 16 - 10
microserviceUserH5/vcloud/actFission.html

@@ -296,8 +296,8 @@
 								</div>
 							</div>
 							<div class="right-nav">
-								<p>星曜天卡</p>
-								<p class="btn" @click='goGetReward(item.id)' v-if='item.receiveStatus==0'>领取</p>
+								<p>{{item.phoneType === 'VIP'?'星动':item.phoneType === 'SVIP'?'星曜':'唔即'}}天卡</p>
+								<p class="btn" @click='goGetReward(item.id, item.phoneType)' v-if='item.receiveStatus==0'>领取</p>
 								<p class="btn isdisabled" v-if='item.receiveStatus==1'>已领取</p>
 
 							</div>
@@ -318,10 +318,10 @@
 					<div class="img-box">活动规则</div>
 				</div>
 				<div class="rule">
-					<p>1.分享双子星攻略文章至微信好友/微信朋友圈/QQ,好友注册成功后,分享者即可获得3天星曜套餐时长,被分享者可获得星曜7天卡激活码。</p>
+					<p>1.分享双子星攻略文章至微信好友/微信朋友圈/QQ,好友注册成功后,分享者即可获得3天{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}套餐时长,被分享者可获得{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}7天卡激活码。</p>
 					<p>2.用户通过该分享链接获取的激活码,只针对新注册用户有效领取并兑换一次。</p>
 					<p>3.分享者每日最多分享给10位好友领取激活码并获得注册奖励,且奖励为当日有效,奖励过期不补发。</p>
-					<p>4.分享者若没有云机,需要先创建星曜云机才可继续领取奖励。</p>
+					<p>4.分享者若没有云机,需要先创建{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}云机才可继续领取奖励。</p>
 					<p>5.新用户领取的激活码需在有效期内使用,若超过有效期则激活码失效。</p>
 				</div>
 			</div>
@@ -359,6 +359,7 @@
 				shareInfo: {},
 				defaultImg: 'this.src="' + "../static/offImg/tou.png" + '"',
 				actStatus: 0, //0活动状态 1开始
+				phoneType: '',
 				marqueeList: [],
 				timer: null,
 			},
@@ -368,11 +369,10 @@
 			mounted() {
 				this.getActDetailList(); //获取活动上下架
 				this.getMarquee(); //跑马灯
-
-
+				this.goReward('look');
 			},
 			methods: {
-				goReward() {
+				goReward(type) {
 
 					this.$toast.loading({
 						duration: 0,
@@ -383,6 +383,10 @@
 					getActDetailList(this.token).then(res => {
 						this.$toast.clear();
 						if (res.status === 0) {
+							if(type === 'look'){
+							    this.phoneType = res.data.phoneType;
+								return
+							}
 							this.actStatus = res.data.actStatus;
 							this.shareInfo = res.data;
 							if (this.actStatus != 1) {
@@ -460,6 +464,7 @@
 							this.total = res.data.total;
 							if (infolist) {
 								this.rewardList = this.rewardList.concat(infolist);
+								console.log(this.rewardList)
 								if (this.rewardList.length >= this.queryParams.pageSize) {
 									this.finishedText = '没有更多了'
 								}
@@ -500,15 +505,16 @@
 						}
 					})
 				},
-				goGetReward(id) {
+				goGetReward(id, phoneType) {
 					this.stopManyClick(() => {
 						getCheck(this.token).then(res => {
 							if (res.status === 0) {
 								if (isAndroid) {
-									window.native.activatePhone(1, id)
+									window.native.activatePhones(1, id, phoneType)
 								} else if (isIOS) {
 									window.webkit.messageHandlers.receive.postMessage({
-										"awardId": id
+										"awardId": id,
+										"phoneType": phoneType
 									});
 								}
 							} else if (res.status == 1) {

+ 4 - 4
microserviceUserH5/vcloud/springFestivalActivity.html

@@ -69,7 +69,7 @@
 				<div class="rule-point">1、活动期间购买获得的抽取资格不限次 数,已获得的抽取资格和未分配的抽取奖 励将在活动结束三天后失效,请在失效前 尽快抽取和分配奖励。</div>
 				<div class="rule-point">2、参与活动的套餐是星曜月卡与年卡套餐,其他套餐不参与活动。</div>
 				<div class="rule-point">3、星币、激活码购买的订单不参与本次活动,使用优惠券订单均可参与活动。</div>
-				<div class="rule-point">4、抽奖的奖励,系统默认优先新增云机,如账号上云机已超出上限数量,则可将抽奖的奖励时长自由分配到账号上任意一台云机上。</div>
+				<div class="rule-point">4、抽奖的奖励,系统默认优先新增云机,如账号上云机已超出上限数量,则可将抽奖的奖励时长自由分配到账号上任意一台星曜云机上。</div>
 				<div class="rule-point">5、本次活动购买的云手机套餐不支持退款。</div>
 				<div class="rule-point">6、双子星官方对活动具有最终解释权。</div>
 			</div>
@@ -423,7 +423,6 @@
 						if(list.length === 1){
 							$('.award-result-wrap')[0].className = 'card-wrap award-result-wrap one-result';
 							str = `<div class="card-item">
-								        <img class="light" src="../static/img/springFestivalActivity/light.gif?time=${new Date().getTime()}" />
 										<img class="one-card" src="../static/img/springFestivalActivity/${cardObj[list[0].duration]}.png" />
 										<div class="card-text">星曜${list[0].duration}卡</div>
 									</div> `
@@ -431,7 +430,6 @@
 							$('.award-result-wrap')[0].className = 'card-wrap award-result-wrap many-card-wrap'
 							for (let i = 0; i < list.length; i++) {
 								str += `<div class="card-item many-card-item">
-									        <img class="many-light" src="../static/img/springFestivalActivity/light.gif?time=${new Date().getTime()}" />
 											<img class="card many-card" src="../static/img/springFestivalActivity/${cardObj[list[i].duration]}.png" />
 										    <div class="card-text">星曜${list[i].duration}卡</div>
 										</div>`
@@ -441,7 +439,9 @@
 									if(imgNumber >= 4){
 										clearInterval(imgTimer2);
 									}
-									$('.many-light')[imgNumber].src = `../static/img/springFestivalActivity/light.gif?time=${new Date().getTime()}`;
+									// <img class="light" src="../static/img/springFestivalActivity/light.gif?time=${new Date().getTime()}" />
+									// <img class="many-light" src="../static/img/springFestivalActivity/light.gif?time=${new Date().getTime()}" />
+									// $('.many-light')[imgNumber].src = `../static/img/springFestivalActivity/light.gif?time=${new Date().getTime()}`;
 									imgNumber++;
 								},400)
 						}