heyang 4 anni fa
parent
commit
5b2f767e1c

+ 26 - 8
microserviceUserH5/static/css/springFestivalActivity.css

@@ -203,11 +203,26 @@ ul, li {
   left: 50%;
   transform: translateX(-50%);
   font-size: 0.32rem;
+  display: flex;
+  align-items: center;
+}
+
+.award-text{
   font-weight: 600;
   text-decoration: underline;
   color: #EE0B1A;
 }
 
+.award-number{
+  height: 0.44rem;
+  background: linear-gradient(180deg, #FF7D85 0%, #EE0B1A 100%);
+  box-shadow: 0 0.04rem 0.08rem 0 rgba(217, 0, 0, 0.27);
+  border-radius: 0.22rem;
+  padding: 0.04rem 0.12rem;
+  color: #FFFFFF;
+  margin-left: 0.1rem;
+}
+
 .activity-time{
   width: 100%;
   position: absolute;
@@ -333,7 +348,7 @@ ul, li {
 }
 
 .data-list{
-  height: 5.22rem;
+  height: 4.82rem;
   padding: 0.1rem 0.2rem;
   overflow-y: scroll;
 }
@@ -366,7 +381,7 @@ ul, li {
   bottom: 0.2rem;
   left: 50%;
   transform: translateX(-50%);
-  background: url(../../static/img/springFestivalActivity/sureBg.png) no-repeat;
+  background: url(../../static/img/springFestivalActivity/sureBg2.png) no-repeat;
   background-size: 100% 100%;
   font-size: 0.34rem;
   color: #FFF5BD;
@@ -383,7 +398,7 @@ ul, li {
 
 .rule-dialog{
   width: 7rem;
-  height: 8.42rem;
+  height: 8.82rem;
   background: url(../../static/img/springFestivalActivity/ruleBg.png) no-repeat;
   background-size: 100% 100%;
   border-radius: 0.2rem;
@@ -405,7 +420,7 @@ ul, li {
 .rule-list{
   width: 4.76rem;
   position: absolute;
-  bottom: 0.9rem;
+  top: 1.6rem;
   left: 50%;
   transform: translateX(-50%);
   font-size: 0.26rem;
@@ -517,11 +532,13 @@ ul, li {
 .btn-row{
   width: 5.6rem;
   display: flex;
-  margin: auto;
-  margin-top: 0.5rem;
+  position: absolute;
+  bottom: 0.66rem;
+  left: 50%;
+  transform: translateX(-50%);
 }
 
-.left-btn{
+.left-btn{  
   width: 3.02rem;
   height: 1.02rem;
   line-height: 1.02rem;
@@ -550,7 +567,8 @@ ul, li {
   font-size: 0.24rem;
   color: #FFE4BD;
   margin-left: 1.6rem;
-  margin-top: 0.06rem;
+  position: absolute;
+  bottom: 0.26rem;
 }
 
 .one-result{

BIN
microserviceUserH5/static/img/springFestivalActivity/sureBg2.png


+ 48 - 9
microserviceUserH5/vcloud/springFestivalActivity.html

@@ -36,7 +36,10 @@
 		</div>
 		<div class="no-join-activity">使用激活码,星币支付及PC端不参与活动</div>
 		<div class="share-wrap">分享至朋友圈、QQ获得“幸运BUFF”</div>
-		<div class="get-award">已获取奖励</div>
+		<div class="get-award">
+			<div class="award-text">已获取奖励</div>
+			<div class="award-number"></div>
+		</div>
 		<div class="activity-time">活动时间 :2021年1月25日-2月15日</div>
 		<div class="activity-tip">仅购买星曜月卡,星曜年卡才可参与此活动哦</div>
 	</div>
@@ -89,7 +92,7 @@
 			<div class="have-times-wrap">
 				<div class="result-tip-row">
 					<div class="award-result-tip">善良的人,好运气最终是会眷顾你</div>
-					<div class="join-result-tip">参与抽奖有几率获得以下奖励</div>
+					<div class="join-result-tip">抽取奖励仅为新增云手机,请去云手机首页查看</div>
 				</div>
 				<div class="card-wrap award-result-wrap"></div>
 				<div class="btn-row">
@@ -141,8 +144,11 @@
 		let activityState = 0,
 		    luckDraw = 0,
 		    surplus = 0,
-			receive = 0,
+			receive = 1,
+			pages = 0,
+			pageNum = 0,
 			notReceive = 0;
+			recordFlag = false;
 		if(id !== ''){
 			operate(3);
 		}
@@ -204,11 +210,15 @@
 							$('.gift-box')[0].className = 'gift-box'
 						}
 						if(notReceive > 0){
+			                receive = 0;
 				            $('.tab-wrap').eq(0).css('display', 'flex');
 				            $('.record-wrap').eq(0).css('marginTop', '0.2rem');
 				            $('.record-wrap').eq(0).css('height', '5.38rem');
 				            $('.data-list').eq(0).css('height', '4.38rem');
+				            $('.award-number').eq(0).css('display', 'block');
+						    $('.award-number').eq(0).text(notReceive);
 						}else{
+				            $('.award-number').eq(0).css('display', 'none');
 				            $('.tab-wrap').eq(0).css('display', 'none');
 				            $('.record-wrap').eq(0).css('marginTop', '1.6rem');
 				            $('.record-wrap').eq(0).css('height', '5.86rem');
@@ -271,6 +281,10 @@
 			}else{
 				$('.award-change-btn')[1].className = 'award-change-btn'
 			}
+			$('.data-list').eq(0).text('');
+			pageNum = 1;
+			pages = 0;
+			recordFlag = true;
 			getAward();
 			$('.award-change-btn')[receive].className = 'award-change-btn active'
 		},false);
@@ -344,7 +358,6 @@
 							list = res.data.list;
 						if(list.length === 1){
 						    $('.report-times').eq(0).text(1);
-						    $('.look-btn').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" />
@@ -360,6 +373,9 @@
 										</div>`
 							}
 						}
+						if(notReceive === 0){
+				            $('.join-result-tip').eq(0).css('opcity', '0');
+						}
 						let text = notReceive > 0?'确定':'查看';
 						$('.look-btn').eq(0).text(text);
 						$('.award-result-wrap').eq(0).append(str);
@@ -433,9 +449,17 @@
 					url: '/packageA/order/buy/index?type=activity'
 				})
 			} else if (isAndroid) { // 安卓
-				window.native.startPurchase(1, 365);
+				if(notReceive > 0){
+					window.native.startRenew();
+				} else {
+				    window.native.startPurchase(1, 365);
+				}
 			} else if (isiOS) {
-				window.webkit.messageHandlers.startPurchase.postMessage({ type: 1, day: 365 });
+				if(notReceive > 0){
+					window.webkit.messageHandlers.startRenew.postMessage();
+				} else {
+					window.webkit.messageHandlers.startPurchase.postMessage({ type: 1, day: 365 });
+				}
 			}
 		},false);
 		//点击获取次数
@@ -518,7 +542,7 @@
 					'Authorization': id //id
 				},
 				data:JSON.stringify({
-					pageNum: 1,
+					pageNum: pageNum,
 					pageSize: 10,
 					receive: receive
 				}),
@@ -527,9 +551,10 @@
 				cache: false,
 				success: function (res) {
 					if(res.status === 0){
-						$('.data-list').eq(0).text('');
+						recordFlag = true;
 						let str = '',
 						    records = res.data.records;
+							pages = res.data.pages;
 							if(records.length === 0){
 								str = '<div class="no-award">没有抽奖记录,我都替你着急</div>'
 							}
@@ -539,7 +564,7 @@
 										<div class="record-time">${records[i].createTime.substring(5,7)}月${records[i].createTime.substring(8,10)}日${records[i].createTime.substr(11)}</div>
 										<div class="${records[i].receive === 1?'record-operate':'record-operate operate-btn'}"
 										data-awardId="${records[i].id}" data-awardName="星曜${records[i].effectiveTimeStr}卡">
-										${records[i].receive === 1?'已使用':'使用'}</div>
+										${records[i].receive === 1?'已使用':'获取'}</div>
 									</div>`
 						}
 						$('.data-list').eq(0).append(str)
@@ -552,6 +577,20 @@
 				},
 			})
 		}
+		//抽奖记录数据下拉加载
+		$('.data-list')[0].addEventListener('scroll',function () {
+			console.log(2222222)
+			let scrollTop = $('.data-list')[0].scrollTop;
+			let clientHeight = $('.data-list')[0].clientHeight;
+			let scrollHeight = $('.data-list')[0].scrollHeight;
+			if(scrollTop + clientHeight + 100 > scrollHeight){
+				if(recordFlag && pageNum < pages && pages > 1){
+					recordFlag = false;
+					pageNum++;
+				    getAward();
+				}
+			}
+		});
 		//复制
 		function copyUrl(url) {
 			stopManyClick(() => {