Merge branch 'dev-5.2' of Software/android-cloud-H5 into test

microserviceUserH5/static/css/anniversaryCelebrate.css

@@ -79,28 +79,28 @@ ul, li {
   position: absolute;
 }
 
-.out-point1{
+.point15{
   top: -0.1rem;
   left: 2.78rem;
 }
 
-.out-point2{
+.point18{
   top: 1.4rem;
   left: 0.76rem;
   
 }
 
-.out-point3{
+.point20{
   bottom: 0;
   left: 1.48rem;
 }
 
-.out-point4{
+.point25{
   top: 1.4rem;
   right: 0.76rem;
 }
 
-.out-point5{
+.point30{
   bottom: 0;
   right: 1.48rem;
 }
@@ -111,27 +111,27 @@ ul, li {
   position: absolute;
 }
 
-.in-point1{
+.point1{
   top: 0.8rem;
   left: 2.82rem;
 }
 
-.in-point2{
+.point3{
   top: 1.6rem;
   left: 1.62rem;
 }
 
-.in-point3{
+.point5{
   bottom: 0.8rem;
   left: 2.02rem;
 }
 
-.in-point4{
+.point7{
   top: 1.6rem;
   right: 1.62rem;
 }
 
-.in-point5{
+.point12{
   bottom: 0.8rem;
   right: 2.02rem;
 }
@@ -160,12 +160,12 @@ ul, li {
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  background: rgba(37, 36, 75, 0.2);
-  box-shadow: -0.03rem -0.02rem 0.18rem 0 #0F2141;
-  opacity: 0.2;
   border-radius: 0.16rem;
   font-size: 0.28rem;
   color: #FFFFFF;
+  background-image: url('../img/anniversaryCelebrate/qualification-bg.png');
+  background-repeat: repeat-y;
+  background-size: cover;
 }
 
 .btn-list{
@@ -264,7 +264,13 @@ ul, li {
 }
 
 .record-title-wrap{
-  font-size: 0.24rem;
+  display: flex;
+  justify-content: center;
+}
+
+.record-title{
+  width: 2.48rem;
+  height: 0.6rem;
 }
 
 .record-main-wrap{
@@ -334,6 +340,14 @@ ul, li {
   margin-left: 0.6rem;
 }
 
+.many-card-wrap{
+  display: flex;
+  justify-content: flex-start;
+  flex-wrap: wrap;
+  margin: auto;
+  margin-top: 0.2rem;
+}
+
 .active-text{
   margin-right: 0.4rem;
 }
@@ -344,10 +358,14 @@ ul, li {
   color: #FFFFFF;
 }
 
+.light-title-time{
+  margin-left: 0.8rem;
+}
+
 .light-content-list{
   border-bottom: 0.01rem solid rgba(213, 227, 253, 0.5);
   margin: 0 0.23rem;
-  max-height: 4.88rem;
+  height: 4.88rem;
   overflow-y: scroll;
 }
 
@@ -358,11 +376,13 @@ ul, li {
 }
 
 .light-content-text{
+  width: 2.16rem;
   font-size: 0.24rem;
   color: #FFFFFF;
 }
 
 .light-content-time{
+  text-align: left;
   font-size: 0.24rem;
   color: #B3B3B3;
 }
@@ -390,6 +410,13 @@ ul, li {
   color: #FFFFFF;
 }
 
+.no-award{
+  line-height: 4.62rem;
+  text-align: center;
+  font-size: 0.26rem;
+  color: #CCCCCC;
+}
+
 .activity-intrduction-wrap{
   margin-top: 0.41rem;
   text-align: center;
@@ -406,6 +433,143 @@ ul, li {
   border-bottom: 0.01rem solid rgba(91, 180, 255, 1);
 }
 
+.rule-mask,.award-result-mask,.no-start-mask {
+  width: 100%;
+  height: 100vh;
+  position: fixed;
+  z-index: 999;
+  top: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: none;
+}
+
+.award-result-dialog{
+  width: 5.52rem;
+  height: 9.21rem;
+  background: url(../../static/img/anniversaryCelebrate/result-bg.png) no-repeat;
+  background-size: 100% 100%;
+  border-radius: 0.2rem;
+  position: absolute;
+  left: 50%;
+  top: -10.86rem;
+  transform: translateX(-50%);
+}
+
+.award-result-one-dialog{
+  width: 5.52rem;
+  height: 8.11rem;
+  background: url(../../static/img/anniversaryCelebrate/result-once-bg.png) no-repeat;
+  background-size: 100% 100%;
+  border-radius: 0.2rem;
+  position: absolute;
+  left: 50%;
+  top: 4.86rem;
+  transform: translateX(-50%);
+}
+
+.award-result-wrap{
+  width: 5.6rem;
+}
+
+.award-result-tip{
+  text-align: center;
+  margin-top: 2.2rem;
+  font-size: 0.3rem;
+  font-weight: bold;
+  color: #FFFFFF;
+  text-shadow: 0.02rem 0.01rem 0.02rem rgba(29, 8, 85, 0.23);
+}
+
+.card-item{
+  margin: 0.1rem;
+  text-align: center;
+  position: relative;
+}
+
+.one-card{
+  margin-top: 0.6rem;
+  width: 1.66rem;
+  height: 1.18rem;
+  animation: mymove 0.8s;
+}
+
+.card-text{
+  width: 1.2rem;
+  font-size: 0.2rem;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 0.28rem;
+}
+
+.many-card{
+  width: 1.48rem;
+  height: 1.1rem;
+  animation: mymove 0.8s;
+}
+
+.many-card-item:nth-child(4n){
+  margin-left: 1rem;
+}
+
+.many-card-item{
+  display: none;
+}
+
+@keyframes mymove {
+  0%   {transform:scale(0,0);}
+  100% {transform:scale(1,1);}
+}
+
+.btn-row{
+  width: 5.6rem;
+  display: flex;
+  justify-content: space-evenly;
+  position: absolute;
+  bottom: 0.66rem;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+.award-btn{
+  width: 2rem;
+  height: 0.64rem;
+}
+
+.look-btn{
+  width: 1.8rem;
+  height: 1.02rem;
+  line-height: 1.02rem;
+  text-align: center;
+  background: url(../../static/img/springFestivalActivity/lookBg.png) no-repeat;
+  background-size: 100% 100%;
+  font-size: 0.34rem;
+  color: #FFF5BD;
+  margin-left: 0.3rem;
+}
+
+.times-text{
+  font-size: 0.24rem;
+  color: #FFE4BD;
+  margin-left: 1.6rem;
+  position: absolute;
+  bottom: 0.26rem;
+}
+
+.one-result{
+  margin-bottom: 1.2rem;
+}
+
+.award-result-close{
+  width: 0.68rem;
+  height: 0.68rem;
+  position: absolute;
+  left: 50%;
+  bottom: -1rem;
+  transform: translateX(-50%);
+}
+
 #toast-container>.toast-error {
   background-image: none !important;
 }

microserviceUserH5/static/css/browser.css

@@ -67,7 +67,6 @@ input{
   display: flex;
   flex-wrap: wrap;
   margin-left: 0.2rem;
-  position: relative;
 }
 .tag-item{
   width: 1.6rem;
@@ -80,6 +79,7 @@ input{
   padding-left: 0.1rem;
   padding-top: 0.24rem;
   margin-top: 0.3rem;
+  position: relative;
 }
 .tag-item:not(:nth-child(4n)) {
   margin-right: calc(4% / 3);

microserviceUserH5/vcloud/anniversaryCelebrate.html

@@ -26,16 +26,7 @@
 		</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 class="point-wrap"></div>
 		</div>
 		<div class="station-wrap">
 			<img class="station" src="../static/img/anniversaryCelebrate/station.png" />
@@ -50,7 +41,7 @@
 		</div>
 		<div class="award-get-wrap">
 			<div class="number-wrap">
-				<div class="rest-times">剩余次数<span class="rest-number">1000</span>次</div>
+				<div class="rest-times">剩余次数<span class="rest-number"></span>次</div>
 				<div class="process-wrap">
 					<div class="small-star-wrap">
 						<img class="small-star" src="../static/img/anniversaryCelebrate/small-star.png" />
@@ -65,12 +56,14 @@
 		</div>
 		<div class="no-join-activity">激活码、优惠券、星币购买的订单不参与本次活动</div>
 		<div class="light-record-wrap">
-			<div class="record-title-wrap">标题</div>
+			<div class="record-title-wrap">
+				<img class="record-title" src="../static/img/anniversaryCelebrate/record-title.png" />
+			</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" />
+						<img class="get-award-img" src="../static/img/anniversaryCelebrate/get-award-hidden.png" />
 						<div class="get-award-text">领取</div>
 					</div>
 					<div class="get-award-wrap">
@@ -81,14 +74,12 @@
 				</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 light-title-time">时间</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 class="light-content-list"></div>
+					<div class="all-light">已全部点亮<text class="light-number"></text>次</div>
 				</div>
 			</div>
 			<div class="activity-intrduction-wrap">
@@ -97,6 +88,26 @@
 			</div>
 			<div class="law-statement">请阅读相关《法律声明》文件</div>
 		</div>
+		<div class="award-result-mask">
+			<div class="award-result-dialog-sure">
+				<div class="have-times-wrap">
+					<div class="award-result-tip"></div>
+					<div class="card-wrap award-result-wrap"></div>
+					<div class="btn-row">
+						<img class="award-btn continue-lighten" src="../static/img/anniversaryCelebrate/continue-lighten.png" />
+						<img class="award-btn distribution-award" src="../static/img/anniversaryCelebrate/distribution-award.png" />
+					</div>
+					<div class="times-text">还剩次数：<span class="times-text-number"></span>次</div>
+				</div>
+				<img class="award-result-close" src="../static/img/anniversaryCelebrate/close.png" />
+			</div>
+		</div>
+		<div class="no-start-mask">
+			<div class="no-start-dialog">
+				<div>活动暂未开启</div>
+				<div>请稍安勿躁</div>
+			</div>
+		</div>
 	</div>
 	<script>
 		toastr.options.positionClass = 'toast-center-center';
@@ -116,13 +127,21 @@
 			ua = navigator.userAgent.toLowerCase(),
 			isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
 			isMiniprogram = false,
+			anniversarySwitch = 0,
+			animationFlag = true,
+			residueDegree = 0,
+			awardTimes = 0,
+			pageNum = 1,
 			pages = 1,
+			receive = 0,
+			lighten = [],
+			notReceive = true,
 			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
 		// 初始化数据
 		init();
-		function init(type) {
+		function init() {
 			$.ajax({
-				url: baseUrl + '/api/user/v1/anniversary/getAnniversary',
+				url: baseUrl + '/api/activity/v1/anniversary/getAnniversary',
 				type: 'get',
 				headers: {
 					'Authorization': id //id
@@ -131,9 +150,20 @@
 				dataType: 'json',
 				cache: false,
 				success: function (res) {
-					console.log(res)
 					if(res.status === 0){
-			            
+						residueDegree = res.data.residueDegree;
+						lighten = res.data.lighten.split(','), str = '';
+						$('.point-wrap').eq(0).empty();
+						for (let i = 0; i < lighten.length; i++) {
+							if([1, 3, 5, 7, 12].includes(lighten[i])){
+								str += `<img class="in-point point${lighten[i]}" src="../static/img/anniversaryCelebrate/out-point.png" />`
+							} else {
+								str += `<img class="out-point point${lighten[i]}" src="../static/img/anniversaryCelebrate/out-point.png" />`
+							}
+						}
+						$('.point-wrap').eq(0).append(str);
+						$('.rest-number').eq(0).text(residueDegree);
+						$('.light-number').eq(0).text(res.data.allTotal);
 					}else{
 						stopManyClick(() =>{
 							toastr.error(res.msg)
@@ -142,17 +172,17 @@
 					
 				},
 			})
-		}
-		getAward();/v1/anniversary/luckDraw
+		};
+		getAward();
 		//点击抽奖
-		$('.once')[0].addEventListener('click',() => {
+		$('.once-btn')[0].addEventListener('click',() => {
 			if(!animationFlag) return;
 			operate('sf_2022_h5_抽奖1次');
-			if(activityState === 0){
+			if(anniversarySwitch === 1){
 				stopManyClick(() =>{
 					toastr.error('该活动暂未开启，请稍安勿躁');
 				})
-			}else if(activityState === 2 && luckDraw === 0){
+			}else if(anniversarySwitch === 2 && receiveSwitch === 0){
 				stopManyClick(() =>{
 					toastr.error('活动已结束，期待下次的见面');
 				})
@@ -160,14 +190,14 @@
 				handleAward(1)
 			}
 		},false);
-		$('.five-times')[0].addEventListener('click',() => {
+		$('.five-btn')[0].addEventListener('click',() => {
 			if(!animationFlag) return;
-			operate('sf_2022_h5_抽奖5次');
-			if(activityState === 0){
+			operate('znq_2022_h5_抽奖5次');
+			if(anniversarySwitch === 1){
 				stopManyClick(() =>{
 					toastr.error('该活动暂未开启，请稍安勿躁');
 				})
-			}else if(activityState === 2 && luckDraw === 0){
+			}else if(anniversarySwitch === 2 && receiveSwitch === 0){
 				stopManyClick(() =>{
 					toastr.error('活动已结束，期待下次的见面');
 				})
@@ -176,25 +206,17 @@
 			}
 		},false);
 		//点击再抽
-		$('.left-btn')[0].addEventListener('click',() => {
+		$('.continue-lighten')[0].addEventListener('click',() => {
 			if(!animationFlag) return;
-			let val = $('.report-times').eq(0).text();
-			let pams = `sf_2022_h5_抽奖${val}次`;
+			let pams = `sf_2022_h5_抽奖${awardTimes}次`;
 			operate(pams);
-			handleAward(val,'report')
+			handleAward(awardTimes,'report')
 		},false);
 		function handleAward(times,type) {
+			awardTimes = times;
 			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',
+				url: baseUrl + '/api/activity/v1/anniversary/luckDraw',
 				type: 'post',
 				headers: {
 					'Authorization': id //id
@@ -207,39 +229,34 @@
 				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');
+						let imgNumber = 0,
+							str = '',
+							list = res.data.anniversaryAwards;
 						if(type !== 'report'){
-							$('.award-result-dialog').animate({top: '1.86rem'},"fast");
+							$('.award-result-dialog-sure').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){
+						if(times === 1){
+							$('.award-result-dialog-sure')[0].className = 'award-result-dialog-sure award-result-one-dialog';
+							$('.award-result-tip').eq(0).text('换个姿势，再抽一次');
 							$('.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>
+										<img class="one-card" src="../static/img/anniversaryCelebrate/day-card.png" />
+										<div class="card-text">星曜${list[0].awardDurations}天卡</div>
 									</div> `
 							setTimeout(() => {
 								animationFlag = true;
 							},1000);
-						}else{
+						} else {
+							$('.award-result-dialog-sure')[0].className = 'award-result-dialog-sure award-result-dialog';
+							$('.award-result-tip').eq(0).text('善良的人，好运气最终是会眷顾你');
 							$('.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>
+											<img class="many-card" src="../static/img/anniversaryCelebrate/day-card.png" />
+										    <div class="card-text">星曜${list[i].awardDurations}天卡</div>
 										</div>`
 							}
 							var imgTimer2 = setInterval(() => {
@@ -248,22 +265,12 @@
 										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);
+						$('.times-text-number').eq(0).text(residueDegree - 1);
 						$('.award-result-wrap').eq(0).append(str);
 						init();
-						getPhoneNumber();
 					}else{
 						stopManyClick(() =>{
 							toastr.error(res.msg)
@@ -281,11 +288,14 @@
 		},false);
 		// 点击领取tab切换
 		$('.get-award-wrap')[0].addEventListener('click',(e) => {
-			// $('.data-list').eq(0).text('');
-			// pageNum = 1;
-			// pages = 0;
-			// recordFlag = true;
-			// getAward();
+			$('.light-content-list').eq(0).empty();
+			pageNum = 1;
+			pages = 0;
+			receive = 0;
+			recordFlag = true;
+			getAward();
+			$('.get-award-img')[0].src = '../static/img/anniversaryCelebrate/get-award-show.png';
+			$('.get-award-img')[1].src = '../static/img/anniversaryCelebrate/get-award-success-hidden.png';
 			$('.award-img').eq(1).css('display', 'none');
 			$('.award-img').eq(0).css('display', 'block');
 			$('.record-main-wrap')[0].className = 'record-main-wrap';
@@ -293,11 +303,14 @@
 			$('.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();
+			$('.light-content-list').eq(0).empty();
+			pageNum = 1;
+			pages = 0;
+			receive = 1;
+			recordFlag = true;
+			getAward();
+			$('.get-award-img')[0].src = '../static/img/anniversaryCelebrate/get-award-hidden.png';
+			$('.get-award-img')[1].src = '../static/img/anniversaryCelebrate/get-award-success-show.png';
 			$('.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';
@@ -306,53 +319,47 @@
 		},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){
+			$.ajax({
+				url: baseUrl + `/api/activity/v1/anniversary/rewardList?pageNum=${pageNum}&pageSize=10&receive=${receive}`,
+				type: 'get',
+				headers: {
+					'Authorization': id //id
+				},
+				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');
-							// }
+						    records = res.data.records;
+							pages = res.data.pages;
+							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">没有${receive === 1 ? '已使用' : '领取'}记录，我都替你着急</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 class="light-content-text">获得星曜${records[i].awardDurations}天时长</div>
+										<div class="light-content-time">${records[i].createTime.substr(6)}</div>
+										<div class="get-btn ${records[i].receive === 1 ? 'btn-active' : ''}" data-index=${i}>领取</div>
 									</div>`
 						}
 						$('.light-content-list').eq(0).append(str)
-			// 		}else{
-			// 			stopManyClick(() =>{
-			// 				toastr.error(res.msg)
-			// 			})
-			// 		}
+					}else{
+						stopManyClick(() =>{
+							toastr.error(res.msg)
+						})
+					}
 					
-			// 	},
-			// })
+				},
+			})
 		}
 		//点击领取按钮
 		$('.light-content-list')[0].addEventListener('click',(e) => {
@@ -372,6 +379,22 @@
 			getAward();
 			$('.award-change-btn')[receive].className = 'award-change-btn active'
 		},false);
+		//埋点
+		function operate(pointName){
+			$.ajax({
+				url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',
+				type: 'post',
+				data:JSON.stringify({
+					pointName: pointName
+				}),
+				contentType:"application/json",
+				dataType: 'json',
+				cache: false,
+				success: function (res) {
+					console.log(res)
+				},
+			})
+		}
 		//防止提示一秒内重复显示
 		function stopManyClick(fn) {
 			if (flag) {

microserviceUserH5/vcloud/browser.html

@@ -63,11 +63,11 @@
 					let node = '';
 					for(let i=0; i < list.length; i++){
 						node += `<div class="tag-item" data-plateName="${list[i].plateName}" data-id="${list[i].id}">
-								<img class="icon-row" data-plateName="${list[i].plateName}" data-id="${list[i].id}" src=${fileCenterApi}/document/newFile/download/0/13d0arghebcc4cm49cf04?fileKey=${list[i].iconImage} />
-								<div class="icon-title" data-plateName="${list[i].plateName}" data-id="${list[i].id}">${list[i].plateName}</div>
-								<img class="right-arrow" src="../static/img/browser/right-arrow.png" data-plateName="${list[i].plateName}" data-id="${list[i].id}" />
-								<div class="right-arrow-heght"></div>
-							</div>`
+									<img class="icon-row" data-plateName="${list[i].plateName}" data-id="${list[i].id}" src=${fileCenterApi}/document/newFile/download/0/13d0arghebcc4cm49cf04?fileKey=${list[i].iconImage} />
+									<div class="icon-title" data-plateName="${list[i].plateName}" data-id="${list[i].id}">${list[i].plateName}</div>
+									<img class="right-arrow" src="../static/img/browser/right-arrow.png" data-plateName="${list[i].plateName}" data-id="${list[i].id}" />
+									<div class="right-arrow-heght"></div>
+								</div>`
 					}
 					tagDom.innerHTML = node;
 				}