heyang %!s(int64=3) %!d(string=hai) anos
pai
achega
f59c8dc2ca

+ 270 - 7
microserviceUserH5/static/css/anniversaryCelebrate.css

@@ -23,6 +23,7 @@ ul, li {
   width: 7.5rem;
   min-height: 100vh;
   background-color: rgba(22, 12, 31, 1);
+  padding-bottom: 0.34rem;
 }
 
 .rule-wrap{
@@ -63,6 +64,8 @@ ul, li {
   height: 3.88rem;
   margin: auto;
   margin-top: 1rem;
+  position: relative;
+  z-index: 99;
 }
 
 .star{
@@ -70,11 +73,75 @@ ul, li {
   height: 100%;
 }
 
+.out-point{
+  width: 0.2rem;
+  height: 0.2rem;
+  position: absolute;
+}
+
+.out-point1{
+  top: -0.1rem;
+  left: 2.78rem;
+}
+
+.out-point2{
+  top: 1.4rem;
+  left: 0.76rem;
+  
+}
+
+.out-point3{
+  bottom: 0;
+  left: 1.48rem;
+}
+
+.out-point4{
+  top: 1.4rem;
+  right: 0.76rem;
+}
+
+.out-point5{
+  bottom: 0;
+  right: 1.48rem;
+}
+
+.in-point{
+  width: 0.12rem;
+  height: 0.12rem;
+  position: absolute;
+}
+
+.in-point1{
+  top: 0.8rem;
+  left: 2.82rem;
+}
+
+.in-point2{
+  top: 1.6rem;
+  left: 1.62rem;
+}
+
+.in-point3{
+  bottom: 0.8rem;
+  left: 2.02rem;
+}
+
+.in-point4{
+  top: 1.6rem;
+  right: 1.62rem;
+}
+
+.in-point5{
+  bottom: 0.8rem;
+  right: 2.02rem;
+}
+
 .station-wrap{
   width: 7.05rem;
   height: 4.25rem;
   margin: auto;
   position: relative;
+  margin-top: -0.5rem;
 }
 
 .station{
@@ -101,10 +168,6 @@ ul, li {
   color: #FFFFFF;
 }
 
-.once-text{
-  opacity: 1;
-}
-
 .btn-list{
   width: 100%;
   position: absolute;
@@ -118,18 +181,24 @@ ul, li {
   height: 0.9rem;
 }
 
-.number-wrap{
+.award-get-wrap{
   width: 7.08rem;
   height: 2.02rem;
+  display: flex;
+  justify-content: space-between;
   background: #25244B;
   border-radius: 0.11rem;
+  margin: auto;
+}
+
+.number-wrap{
+  margin-left: 0.22rem;
   font-size: 0.28rem;
   color: #FFFFFF;
-  margin: auto;
 }
 
 .rest-times{
-  padding: 0.66rem 0 0 0.22rem;
+  padding-top: 0.66rem;
   font-size: 0.28rem;
   color: #FFFFFF;
 }
@@ -143,6 +212,200 @@ ul, li {
   height: 0.32rem;
 }
 
+.process-wrap{
+  display: flex;
+  align-items: center;
+  margin-top: 0.24rem;
+}
+
+.line-wrap{
+  width: 3.81rem;
+  height: 0.12rem;
+  background: linear-gradient(89deg, #58A9F5 0%, #DFE9F8 51%, #FFB5F5 99%);
+  border-radius: 0.06rem;
+  position: relative;
+  margin-left: 0.18rem;
+}
+
+.icon{
+  width: 0.3rem;
+  height: 0.3rem;
+}
+
+.icon1{
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  left: 0.8rem;
+}
+
+.icon2{
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  left: 1.8rem;
+}
+
+.get-times{
+  width: 1.21rem;
+  height: 1.01rem;
+  padding: 0.69rem 0.24rem 0 0;
+}
+
+.no-join-activity{
+  margin-top: 0.28rem;
+  text-align: center;
+  font-size: 0.24rem;
+  color: #CCCCCC;
+}
+
+.light-record-wrap{
+  margin-top: 0.69rem;
+}
+
+.record-title-wrap{
+  font-size: 0.24rem;
+}
+
+.record-main-wrap{
+  width: 7.09rem;
+  padding-bottom: 0.27rem;
+  border-radius: 0.1rem;
+  margin: auto;
+  margin-top: 0.26rem;
+  background-image: url('../img/anniversaryCelebrate/right-selected.png');
+  background-repeat: repeat-y;
+  background-size: cover;
+}
+.record-main-active-wrap{
+  background-image: url('../img/anniversaryCelebrate/left-selected.png');
+}
+.change-wrap{
+  display: flex;
+}
+
+.get-award-wrap{
+  width: 3.11rem;
+  height: 0.62rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin: 0.11rem 0 0 0.26rem;
+  position: relative;
+}
+
+.award-img{
+  width: 3.11rem;
+  height: 0.62rem;
+  position: absolute;
+  top: 0;
+}
+
+.right-bg{
+  display: none;
+  width: 2.88rem;
+  margin-left: 0.5rem;
+}
+
+.get-award-img{
+  width: 0.33rem;
+  height: 0.3rem;
+}
+
+.get-award-text{
+  margin-left: 0.2rem;
+  font-size: 0.32rem;
+  color: #FFFFFF;
+}
+
+.used-text{
+  opacity: 0.6;
+}
+
+.light-title-wrap{
+  display: flex;
+  justify-content: space-between;
+  margin: 0 0.25rem;
+  margin-top: 0.36rem;
+  border-bottom: 0.01rem solid rgba(213, 227, 253, 0.1);
+}
+
+.award-text{
+  margin-left: 0.6rem;
+}
+
+.active-text{
+  margin-right: 0.4rem;
+}
+
+.light-title-text{
+  padding-bottom: 0.16rem;
+  font-size: 0.24rem;
+  color: #FFFFFF;
+}
+
+.light-content-list{
+  border-bottom: 0.01rem solid rgba(213, 227, 253, 0.5);
+  margin: 0 0.23rem;
+  max-height: 4.88rem;
+  overflow-y: scroll;
+}
+
+.light-content-wrap{
+  display: flex;
+  justify-content: space-between;
+  margin: 0.26rem 0;
+}
+
+.light-content-text{
+  font-size: 0.24rem;
+  color: #FFFFFF;
+}
+
+.light-content-time{
+  font-size: 0.24rem;
+  color: #B3B3B3;
+}
+
+.get-btn{
+  width: 1.2rem;
+  height: 0.4rem;
+  line-height: 0.4rem;
+  text-align: center;
+  background: linear-gradient(101deg, #85B0FF 0%, #3F83FF 99%);
+  border-radius: 0.2rem;
+  font-size: 0.26rem;
+  color: #FFFFFF;
+}
+
+.btn-active{
+  color: rgba(255, 255, 255, 0.5);
+  background: rgba(29, 27, 62, 1);
+}
+
+.all-light{
+  padding-top: 0.23rem;
+  text-align: center;
+  font-size: 0.26rem;
+  color: #FFFFFF;
+}
+
+.activity-intrduction-wrap{
+  margin-top: 0.41rem;
+  text-align: center;
+  font-size: 0.28rem;
+  color: #FFFFFF;
+}
+
+.law-statement{
+  width: 3.22rem;
+  margin: auto;
+  margin-top: 0.43rem;
+  font-size: 0.24rem;
+  color: #5BB4FF;
+  border-bottom: 0.01rem solid rgba(91, 180, 255, 1);
+}
+
 #toast-container>.toast-error {
   background-image: none !important;
 }

+ 1 - 0
microserviceUserH5/static/css/browserDetail.css

@@ -166,6 +166,7 @@ input{
 .btn-active{
   width: 1.16rem;
   height: 0.5rem;
+  border-radius: 0.16rem;
   background: #FFFFFF;
   border: 0.04rem solid #3B7FFF;
   color: rgba(59, 127, 255, 1);

BIN=BIN
microserviceUserH5/static/img/anniversaryCelebrate/get-award-hidden.png


BIN=BIN
microserviceUserH5/static/img/anniversaryCelebrate/get-award-success-hidden.png


BIN=BIN
microserviceUserH5/static/img/anniversaryCelebrate/get-award-success-show.png


BIN=BIN
microserviceUserH5/static/img/anniversaryCelebrate/in-point.png


BIN=BIN
microserviceUserH5/static/img/anniversaryCelebrate/left-bg.png


BIN=BIN
microserviceUserH5/static/img/anniversaryCelebrate/out-point.png


BIN=BIN
microserviceUserH5/static/img/anniversaryCelebrate/right-bg.png


+ 313 - 6
microserviceUserH5/vcloud/anniversaryCelebrate.html

@@ -26,6 +26,16 @@
 		</div>
 		<div class="star-wrap">
 			<img class="star" src="../static/img/anniversaryCelebrate/star.png" />
+			<img class="out-point out-point1" src="../static/img/anniversaryCelebrate/out-point.png" />
+			<img class="out-point out-point2" src="../static/img/anniversaryCelebrate/out-point.png" />
+			<img class="out-point out-point3" src="../static/img/anniversaryCelebrate/out-point.png" />
+			<img class="out-point out-point4" src="../static/img/anniversaryCelebrate/out-point.png" />
+			<img class="out-point out-point5" src="../static/img/anniversaryCelebrate/out-point.png" />
+			<img class="in-point in-point1" src="../static/img/anniversaryCelebrate/in-point.png" />
+			<img class="in-point in-point2" src="../static/img/anniversaryCelebrate/in-point.png" />
+			<img class="in-point in-point3" src="../static/img/anniversaryCelebrate/in-point.png" />
+			<img class="in-point in-point4" src="../static/img/anniversaryCelebrate/in-point.png" />
+			<img class="in-point in-point5" src="../static/img/anniversaryCelebrate/in-point.png" />
 		</div>
 		<div class="station-wrap">
 			<img class="station" src="../static/img/anniversaryCelebrate/station.png" />
@@ -38,11 +48,54 @@
 				<img class="five-btn btn" src="../static/img/anniversaryCelebrate/fifce.png" />
 			</div>
 		</div>
-		<div class="number-wrap">
-			<div class="rest-times">剩余次数<span class="rest-number">1000</span>次</div>
-			<div class="small-star-wrap">
-				<img class="small-star" src="../static/img/anniversaryCelebrate/small-star.png" />
+		<div class="award-get-wrap">
+			<div class="number-wrap">
+				<div class="rest-times">剩余次数<span class="rest-number">1000</span>次</div>
+				<div class="process-wrap">
+					<div class="small-star-wrap">
+						<img class="small-star" src="../static/img/anniversaryCelebrate/small-star.png" />
+					</div>
+					<div class="line-wrap">
+						<img class="icon icon1" src="../static/img/anniversaryCelebrate/icon1.png" />
+						<img class="icon icon2" src="../static/img/anniversaryCelebrate/icon3.png" />
+					</div>
+				</div>
 			</div>
+			<img class="get-times" src="../static/img/anniversaryCelebrate/get-times.png" />
+		</div>
+		<div class="no-join-activity">激活码、优惠券、星币购买的订单不参与本次活动</div>
+		<div class="light-record-wrap">
+			<div class="record-title-wrap">标题</div>
+			<div class="record-main-wrap">
+				<div class="change-wrap">
+					<div class="get-award-wrap">
+						<img class="award-img" src="../static/img/anniversaryCelebrate/left-bg.png" />
+						<img class="get-award-img" src="../static/img/anniversaryCelebrate/get-award-success-show.png" />
+						<div class="get-award-text">领取</div>
+					</div>
+					<div class="get-award-wrap">
+						<img class="award-img right-bg" src="../static/img/anniversaryCelebrate/right-bg.png" />
+						<img class="get-award-img" src="../static/img/anniversaryCelebrate/get-award-success-hidden.png" />
+						<div class="get-award-text used-text">已使用</div>
+					</div>
+				</div>
+				<div class="light-title-wrap">
+					<div class="light-title-text award-text">奖品</div>
+					<div class="light-title-text">时间</div>
+					<div class="light-title-text active-text">操作</div>
+				</div>
+				<div class="light-content-container">
+					<div class="light-content-list">
+						
+					</div>
+					<div class="all-light">已全部点亮1次</div>
+				</div>
+			</div>
+			<div class="activity-intrduction-wrap">
+				<div>活动时间:2022年6月10日-2022年6月19日</div>
+				<div>活动参与套餐:星曜套餐月卡年卡(自动续费除外)</div>
+			</div>
+			<div class="law-statement">请阅读相关《法律声明》文件</div>
 		</div>
 	</div>
 	<script>
@@ -51,7 +104,7 @@
 	</script>
 	<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
 	<script type="text/javascript">
-        // var baseUrl = 'https://per.cs.se.androidscloud.com'
+        var baseUrl = 'http://192.168.31.198'
 	    let timer,flag = true;
 		var url = window.location.href;
 		url = url.split('/')
@@ -63,8 +116,262 @@
 			ua = navigator.userAgent.toLowerCase(),
 			isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
 			isMiniprogram = false,
+			pages = 1,
 			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
-		// 
+		// 初始化数据
+		init();
+		function init(type) {
+			$.ajax({
+				url: baseUrl + '/api/user/v1/anniversary/getAnniversary',
+				type: 'get',
+				headers: {
+					'Authorization': id //id
+				},
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					console.log(res)
+					if(res.status === 0){
+			            
+					}else{
+						stopManyClick(() =>{
+							toastr.error(res.msg)
+						})
+					}
+					
+				},
+			})
+		}
+		getAward();/v1/anniversary/luckDraw
+		//点击抽奖
+		$('.once')[0].addEventListener('click',() => {
+			if(!animationFlag) return;
+			operate('sf_2022_h5_抽奖1次');
+			if(activityState === 0){
+				stopManyClick(() =>{
+					toastr.error('该活动暂未开启,请稍安勿躁');
+				})
+			}else if(activityState === 2 && luckDraw === 0){
+				stopManyClick(() =>{
+					toastr.error('活动已结束,期待下次的见面');
+				})
+			}else{
+				handleAward(1)
+			}
+		},false);
+		$('.five-times')[0].addEventListener('click',() => {
+			if(!animationFlag) return;
+			operate('sf_2022_h5_抽奖5次');
+			if(activityState === 0){
+				stopManyClick(() =>{
+					toastr.error('该活动暂未开启,请稍安勿躁');
+				})
+			}else if(activityState === 2 && luckDraw === 0){
+				stopManyClick(() =>{
+					toastr.error('活动已结束,期待下次的见面');
+				})
+			}else{
+				handleAward(5)
+			}
+		},false);
+		//点击再抽
+		$('.left-btn')[0].addEventListener('click',() => {
+			if(!animationFlag) return;
+			let val = $('.report-times').eq(0).text();
+			let pams = `sf_2022_h5_抽奖${val}次`;
+			operate(pams);
+			handleAward(val,'report')
+		},false);
+		function handleAward(times,type) {
+			animationFlag = false;
+			if(surplus === 0 || (times == 5 && surplus < 5)){
+				$('.have-times-wrap').eq(0).css('display', 'none');
+				$('.no-times-wrap').eq(0).css('display', 'block');
+				$('.award-result-dialog').animate({top: '1.86rem'},"fast");
+				$('.award-result-mask').show();
+				document.documentElement.style.overflow='hidden';
+				return
+			}
+			$.ajax({
+				url: baseUrl + '/api/user/v1/activity/obtainRewards',
+				type: 'post',
+				headers: {
+					'Authorization': id //id
+				},
+				data:JSON.stringify({
+					frequency: times
+				}),
+				contentType: "application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					if(res.status === 0){
+						$('.have-times-wrap').eq(0).css('display', 'block');
+						$('.no-times-wrap').eq(0).css('display', 'none');
+						if(type !== 'report'){
+							$('.award-result-dialog').animate({top: '1.86rem'},"fast");
+							$('.award-result-mask').show();
+							document.documentElement.style.overflow='hidden';
+						}
+						$('.award-result-wrap').eq(0).text('');
+						let str = '',
+							cardObj = {
+								'天': 'day',
+								'周': 'week',
+								'月': 'mouth',
+								'季': 'season',
+								'年': 'year'
+							},
+							imgNumber = 0,
+							list = res.data.list;
+						if(list.length === 1){
+							$('.award-result-wrap')[0].className = 'card-wrap award-result-wrap one-result';
+							str = `<div class="card-item">
+										<img class="one-card" src="../static/img/springFestivalActivity/${cardObj[list[0].duration]}.png" />
+										<div class="card-text">星曜${list[0].duration}卡</div>
+									</div> `
+							setTimeout(() => {
+								animationFlag = true;
+							},1000);
+						}else{
+							$('.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="card many-card" src="../static/img/springFestivalActivity/${cardObj[list[i].duration]}.png" />
+										    <div class="card-text">星曜${list[i].duration}卡</div>
+										</div>`
+							}
+							var imgTimer2 = setInterval(() => {
+									$('.many-card-item').eq(imgNumber).css('display', 'block');
+									if(imgNumber >= 4){
+										clearInterval(imgTimer2);
+										animationFlag = true;
+									}
+									// <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)
+						}
+						$('.report-times').eq(0).text(times);
+						if(parseInt(notReceive) > 0){
+				            $('.join-result-tip').eq(0).css('opacity', '0');
+				            $('.many-card-wrap').eq(0).css('marginTop', '0');
+						}
+						let text = parseInt(notReceive) > 0?'确定':'查看';
+						$('.look-btn').eq(0).text(text);
+						$('.award-result-wrap').eq(0).append(str);
+						init();
+						getPhoneNumber();
+					}else{
+						stopManyClick(() =>{
+							toastr.error(res.msg)
+						})
+					}
+				},
+			})
+		}
+		//点击抽奖关闭按钮
+		$('.award-result-close')[0].addEventListener('click',() => {
+			animationFlag = true;
+			$('.award-result-dialog').animate({top: '-10.96rem'},"fast");
+			$('.award-result-mask').hide();
+			document.documentElement.style.overflow='auto';
+		},false);
+		// 点击领取tab切换
+		$('.get-award-wrap')[0].addEventListener('click',(e) => {
+			// $('.data-list').eq(0).text('');
+			// pageNum = 1;
+			// pages = 0;
+			// recordFlag = true;
+			// getAward();
+			$('.award-img').eq(1).css('display', 'none');
+			$('.award-img').eq(0).css('display', 'block');
+			$('.record-main-wrap')[0].className = 'record-main-wrap';
+			$('.get-award-text')[1].className = 'get-award-text used-text';
+			$('.get-award-text')[0].className = 'get-award-text';
+		},false);
+		$('.get-award-wrap')[1].addEventListener('click',(e) => {
+			// $('.data-list').eq(0).text('');
+			// pageNum = 1;
+			// pages = 0;
+			// recordFlag = true;
+			// getAward();
+			$('.award-img').eq(0).css('display', 'none');
+			$('.award-img').eq(1).css('display', 'block');
+			$('.record-main-wrap')[0].className = 'record-main-wrap record-main-active-wrap';
+			$('.get-award-text')[0].className = 'get-award-text used-text';
+			$('.get-award-text')[1].className = 'get-award-text';
+		},false);
+		//获取抽奖记录
+		function getAward(){
+			// $.ajax({
+			// 	url: baseUrl + '/api/user/v1/activity/platformGetRewardsH5',
+			// 	type: 'post',
+			// 	headers: {
+			// 		'Authorization': id //id
+			// 	},
+			// 	data:JSON.stringify({
+			// 		pageNum: pageNum,
+			// 		pageSize: 10,
+			// 		receive: receive
+			// 	}),
+			// 	contentType: "application/json",
+			// 	dataType: 'json',
+			// 	cache: false,
+			// 	success: function (res) {
+			// 		if(res.status === 0){
+						recordFlag = true;
+						let str = '',
+						    // records = res.data.records;
+							// pages = res.data.pages;
+						    records = [1,2,3,4];
+							// if(records.length === 0){
+				            //     $('.title-row').eq(0).css('display', 'none');
+							// 	if(receive == 1 && parseInt(notReceive) > 0){
+							// 		str = '<div class="no-award">暂无已分配云手机</div>'
+							// 	}else{
+							// 		str = '<div class="no-award">没有抽奖记录,我都替你着急</div>'
+							// 	}
+							// }else{
+				            //     $('.title-row').eq(0).css('display', 'flex');
+							// }
+						for (var i = 0; i < records.length; i++) {
+							str += `<div class="light-content-wrap">
+										<div class="light-content-text">获得星曜7天时长</div>
+										<div class="light-content-time">6月10日  14:25:30</div>
+										<div class="get-btn btn-active">领取</div>
+									</div>`
+						}
+						$('.light-content-list').eq(0).append(str)
+			// 		}else{
+			// 			stopManyClick(() =>{
+			// 				toastr.error(res.msg)
+			// 			})
+			// 		}
+					
+			// 	},
+			// })
+		}
+		//点击领取按钮
+		$('.light-content-list')[0].addEventListener('click',(e) => {
+			if(e.target.className === 'light-content-list'){
+				return
+			}
+			receive = e.target.dataset.index;
+			if(receive == 1){
+				$('.award-change-btn')[0].className = 'award-change-btn'
+			}else{
+				$('.award-change-btn')[1].className = 'award-change-btn'
+			}
+			$('.data-list').eq(0).text('');
+			pageNum = 1;
+			pages = 0;
+			recordFlag = true;
+			getAward();
+			$('.award-change-btn')[receive].className = 'award-change-btn active'
+		},false);
 		//防止提示一秒内重复显示
 		function stopManyClick(fn) {
 			if (flag) {

+ 9 - 0
microserviceUserH5/vcloud/browser.html

@@ -133,6 +133,15 @@
 		var wd = "https://www.baidu.com/s?wd=" + key;
 		window.open(wd);
 	}
+	// input 监听回车事件
+	$("#ipt").keydown(function (e){
+		// 当 keyCode 是13时,是回车操作
+	if (e.keyCode == 13){
+		searchFun();
+		// 取消之前的keydown事件
+		e.preventDefault();
+	}
+	})
 </script>
 </body>
 </html>

+ 0 - 1
microserviceUserH5/vcloud/browserDetail.html

@@ -273,7 +273,6 @@
 				$('.text').eq(index).text(`${(downloadObj[key].percentComplete * 100).toFixed(1)}%`);
 				if((downloadObj[key].percentComplete * 100).toFixed(1) == 100){
 					delete downloadObj[key]
-					console.log(downloadObj)
 					$('.text').eq(index).text('下载完成');
 				}
 			}