heyang 3 jaren geleden
bovenliggende
commit
61466c1315

+ 54 - 1
microserviceUserH5/static/css/doubleChristmasActivity.css

@@ -529,7 +529,7 @@ input:focus{
 .time-content-row{
   display: flex;
   justify-content: space-between;
-  padding: 0.2rem 0.26rem;
+  padding: 0.2rem 0.36rem 0.2rem 0.26rem;
   font-size: 0.24rem;
   font-weight: 600;
   color: #333333;
@@ -638,4 +638,57 @@ input:focus{
 }
 .slider-item{
   width: 100%;
+}
+
+.sure-distribution-wrap{
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background-color: rgba(0, 0, 0, 0.24);
+  z-index: 999;
+  display: none;
+}
+.sure-distribution-box{
+  width: 6.22rem;
+  height: 2.28rem;
+  background: #FFFFFF;
+  border-radius: 0.2rem;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%,-50%);
+}
+.sure-distribution-title{
+  text-align: center;
+  padding: 0.48rem;
+  font-size: 0.32rem;
+        color: #333333;
+}
+.sure-distribution-btn-list{
+  width: 100%;
+  height: 0.86rem;
+  display: flex;
+  justify-content: space-between;
+  border-top: 0.01rem solid #E5E5E5;
+  font-size: 0.28rem;
+}
+.sure-distribution-btn{
+  height: 0.86rem;
+  line-height: 0.86rem;
+  text-align: center;
+  flex: 1;
+}
+.sure-distribution-sure{
+  border-left: 0.01rem solid #b4bbc5;
+  color: #3B7FFF;
+}
+.sure-distribution-cannel:active{
+  background-color: #E5E5E5;
+  border-bottom-left-radius: 0.2rem;
+}
+.sure-distribution-sure:active{
+  background-color: #E5E5E5;
+  border-bottom-right-radius: 0.2rem;
 }

+ 62 - 14
microserviceUserH5/vcloud/doubleChristmasActivity.html

@@ -145,7 +145,15 @@
 					<div class="rule-point">3.双子星官方对活动具有最终解释权。</div>
 				</div>
 			</div>
-			
+		</div>
+		<div class="sure-distribution-wrap">
+			<div class="sure-distribution-box">
+				<div class="sure-distribution-title">确定分配奖励时长</div>
+				<div class="sure-distribution-btn-list">
+					<div class="sure-distribution-btn sure-distribution-cannel">取消</div>
+					<div class="sure-distribution-btn sure-distribution-sure">确定</div>
+				</div>
+			</div>
 		</div>
 	</div>
 	<script>
@@ -159,7 +167,7 @@
 		var topVal = -0.5;
 		let obj = {};
 		// 上线分享环境改为0,图片路径改为正式站路径
-		// var baseUrl = 'https://test.androidscloud.com'
+		var baseUrl = 'https://test.androidscloud.com'
 		var loc = window.location.search,
 		    n1 = loc.length,//地址的总长度
 		    n2 = loc.indexOf("="),//取得=号的位置
@@ -170,7 +178,8 @@
 			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
 		let s = loc.substr(1,loc.length-1);//取得=号的位置
 		let userName = '';
-		let totalTime = 300;
+		let totalTime = 0;
+		let christmasDoubleReward = 0;
 		let currTotalTime = 0;
 		let distributionList = [];
 		var pageNum = 0;
@@ -182,9 +191,9 @@
 		// 	obj[key] = arr[1];
 		// })
 		getBaseData();
-		getList();
 		//点击立即参与按钮
 		$('.join-activity-btn')[0].addEventListener('click',() => {
+		    operate('dt_双旦_h5_立即参与');
 			if(isAndroid){ // 安卓
 				window.native.startPurchase(1,365);
 			}else if(isiOS){
@@ -197,7 +206,7 @@
 		$('.reward-list')[0].addEventListener('click',(e) => {
 			if(e.target.className === 'reward-btn'){
 				let receive = e.target.dataset.receive;
-				if(!receive){
+				if(receive !== 'null'){
 					return
 				}
 				if(isAndroid){ // 安卓
@@ -216,12 +225,14 @@
 				return
 			}
 			if(index == 0){
+				operate('dt_双旦_h5_tab_充值奖励');
 			    $('.tab-item')[1].className = 'tab-item';
 				$('.tab-bg')[0].className = 'tab-bg tab-left';
 				$('.reward-container').eq(0).css('display','block');
 				$('.distribution-container').eq(0).css('display','none');
 				$('.distribution-container').eq(1).css('display','none');
 			}else{
+				operate('dt_双旦_h5_tab_分配奖励');
 		        getLists();
 				distributionRecord();
 			    $('.tab-item')[0].className = 'tab-item';
@@ -244,8 +255,10 @@
 				dataType: 'json',
 				cache: false,
 				success: function (res) {
+		            getList();
 					const objData = res.data;
 					userName = objData.userName;
+					christmasDoubleReward = objData.christmasDoubleReward;
 					$('.meal-price-num').eq(0).text(objData.price);
 				    let currTime = parseInt(Date.parse(objData.now)),
 						closeTime = parseInt(Date.parse(objData.endTime)),
@@ -327,6 +340,17 @@
 									nextDuration = cumulativeDuration - totalDuration;
 								}
 							}
+							str += `<div class="reward-row">
+								<img class="reward-row-bg" src="../static/img/doubleChristmasActivity/reward-row-bg.png" />
+								<div class="reward-row-content">
+									<img class="reward-img" src="../static/img/doubleChristmasActivity/reward.png" />
+									<div class="reward-day-text">
+										<div class="reward-day">星曜套餐买一送二</div>
+										<div class="total-day">购买套餐累计时长达高于${christmasDoubleReward}天</div>
+									</div>
+									<img class="reward-btn" data-receive=33 src="../static/img/doubleChristmasActivity/finish-btn.png" />
+								</div>
+							</div>`
 							str +=`<div class="reward-last-tip">已获得奖励请在分配奖励栏中进行时长分配</div>`
 							$('.reward-list').eq(0).append(str);
 						    $('.time-number').eq(0).text(rewardDuration);
@@ -334,6 +358,7 @@
 						    $('.next-time-num').eq(0).text(nextDuration);
 						    $('.distribution-total-num').eq(0).text(rewardDuration);
 							const noDistributionDuration = rewardDuration - usedDuration;
+							totalTime = noDistributionDuration;
 						    $('.no-distribution-num').eq(0).text(noDistributionDuration);
 						}
 					}else{
@@ -365,7 +390,6 @@
 					if(res.status === 0){
 						let records = res.data.records;
 						if(res.data && records.length > 0){
-							sliderNumber = res.data.pages;
 							var str = '',
 							    len = records.length;
 							for (var i = 0; i < len; i++) {
@@ -373,11 +397,10 @@
 								    createTime = records[i].createTime,
 								    increaseDuration = records[i].increaseDuration,
 								    id = records[i].id;
-									// ${increaseDuration.substring(0,3)}年${increaseDuration.substring(5,7)}月${increaseDuration.substring(8,10)}
 								    str += `<div class="time-content-row">
 										<div>${diskName}</div>
-										<div>${createTime}</div>
-										<div>${increaseDuration}</div>
+										<div>${createTime.substring(0,4)}年${createTime.substring(5,7)}月${createTime.substring(8,10)}日 ${createTime.substring(11,19)}</div>
+										<div>${increaseDuration}</div>
 									</div>`
 							}
 							$('.time-list').eq(0).append(str);
@@ -395,6 +418,7 @@
 		}
 		// 活动获取用户云机列表,分页
 		function getLists(){
+			console.log(id)
 			const sliderLen = Array.from($('.slider-item')).length;
 			if(sliderLen > sliderNumber){
 				return
@@ -430,7 +454,7 @@
 									day = parseInt(resultTime / 1000 / 60 / 60 / 24),
 									hour = parseInt(resultTime / 1000 / 60 / 60 % 24),
 									time = day + "天" + hour + "时";
-								    id = records[i].id;
+								    recordsId = records[i].id;
 								    str += `<div class="reward-row">
 										<img class="reward-row-bg" src="../static/img/doubleChristmasActivity/reward-row-bg.png" />
 										<div class="reward-row-content">
@@ -444,8 +468,8 @@
 											</div>
 											<div class="compute-block">
 												<img class="compute-icon cut" src="../static/img/doubleChristmasActivity/cut.png" />
-												<input class="ipt" data-id=${id} data-index=${i} type="number" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" value="0" />
-												<img class="compute-icon add" data-id=${id} data-index=${i} src="../static/img/doubleChristmasActivity/add.png" />
+												<input class="ipt" data-id=${recordsId} data-index=${i} type="number" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" value="0" />
+												<img class="compute-icon add" data-id=${recordsId} data-index=${i} src="../static/img/doubleChristmasActivity/add.png" />
 											</div>
 										</div>
 									</div>`
@@ -459,6 +483,7 @@
 							   $('.page-row').eq(0).css('display','none');
 							   $('.distribution-reward-btn').eq(0).css('display','none');
 							}
+						    $('.page').eq(0).text(`${pageNum + 1}/${sliderNumber}页`);
 							if(sliderNumber === 1){
 							   $('.page-row').eq(0).css('display','none');
 							   $('.distribution-reward-btn').eq(0).css('margin-top','20px');
@@ -523,6 +548,21 @@
 		}
 		//点击分配时常按钮
 		$('.distribution-reward-btn')[0].addEventListener('click',(e) => {
+			if(distributionList.length === 0){
+				stopManyClick(() => {
+					toastr.error('未选中任何云手机');
+				})
+			}else{
+			    $('.sure-distribution-wrap').eq(0).css('display','block');
+			}
+		});
+		//点击分配时常取消按钮
+		$('.sure-distribution-cannel')[0].addEventListener('click',(e) => {
+		    operate('dt_双旦_h5_分配奖励_取消');
+			$('.sure-distribution-wrap').eq(0).css('display','none');
+		});
+		//点击分配时常确定按钮
+		$('.sure-distribution-sure')[0].addEventListener('click',(e) => {
 			$.ajax({
 				url: baseUrl + '/api/user/v1/activity/distributeRewardDuration',
 				type: 'post',
@@ -536,7 +576,14 @@
 				success: function (res) {
 					console.log(res)
 					if(res.status === 0){
-						
+						operate('dt_双旦_h5_分配奖励_确定');
+		            	$('.sure-distribution-wrap').eq(0).css('display','none');
+		            	$('.reward-list').eq(0).text('');
+						getList();
+						getLists();
+						stopManyClick(() => {
+							toastr.error('分配时长成功,请前往云机列表查看');
+						})
 					}else{
 						stopManyClick(() => {
 							toastr.error(res.msg);
@@ -547,6 +594,7 @@
 		});
 		//点击加号
 		$('.slider-list')[0].addEventListener('click',(e) => {
+			console.log(sliderNumber)
 			if(e.target.className === 'compute-icon add'){
 			    const id = e.target.dataset.id;
 			    let index = e.target.dataset.index;
@@ -604,7 +652,7 @@
 		});
 		
 		//埋点
-		operate('dt_双11_h5_活动页面');
+		operate('dt_双旦_h5_活动首页');
 		function operate(pointName,type){
 			$.ajax({
 				url: baseUrl + '/api/public/v1/systemBuriedPoint/stat',