heyang 3 年之前
父節點
當前提交
6b5e1c2099

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

@@ -221,7 +221,7 @@ ul, li {
 }
 .reward-container{
   width: 6.5rem;
-  max-height: 12.36rem;
+  max-height: 12.56rem;
   overflow-y: scroll;
   background: #F9F8FB;
   box-shadow: 0 0.12rem 0.28rem 0 rgba(253, 89, 136, 0.46);

+ 109 - 145
microserviceUserH5/vcloud/doubleChristmasActivity.html

@@ -77,17 +77,6 @@
 				    <div class="reward-tip">精彩不停的充值福利专场已经来临充值越多折扣越大</div>
 				</div>
 				<div class="reward-list">
-					<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">奖励天数10天</div>
-								<div class="total-day">购买套餐累计时长达30天</div>
-							</div>
-							<img class="reward-btn" src="../static/img/doubleChristmasActivity/finish-btn.png" />
-						</div>
-					</div>
 					<div class="reward-last-tip">已获得奖励请在分配奖励栏中进行时长分配</div>
 				</div>
 			</div>
@@ -201,6 +190,7 @@
 			let key = arr[0];
 			obj[key] = arr[1];
 		})
+		getList();
 		getLists();
 		//点击立即参与按钮
 		$('.join-activity-btn')[0].addEventListener('click',() => {
@@ -211,13 +201,15 @@
 			}
 		})
 		//点击去完成
-		$('.reward-btn')[0].addEventListener('click',() => {
-			if(isAndroid){ // 安卓
-				window.native.startPurchase(1,365);
-			}else{
-				window.webkit.messageHandlers.startPurchase.postMessage(1,365);
+		$('.reward-list')[0].addEventListener('click',(e) => {
+			if(e.target.className === 'reward-btn'){
+				if(isAndroid){ // 安卓
+					window.native.startPurchase(1,365);
+				}else{
+					window.webkit.messageHandlers.startPurchase.postMessage(1,365);
+				}
 			}
-		})
+		});
 		//点击tab选项卡
 		$('.tab-row')[0].addEventListener('click',(e) => {
 			const index = e.target.dataset.index;
@@ -239,127 +231,71 @@
 			}
 			$('.tab-item')[index].className = 'tab-item tab-active';
 		})
-		//点击加号
-		$('.add')[0].addEventListener('click',(e) => {
-			let number = $('.ipt').eq(0).val();
-			number++;
-			if(number < 30){
-				$('.ipt').eq(0).val(number);
-			}else{
-				stopManyClick(() => {
-				    console.log(toastr.error)
-					toastr.error('分配时常不能大于未分配时常');
-				})
-			}
-		})
-		//点击减号
-		$('.cut')[0].addEventListener('click',(e) => {
-			let number = $('.ipt').eq(0).val();
-			if(number > 0){
-			    number--;
-				$('.ipt').eq(0).val(number);
-			}else{
-				stopManyClick(() => {
-				    console.log(toastr.error)
-					toastr.error('分配的时常不能小于0!');
-				})
-			}
-		})
 		//调用获取数据列表接口
 		function getList(){
-			$.ajax({
-				url: baseUrl + '/api/user/v1/activity/orderRedEnvelopeSharing',
-				type: 'post',
-				headers: {
-					'Authorization': obj.token //id
-				},
-				contentType: "application/json",
-				dataType: 'json',
-				cache: false,
-				success: function (res) {
-					if(res.status === 0){
-						if(res.data && res.data.length > 0){
-							$('.invite-text').eq(0).show();
-							$('.packet-container').eq(0).show();
+			// $.ajax({
+			// 	url: baseUrl + '/api/user/v1/activity/orderRedEnvelopeSharing',
+			// 	type: 'post',
+			// 	headers: {
+			// 		'Authorization': obj.token //id
+			// 	},
+			// 	contentType: "application/json",
+			// 	dataType: 'json',
+			// 	cache: false,
+			// 	success: function (res) {
+			// 		if(res.status === 0){
+			// 			if(res.data && res.data.length > 0){
+				            let res = {
+								data:[{
+									shareCount: 10,
+									totalMoney: 30
+								},{
+									shareCount: 40,
+									totalMoney: 90
+								},{
+									shareCount: 80,
+									totalMoney: 180
+								},{
+									shareCount: 240,
+									totalMoney: 365
+								},{
+									shareCount: 800,
+									totalMoney: 730
+								},{
+									shareCount: 3022,
+									totalMoney: 2022
+								},{
+									shareCount: 3022,
+									totalMoney: 2022
+								}]
+							}
 							var str = '',
-							    list = '',
 							    len = res.data.length;
 							for (var i = 0; i < len; i++) {
 								var totalMoney = res.data[i].totalMoney,
-								    shareCount = res.data[i].shareCount,
-								    couponRandomId = res.data[i].couponRandomId,
-								    goodId = res.data[i].goodId,
-								    shareOrder = res.data[i].shareOrder,
-								    shareUser = res.data[i].shareUser,
-									dataList = res.data[i].list,
-								    quantity = res.data[i].quantity;
-									function getReceivePhoneDuration(item){
-										let res = item.receivePhoneDuration===30?'月卡':item.receivePhoneDuration===90?'季卡':item.receivePhoneDuration===365?'年卡':item.receivePhoneDuration+'天卡';
-										return dataObj[item.receivePhoneType] + res
-									}
-									dataList.map((item,index) => {
-										let numberImg = Math.floor(getRandom()/2) + 1;
-										list += `<div class="user-item">
-											<div class="user-left">
-												<img class="head-img" src="../static/img/doubleElevenActivity/head-img-0${numberImg}.png" />
-												<div class="user-info">
-													<div class="user-name">${getPhoneNumber(item.receiveUserPhone)}</div>
-													<div class="user-time">${item.createTime.substring(5,7)}月${item.createTime.substring(8,11)}日${item.createTime.substring(11,19)}</div>
-												</div>
-											</div>
-											<div class="meal">${item.state === 0?totalMoney/quantity+'元红包':getReceivePhoneDuration(item)}</div>
-											<div class="${['receive no-user','receive',' receive usered'][item.state]}" data-type=${item.receivePhoneType} data-state=${item.state} data-id=${item.id}>${['未使用','领取','已领取'][item.state]}</div>
-										</div>`
-									})
-								    str += `<div class="packet">
-											<img class="fxhb" data-index=${i} data-dataList=${JSON.stringify(dataList)} src="../static/img/doubleElevenActivity/fxhb.png" />
-											<div class="money" data-index=${i} data-dataList=${JSON.stringify(dataList)}><span class="money-mark">¥</span><span class="money-val">${parseInt(totalMoney)}</span></div>
-											<div class="packet-titles" data-index=${i} data-dataList=${JSON.stringify(dataList)}>无门槛</div>
-											<div class="packet-times" data-index=${i} data-dataList=${JSON.stringify(dataList)}>${startTime.substring(5,7)}月${startTime.substring(8,10)}-${endTime.substring(5,7)}月${endTime.substring(8,10)}日有效</div>
-											<div class="share-btn">
-												<img class="share" data-obj=${
-													JSON.stringify({
-														totalMoney: totalMoney,
-														couponRandomId: couponRandomId,
-														goodId: goodId,
-														shareOrder: shareOrder,
-														shareUser: shareUser,
-														shareCount: shareCount,
-														quantity: quantity
-													})
-												} src="../static/img/doubleElevenActivity/${shareCount === quantity?'no-share':'share'}.png" />
-												<div class="share-num ${shareCount === quantity?'gray':''}" data-obj=${
-													JSON.stringify({
-														totalMoney: totalMoney,
-														couponRandomId: couponRandomId,
-														goodId: goodId,
-														shareOrder: shareOrder,
-														shareUser: shareUser,
-														shareCount: shareCount,
-														quantity: quantity
-													})
-												}>${shareCount}/${quantity}</div>
+								    shareCount = res.data[i].shareCount;
+								    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">奖励天数${shareCount}天</div>
+												<div class="total-day">购买套餐累计时长达${totalMoney}天</div>
 											</div>
-											<div class="packet-info">${dataList.length !== 0?'':'尚未有用户领取红包购买云机'}</div>
-											<img class="icon" src="../static/img/doubleElevenActivity/icon_up.png" />
+											<img class="reward-btn" src="../static/img/doubleChristmasActivity/finish-btn.png" />
 										</div>
-										<div class="list ${dataList.length !== 0?'user-list':''}" flag="2">
-											${dataList.length !== 0?list:''}
-									    </div>`
-										list = ''
+									</div>`
 							}
-							$('.red-packet-next').eq(0).append(str);
-							$('.user-list').eq(0).css('display','block');
--							$('.icon').eq(0).attr('src','../static/img/doubleElevenActivity/icon_down.png');
--					        $('.user-list').eq(0).attr('flag','1');
-						}
-					}else{
-						stopManyClick(() => {
-							toastr.error(res.msg);
-						})
-					}
-				}
-			})
+							str +=`<div class="reward-last-tip">已获得奖励请在分配奖励栏中进行时长分配</div>`
+							$('.reward-list').eq(0).append(str);
+			// 			}
+			// 		}else{
+			// 			stopManyClick(() => {
+			// 				toastr.error(res.msg);
+			// 			})
+			// 		}
+			// 	}
+			// })
 		}
 		//获取分配列表数据
 		function getLists(){
@@ -400,25 +336,25 @@
 								var totalMoney = res.data[i].totalMoney,
 								    shareCount = res.data[i].shareCount;
 								    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="icon_xingyao" src="../static/img/doubleChristmasActivity/home_list_icon_xingyao.png" />
-												<div class="reward-day-text">
-													<div class="reward-day">Y2-12567</div>
-													<div class="total-day time-row">
-														<img class="time-icon" src="../static/img/doubleChristmasActivity/time-icon.png" />
-														<span>剩99999天24小时</span>
-													</div>
-												</div>
-												<div class="compute-block">
-													<img class="compute-icon cut" src="../static/img/doubleChristmasActivity/cut.png" />
-													<input class="ipt" type="number" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" value="0" maxlength="5" />
-													<img class="compute-icon add" src="../static/img/doubleChristmasActivity/add.png" />
+										<img class="reward-row-bg" src="../static/img/doubleChristmasActivity/reward-row-bg.png" />
+										<div class="reward-row-content">
+											<img class="icon_xingyao" src="../static/img/doubleChristmasActivity/home_list_icon_xingyao.png" />
+											<div class="reward-day-text">
+												<div class="reward-day">Y2-12567</div>
+												<div class="total-day time-row">
+													<img class="time-icon" src="../static/img/doubleChristmasActivity/time-icon.png" />
+													<span>剩99999天24小时</span>
 												</div>
 											</div>
-										</div>`
+											<div class="compute-block">
+												<img class="compute-icon cut" src="../static/img/doubleChristmasActivity/cut.png" />
+												<input class="ipt" type="number" onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" value="0" maxlength="5" />
+												<img class="compute-icon add" src="../static/img/doubleChristmasActivity/add.png" />
+											</div>
+										</div>
+									</div>`
 							}
-							let sliderItemDom = `<div class="slider-item">${str}</div>`;
+							let sliderItemDom = res.data.length === 0 ? `<div class="slider-item no-slider">暂无可分配的云手机</div>` : `<div class="slider-item">${str}</div>`;
 							$('#slider-list').append(sliderItemDom);
 			// 			}
 			// 		}else{
@@ -429,6 +365,34 @@
 			// 	}
 			// })
 		}
+		//点击加号
+		$('.slider-list')[0].addEventListener('click',(e) => {
+			if(e.target.className === 'compute-icon add'){
+				let number = $('.ipt').eq(0).val();
+				number++;
+				if(number < 30){
+					$('.ipt').eq(0).val(number);
+				}else{
+					stopManyClick(() => {
+						toastr.error('分配时常不能大于未分配时常');
+					})
+				}
+			}
+		});
+		//点击减号
+		$('.slider-list')[0].addEventListener('click',(e) => {
+			if(e.target.className === 'compute-icon cut'){
+				let number = $('.ipt').eq(0).val();
+				if(number > 0){
+					number--;
+					$('.ipt').eq(0).val(number);
+				}else{
+					stopManyClick(() => {
+						toastr.error('分配的时常不能小于0');
+					})
+				}
+			}
+		});
 		//埋点
 		operate('dt_双11_h5_活动页面');
 		function operate(pointName,type){