heyang 3 년 전
부모
커밋
7b86c84c08
2개의 변경된 파일51개의 추가작업 그리고 85개의 파일을 삭제
  1. 3 1
      microserviceUserH5/static/css/doubleElevenActivity.css
  2. 48 84
      microserviceUserH5/vcloud/doubleElevenActivity.html

+ 3 - 1
microserviceUserH5/static/css/doubleElevenActivity.css

@@ -404,13 +404,15 @@ ul, li {
   width: 0.56rem;
   height: 0.56rem;
   position: absolute;
-  bottom: -0.3rem;
+  bottom: -0.8rem;
   left: 50%;
   transform: translateX(-50%);
 }
 .del-img{
   width: 100%;
   height: 100%;
+  position: absolute;
+  top: 0;
 }
 
 #toast-container>.toast-error {

+ 48 - 84
microserviceUserH5/vcloud/doubleElevenActivity.html

@@ -98,7 +98,7 @@
 			    <img class="rule-tips" src="../static/img/doubleElevenActivity/packet-tip.png" />
 				<div class="packet-block">
 					<div class="red-packet-next">
-						<div class="packet">
+						<!-- <div class="packet">
 							<img class="fxhb" src="../static/img/doubleElevenActivity/fxhb.png" />
 							<div class="money"><span class="money-mark">¥</span><span class="money-val">1111</span></div>
 							<div class="packet-titles">无门槛</div>
@@ -109,9 +109,8 @@
 							</div>
 							<div class="packet-info">尚未有用户领取红包购买云机</div>
 							<img class="icon" src="../static/img/doubleElevenActivity/icon_down.png" />
-							<!-- <img class="icon" src="../static/img/doubleElevenActivity/icon_up.png" /> -->
-						</div>
-						<div class="user-list" flag="1">
+						</div> -->
+						<!-- <div class="user-list" flag="1">
 							<div class="user-item">
 								<div class="user-left">
 									<img class="head-img" src="../static/img/doubleElevenActivity/head-img.png" />
@@ -189,67 +188,7 @@
 								<div class="meal">星动/30天云手机套餐</div>
 							    <div class="receive">领取</div>
 							</div>
-						</div>
-					</div>
-					<div class="red-packet-next">
-						<div class="packet">
-							<img class="fxhb" src="../static/img/doubleElevenActivity/fxhb.png" />
-							<div class="money"><span class="money-mark">¥</span><span class="money-val">1111</span></div>
-							<div class="packet-titles">无门槛</div>
-							<div class="packet-times">11月11-11月31日有效</div>
-							<div class="share-btn">
-							    <img class="share" src="../static/img/doubleElevenActivity/share.png" />
-							</div>
-							<div class="packet-info">尚未有用户领取红包购买云机</div>
-							<img class="icon" src="../static/img/doubleElevenActivity/icon_down.png" />
-							<!-- <img class="icon" src="../static/img/doubleElevenActivity/icon_up.png" /> -->
-						</div>
-						<div class="user-list">
-							<div class="user-item">
-								<div class="user-left">
-									<img class="head-img" src="../static/img/doubleElevenActivity/head-img.png" />
-									<div class="user-info">
-										<div class="user-name">用户名</div>
-										<div class="user-time">11月20日10:32:13</div>
-									</div>
-								</div>
-								<div class="meal">星动/30天云手机套餐</div>
-							    <div class="receive">领取</div>
-							</div>
-							<div class="user-item">
-								<div class="user-left">
-									<img class="head-img" src="../static/img/doubleElevenActivity/head-img.png" />
-									<div class="user-info">
-										<div class="user-name">用户名</div>
-										<div class="user-time">11月20日10:32:13</div>
-									</div>
-								</div>
-								<div class="meal">星动/30天云手机套餐</div>
-							    <div class="receive">领取</div>
-							</div>
-							<div class="user-item">
-								<div class="user-left">
-									<img class="head-img" src="../static/img/doubleElevenActivity/head-img.png" />
-									<div class="user-info">
-										<div class="user-name">用户名</div>
-										<div class="user-time">11月20日10:32:13</div>
-									</div>
-								</div>
-								<div class="meal">星动/30天云手机套餐</div>
-							    <div class="receive">领取</div>
-							</div>
-							<div class="user-item">
-								<div class="user-left">
-									<img class="head-img" src="../static/img/doubleElevenActivity/head-img.png" />
-									<div class="user-info">
-										<div class="user-name">用户名</div>
-										<div class="user-time">11月20日10:32:13</div>
-									</div>
-								</div>
-								<div class="meal">星动/30天云手机套餐</div>
-							    <div class="receive">领取</div>
-							</div>
-						</div>
+						</div> -->
 					</div>
 				</div>
 			</div>
@@ -425,17 +364,36 @@
 							var str = '',
 							    len = res.data.length;
 							for (var i = 0; i < len; i++) {
-								var phone = res.data.friendList[i].newPhone
-								var inviteMsg = res.data.friendList[i].duration
-								var registerTime = res.data.friendList[i].createTime
-								var nPhone = phone.substr(0, 3) + '****' + phone.substring(7, 11)
-								str += '<div class="goodFriend-item">'
-								str += '<span class="tal">' + nPhone + '</span>'
-								str += Number(inviteMsg) && inviteMsg > 0 ? '<span class="tac cF04646">' + inviteMsg + '</span>' : '<span class="tac">' + inviteMsg + '</span>'
-								str += '<span class="tar">' + registerTime + '</span>'
-								str += '</div>';
+								var totalMoney = res.data[i].totalMoney,
+								    shareCount = res.data[i].shareCount,
+								    quantity = res.data[i].quantity;
+								str += `<div class="packet">
+											<img class="fxhb" src="../static/img/doubleElevenActivity/fxhb.png" />
+											<div class="money"><span class="money-mark">¥</span><span class="money-val">${totalMoney}</span></div>
+											<div class="packet-titles">无门槛</div>
+											<div class="packet-times">${quantity}</div>
+											<div class="share-btn">
+												<img class="share" src="../static/img/doubleElevenActivity/share.png" />
+												<div class="share-num">${shareCount}/${quantity}</div>
+											</div>
+											<div class="packet-info">尚未有用户领取红包购买云机</div>
+											<img class="icon" src="../static/img/doubleElevenActivity/icon_down.png" />
+										</div>
+										<div class="user-list" flag="1">
+											<div class="user-item">
+												<div class="user-left">
+													<img class="head-img" src="../static/img/doubleElevenActivity/head-img.png" />
+													<div class="user-info">
+														<div class="user-name">用户名</div>
+														<div class="user-time">11月20日10:32:13</div>
+													</div>
+												</div>
+												<div class="meal">星动/30天云手机套餐</div>
+												<div class="receive">领取</div>
+											</div>
+									    </div>`
 							}
-							$('#goode').append(str);
+							$('.red-packet-next').eq(0).append(str);
 						}
 					}else{
 						stopManyClick(() => {
@@ -480,11 +438,13 @@
 			window.native.startPurchase();
 		});
 		//点击分享
-		$('.share-btn')[0].addEventListener('click',(e) => {
-			e.stopPropagation();
-			$('.pop').animate({top: '48vh'},"fast");
-			$('.mask').show();
-			document.documentElement.style.overflow='auto';
+		$('.red-packet-next')[0].addEventListener('click',(e) => {
+			if(e.target.className === 'share' || e.target.className === 'share-num'){
+				e.stopPropagation();
+				$('.pop').animate({top: '48vh'},"fast");
+				$('.mask').show();
+				document.documentElement.style.overflow='auto';
+			}
 		});
 		//点击分享朋友圈
 		$('.left-friend_share')[0].addEventListener('click',()=>{
@@ -519,10 +479,14 @@
 			}
 		}
 		//点击关闭弹窗
-		$('.del')[0].addEventListener('click',()=>{
-			$('.pop').animate({top: '-6.96rem'},"fast");
-			$('.mask').hide();
-			document.documentElement.style.overflow='auto';
+		$('.red-packet-next')[0].addEventListener('click',(e)=>{
+			console.log(e.target.className)
+			if(e.target.className === 'el'){
+				$('.pop').animate({top: '-6.96rem'},"fast");
+				$('.mask').hide();
+				document.documentElement.style.overflow='auto';
+			}
+			
 		});
 		// //点击分享
 		// $('.share-node')[0].addEventListener('click',()=>{