调整周年庆活动

microserviceUserH5/static/css/anniversaryCelebrate.css

@@ -731,7 +731,7 @@ ul, li {
 
 .many-one-card{
   padding-top: 0.35rem;
-  margin-left: 0.4rem;
+  /* margin-left: 0.4rem; */
 }
 
 .many-two-card{

microserviceUserH5/vcloud/anniversaryCelebrate.html

@@ -176,6 +176,8 @@
 		</div>
 		<div class="award-result-mask">
 			<div class="award-result-dialog-sure">
+				<img class="result-bg" src="../static/img/anniversaryCelebrate/result-bg.png" />
+				<img class="result-once-bg" src="../static/img/anniversaryCelebrate/result-once-bg.png" />
 				<div class="have-times-wrap">
 					<div class="award-result-tip"></div>
 					<div class="line"></div>
@@ -343,30 +345,30 @@
 			recordFlags = true,
 			userCardId = '',
 		    sliderNumber = 0,//滑块是数量，控制溢出不能滑动
-			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1, //android终端
-			imgs = ['../static/img/anniversaryCelebrate/result-bg.png','../static/img/anniversaryCelebrate/result-once-bg.png'];
+			isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+			// imgs = ['../static/img/anniversaryCelebrate/result-bg.png','../static/img/anniversaryCelebrate/result-once-bg.png'];
 		//异步加载图片
-		async function loadAsync() {
-			let promise = function(url) {
-				return new Promise((resolve, reject) => {
-				const image = new Image();
-				image.src = url;
-				if(image.src.includes('result-bg')){
-					image.className = 'result-bg';
-				}else{
-					image.className = 'result-once-bg';
-				}
-				image.onload = function() {
-					$('.award-result-dialog-sure')[0].insertBefore(image, $('.have-times-wrap')[0]);
-					resolve('ok');
-				}        
-				})      
-			}
-			for(let url of imgs) {
-				await promise(url);
-			}
-		}
-        loadAsync();
+		// async function loadAsync() {
+		// 	let promise = function(url) {
+		// 		return new Promise((resolve, reject) => {
+		// 		const image = new Image();
+		// 		image.src = url;
+		// 		if(image.src.includes('result-bg')){
+		// 			image.className = 'result-bg';
+		// 		}else{
+		// 			image.className = 'result-once-bg';
+		// 		}
+		// 		image.onload = function() {
+		// 			$('.award-result-dialog-sure')[0].insertBefore(image, $('.have-times-wrap')[0]);
+		// 			resolve('ok');
+		// 		}        
+		// 		})      
+		// 	}
+		// 	for(let url of imgs) {
+		// 		await promise(url);
+		// 	}
+		// }
+        // loadAsync();
 		// 初始化数据
 		init();
 		if(id){
@@ -569,30 +571,30 @@
 														<div class="card-text">星曜${list[2].awardDurations}天卡</div>
 													</div>
 												</div>`
-									}else if(list[i].awardType == 2){//外环
-										str += `<div class="card-item many-two-card">
+									}else if(list[i].awardType == 2){//外环188
+										str += `<div class="card-item many-one-card">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
-														<div class="card-text">星曜${list[1].awardDurations}天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+														<div class="card-text">星曜88天卡</div>
 													</div>
 												</div>
-												<div class="card-item many-one-card">
+												<div class="card-item many-two-card">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-														<div class="card-text">星曜188天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
+														<div class="card-text">星曜${list[1].awardDurations}天卡</div>
 													</div>
 												</div>`
-									} else if(list[i].awardType == 1) {//内环
-										str += `<div class="card-item many-two-card">
+									} else if(list[i].awardType == 1) {//内环88
+										str += `<div class="card-item many-one-card">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-														<div class="card-text">星曜88天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
+														<div class="card-text">星曜${list[1].awardDurations}天卡</div>
 													</div>
 												</div>
-												<div class="card-item many-one-card">
+												<div class="card-item many-two-card">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
-														<div class="card-text">星曜${list[1].awardDurations}天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+														<div class="card-text">星曜188天卡</div>
 													</div>
 												</div>`
 									}
@@ -638,7 +640,7 @@
 										if(i == 5) {
 											str += `<div class="card-item many-card-item">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
+														<img class="many-card" src="../static/img/anniversaryCelebrate/${list[i].awardType==1 ? 'first' : 'second'}.png" />
 														<div class="card-text">星曜${list[i].awardDurations}天卡</div>
 													</div>
 												</div>`
@@ -646,35 +648,35 @@
 										if(i == 6) {
 											str += `<div class="card-item many-card-item two-item">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
+														<img class="many-card" src="../static/img/anniversaryCelebrate/${list[i].awardType==1 ? 'first' : 'second'}.png" />
 														<div class="card-text">星曜${list[i].awardDurations}天卡</div>
 													</div>
 												</div>`
 										}
-									} else if(list[i].awardType == 2){
+									} else if(list[i].awardType == 2){//外环188
 										str += `<div class="card-item many-card-item">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
-														<div class="card-text">星曜${list[i].awardDurations}天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+														<div class="card-text">星曜88天卡</div>
 													</div>
 												</div>
 												<div class="card-item many-card-item two-item">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-														<div class="card-text">星曜188天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
+														<div class="card-text">星曜${list[i].awardDurations}天卡</div>
 													</div>
 												</div>`
-									} else if(list[i].awardType == 1) {
+									} else if(list[i].awardType == 1) {//内环88
 										str += `<div class="card-item many-card-item">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
-														<div class="card-text">星曜88天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/first.png" />
+														<div class="card-text">星曜${list[i].awardDurations}天卡</div>
 													</div>
 												</div>
 												<div class="card-item many-card-item two-item">
 													<div class="card-item-wrap card-item-wraps">
-														<img class="many-card" src="../static/img/anniversaryCelebrate/second.png" />
-														<div class="card-text">星曜${list[i].awardDurations}天卡</div>
+														<img class="many-card" src="../static/img/anniversaryCelebrate/no-award-selcet.png" />
+														<div class="card-text">星曜188天卡</div>
 													</div>
 												</div>`
 									}