heyang 3 роки тому
батько
коміт
889bcca08e

+ 14 - 13
microserviceUserH5/vcloud/actFission.html

@@ -61,7 +61,7 @@
 
 		.list {
 			width: 100%;
-			height: 15.42rem;
+			height: 14.82rem;
 			background-color: #1F1A3A;
 			padding: 0 0.3rem;
 
@@ -185,16 +185,16 @@
 
 		.rule-box {
 			width: 100%;
-			height: 7.9rem;
-			padding: 0.8rem 0.4rem 0.4rem 0.4rem;
+			height: 7.8rem;
+			padding: 1.1rem 0.3rem 0.4rem 0.3rem;
 		}
 
 		.rule-box .rule {
-			margin-top: 0.48rem;
-			font-size: 0.28rem;
+			margin-top: 0.2rem;
+			font-size: 0.26rem;
 			font-family: PingFangSC-Regular, PingFang SC;
 			color: #FFFFFF;
-			line-height: 0.46rem;
+			line-height: 0.37rem;
 			letter-spacing: 0.013rem;
 		}
 
@@ -380,15 +380,16 @@
 					<div class="img-box">活动规则</div>
 				</div> -->
 				<div class="rule">
-					<p>1.分享双子星攻略文章至微信好友/微信朋友圈/QQ,好友注册成功后,分享者即可获得3天{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}套餐时长,被分享者可获得{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}7天卡激活码。</p>
-					<p>2.用户通过该分享链接获取的激活码,只针对新注册用户有效领取并兑换一次。</p>
-					<p>3.分享者每日最多分享给10位好友领取激活码并获得注册奖励,且奖励为当日有效,奖励过期不补发。</p>
-					<p>4.分享者若没有云机,需要先创建{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}云机才可继续领取奖励。</p>
-					<p>5.新用户领取的激活码需在有效期内使用,若超过有效期则激活码失效。</p>
+					<p>1.分享双子星攻略文章至微信好友/微信朋友圈/QQ等,好友通过分享链接注册成功后,分享者即可获得3天{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}云手机时长,被分享者可获{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}云手机7天激活码。</p>
+					<p>2.用户通过该分享链接获取的激活码仅限新注册用户兑换。</p>
+					<p>3.分享者每日最多获得10位好友的注册奖励,且奖励当日有效,奖励过期失效后无法领取且不予补发。</p>
+					<p>4.分享者需拥有{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}云机(除试用机外)才可领取奖励,若无{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}云手机请先创建,创建后继续领取奖励。</p>
+					<p>5.新用户领取激活码需在有效期内使用(有效期为3天),若超过有效期则激活码失效。</p>
+					<p>6.本活动仅限真实有效用户参与,任何非正常获利手段经核查验证,官方将进行账户回收等惩罚措施。</p>
 				</div>
-				<div class="bottoms">
+				<!-- <div class="bottoms">
 					<img src="../static/offImg/bottom.png" class="bottom" alt="">
-				</div>
+				</div> -->
 			</div>
 		</div>
 	</div>

+ 16 - 3
microserviceUserH5/vcloud/actFissionList.html

@@ -43,13 +43,15 @@
 		.icon{
 			width: 1.8rem;
 			height: 1.36rem;
+			border-radius: 0.1rem;
 		}
 		.titles{
 			font-size: 0.3rem;
 			color: #333333;
 		}
 		.contents{
-			max-height: 0.7rem;
+			max-height: 0.66rem;
+			max-width: 4.4rem;
 			margin-top: 0.2rem;
 			font-size: 0.24rem;
 			color: #999999;
@@ -167,9 +169,20 @@
 				getContent(index, content){
 					this.$nextTick(() => {
 						let dom = document.getElementsByClassName('contents')[index];
-						console.log(dom)
 						if(dom){
-							dom.innerHTML = content;
+							//对img标签进行匹配
+							var imgReg = /<img.*?(?:>|\/>)<br \/>/gi;
+							let oldContent = content;
+							if(imgReg.test(content)){//有图片
+								//将img标签替换为*
+								content =  content.replace(imgReg,"");
+							}
+							if(content == ''){
+								dom.innerHTML = oldContent;
+							}else{
+								dom.innerHTML = content;
+							}
+							
 						}
 					})
 				},

+ 6 - 5
microserviceUserH5/vcloud/actFissionShare.html

@@ -514,12 +514,12 @@
             document.documentElement.style.overflow='auto';
 		});
         $('.get-success-block')[0].addEventListener('click', (e) => {
-            if(isIOS){
-                copyUrl();
+            let ua = navigator.userAgent.toLowerCase();
+            if (ua.match(/MicroMessenger/i) == "micromessenger") {
+                location.href = 'weixin://dl/business/?t=sg6FNjcPWip';
             }else{
-                let ua = navigator.userAgent.toLowerCase();
-                if (ua.match(/MicroMessenger/i) == "micromessenger") {
-                    location.href = 'weixin://dl/business/?t=sg6FNjcPWip';
+                if(isIOS){
+                    copyUrl();
                 }else{
                     download();
                 }
@@ -882,6 +882,7 @@
 					if (isAndroid) {
 						window.native.share(title, content, `${baseUrl}/h5/microserviceUserH5/vcloud/actFissionShare.html?username=${result}&strategyId=${this.strategyId}&tagId=${GetRequest().tagId}`, shareImg)
 					} else if (isIOS) {
+
 						window.webkit.messageHandlers.share.postMessage({
 							title: title,
 							content: content,