Merge branch 'dev-4.9.3' of http://192.168.32.253:3000/Software/android-cloud-H5 into dev-4.9.3

microserviceUserH5/static/css/doubleChristmasActivity.css

@@ -528,13 +528,24 @@ input:focus{
 }
 .time-content-row{
   display: flex;
-  justify-content: space-between;
+  /* justify-content: space-between; */
   padding: 0.2rem 0.36rem 0.2rem 0.26rem;
   font-size: 0.24rem;
   font-weight: 600;
   color: #333333;
   border-bottom: 0.04rem solid rgba(253, 89, 136, 0.46);
 }
+.time-content-diskName{
+  width: 1.2rem;
+}
+.time-content-time{
+  width: 3.6rem;
+  margin: 0 0.2rem 0 0.5rem;
+}
+.time-content-day{
+  width: 1rem;
+  text-align: right;
+}
 .rule-container{
   width: 6.9rem;
   position: relative;

microserviceUserH5/vcloud/doubleChristmasActivity.html

@@ -115,7 +115,7 @@
 			<div class="distribution-container time-container">
 				<div class="time-title-row">
 					<img class="time-title-bg" src="../static/img/doubleChristmasActivity/time-title-bg.png" />
-					<div class="time-title">分配时长记录（已分配时长999天）</div>
+					<div class="time-title">分配时长记录（已分配时长<span class="time-title-usedDuration"></span>天）</div>
 				</div>
 				<div class="time-list">
 					<div class="title-row">
@@ -197,13 +197,10 @@
 		let currTotalTime = 0;
 		let distributionList = [];
 		var pageNum = 0;
+		var distributionFlag = true;
+		var distributionPageNum = 0;
+		var distributionPages = 0;
 		var sliderNumber = 0;//滑块是数量，控制溢出不能滑动
-		// let parms = s.split('&');
-		// parms.map((item) =>{
-		// 	let arr = item.split('=');
-		// 	let key = arr[0];
-		// 	obj[key] = arr[1];
-		// })
 		getBaseData();
 		//点击立即参与按钮
 		$('.join-activity-btn')[0].addEventListener('click', () => {
@@ -361,12 +358,12 @@
 							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" />
+									<img class="reward-img" src="../static/img/doubleChristmasActivity/three-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" />
+									<img class="reward-btn" data-receive='null' src="../static/img/doubleChristmasActivity/finish-btn.png" />
 								</div>
 							</div>`
 							str += `<div class="reward-last-tip">已获得奖励请在分配奖励栏中进行时长分配</div>`
@@ -376,6 +373,7 @@
 							$('.next-time-num').eq(0).text(nextDuration);
 							$('.distribution-total-num').eq(0).text(rewardDuration);
 							const noDistributionDuration = rewardDuration - usedDuration;
+						    $('.time-title-usedDuration').eq(0).text(usedDuration);
 							totalTime = noDistributionDuration;
 							$('.no-distribution-num').eq(0).text(noDistributionDuration);
 						}
@@ -392,8 +390,8 @@
 			$.ajax({
 				url: baseUrl + '/api/user/v1/activity/queryUserDistribution',
 				type: 'get',
-				data: {
-					pageNum: pageNum + 1,
+				data:{
+					pageNum: distributionPageNum + 1,
 					pageSize: 10,
 					userName: userName
 				},
@@ -404,21 +402,21 @@
 				dataType: 'json',
 				cache: false,
 				success: function (res) {
-					console.log(res)
-					if (res.status === 0) {
+					if(res.status === 0){
+						distributionFlag = true;
 						let records = res.data.records;
-						if (res.data && records.length > 0) {
+						let distributionPages = res.data.pages;
+						if(res.data && records.length > 0){
 							var str = '',
 								len = records.length;
 							for (var i = 0; i < len; i++) {
 								var diskName = records[i].diskName,
-									createTime = records[i].createTime,
-									increaseDuration = records[i].increaseDuration,
-									id = records[i].id;
-								str += `<div class="time-content-row">
-										<div>${diskName}</div>
-										<div>${createTime.substring(0, 4)}年${createTime.substring(5, 7)}月${createTime.substring(8, 10)}日 ${createTime.substring(11, 19)}</div>
-										<div>${increaseDuration}天</div>
+								    createTime = records[i].createTime,
+								    increaseDuration = records[i].increaseDuration;
+								    str += `<div class="time-content-row">
+										<div class="time-content-diskName">${diskName}</div>
+										<div class="time-content-time">${createTime.substring(0,4)}年${createTime.substring(5,7)}月${createTime.substring(8,10)}日 ${createTime.substring(11,19)}</div>
+										<div class="time-content-day">${increaseDuration}天</div>
 									</div>`
 							}
 							$('.time-list').eq(0).append(str);
@@ -434,9 +432,20 @@
 				},
 			})
 		}
+		$('.time-container')[0].addEventListener('scroll',function () {
+			let scrollTop = $('.time-container')[0].scrollTop;
+			let clientHeight = $('.time-container')[0].clientHeight;
+			let scrollHeight = $('.time-container')[0].scrollHeight;
+			if(scrollTop + clientHeight + 100 > scrollHeight){
+				if(distributionFlag && distributionPageNum <= distributionPages + 1){
+					distributionFlag = false;
+					distributionPageNum++;
+				    distributionRecord();
+				}
+			}
+		});
 		// 活动获取用户云机列表，分页
-		function getLists() {
-			console.log(id)
+		function getLists(){
 			const sliderLen = Array.from($('.slider-item')).length;
 			if (sliderLen > sliderNumber) {
 				return
@@ -485,7 +494,7 @@
 												</div>
 											</div>
 											<div class="compute-block">
-												<img class="compute-icon cut" src="../static/img/doubleChristmasActivity/cut.png" />
+												<img class="compute-icon cut" data-id=${recordsId} data-index=${i} src="../static/img/doubleChristmasActivity/cut.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>
@@ -518,12 +527,14 @@
 										preTotalTime += parseInt(item.duration);
 									})
 									//这一次操作
-									if (value == 0) {
-										distributionList.push({
-											cardId: id,
-											duration: +value
-										});
-									} else {
+									if(value == 0){
+										if(!distributionList.find((item) => item.cardId == id)){
+											distributionList.push({
+												cardId: id,
+												duration: +value
+											});
+										}
+									}else{
 										distributionList.map(item => {
 											if (item.cardId == id) {
 												oldDuration = item.duration;
@@ -535,11 +546,8 @@
 									distributionList.map(item => { // 这一次的总数据
 										currTotalTime += parseInt(item.duration);
 									})
-									console.log(currTotalTime);
-									if (currTotalTime < totalTime) { // 当前已分配小于总分配时长
-
-									} else {// 当前已分配大于总分配时长
-										let val = totalTime - preTotalTime;
+									if(currTotalTime > totalTime){ // 当前已分配大于总分配时长
+										let val = totalTime - preTotalTime + oldDuration;
 										distributionList.map(item => {
 											if (item.cardId == id) {
 												item.duration = val;
@@ -547,11 +555,11 @@
 										})
 										$('.ipt').eq(index).val(val);
 										stopManyClick(() => {
-											toastr.error('分配时常不能大于未分配时常');
+											toastr.error('分配时常不能大于未分配总时常');
 										})
 										return
-									};
-									if (value.length > 5) value = value.slice(0, 5);
+									}
+									if(value.length > 5) value=value.slice(0, 5);
 									$('.ipt').eq(index).val(value);
 								}
 							}
@@ -611,57 +619,65 @@
 			})
 		});
 		//点击加号
-		$('.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;
-				index = (pageNum) * 4 + parseInt(index);
+		$('.slider-list')[0].addEventListener('click',(e) => {
+			if(e.target.className === 'compute-icon add'){
+			    const id = e.target.dataset.id;
+				let currTotalTime = 0;
+			    let index = e.target.dataset.index;
+			        index = (pageNum)*4 + parseInt(index);
 				let number = $('.ipt').eq(index).val();
-				if (number < totalTime - 1) {
-					if (number == 0) {
+				// 这一次操作
+				if(number == 0){
+					if(!distributionList.find((item) => item.cardId == id)){
 						distributionList.push({
 							cardId: id,
 							duration: +number + 1
 						});
-					} else {
-						distributionList.map(item => {
-							if (item.cardId == id) {
-								item.duration++;
-							}
-						})
 					}
+				}else{
+					distributionList.map(item => {
+						if(item.cardId == id){
+							item.duration++;
+						}
+					})
+				}
+				distributionList.map(item => { // 这一次的总数据
+					currTotalTime += parseInt(item.duration);
+				})
+				
+				if(currTotalTime <= totalTime){
 					number++;
-					currTotalTime++;
 					$('.ipt').eq(index).val(number);
-				} else {
+				}else{
+					distributionList.map(item => {
+						if(item.cardId == id){
+							item.duration = +number;
+						}
+					})
 					stopManyClick(() => {
-						toastr.error('分配时常不能大于未分配时常');
+						toastr.error('分配时常不能大于未分配总时常');
 					})
 				}
+				console.log(distributionList)
 			}
 		});
 		//点击减号
-		$('.slider-list')[0].addEventListener('click', (e) => {
-			if (e.target.className === 'compute-icon cut') {
-				let number = $('.ipt').eq(0).val();
-				if (number > 0) {
-					if (number == 0) {
-						distributionList.push({
-							cardId: id,
-							duration: +number - 1
-						});
-					} else {
-						distributionList.map(item => {
-							if (item.cardId == id) {
-								item.duration--;
-							}
-						})
-					}
+		$('.slider-list')[0].addEventListener('click',(e) => {
+			if(e.target.className === 'compute-icon cut'){
+				const id = e.target.dataset.id;
+			    let index = e.target.dataset.index;
+			        index = (pageNum)*4 + parseInt(index);
+				let number = $('.ipt').eq(index).val();
+				if(number > 0){
+					distributionList.map(item => {
+						if(item.cardId == id){
+							item.duration--;
+						}
+					})
 					number--;
 					currTotalTime--;
-					$('.ipt').eq(0).val(number);
-				} else {
+					$('.ipt').eq(index).val(number);
+				}else{
 					stopManyClick(() => {
 						toastr.error('分配的时常不能小于0');
 					})