Explorar o código

Merge branch 'dev-4.9.3' of http://192.168.32.253:3000/Software/android-cloud-H5 into dev-4.9.3

heyang %!s(int64=4) %!d(string=hai) anos
pai
achega
5bb3692b3f

+ 1 - 1
microserviceUserH5/vcloud/actFission.html

@@ -319,7 +319,7 @@
 				<div class="rule">
 				<div class="rule">
 					<p>1.分享双子星攻略文章至微信好友/微信朋友圈/QQ,好友注册成功后,分享者即可获得1小时星动套餐时长。</p>
 					<p>1.分享双子星攻略文章至微信好友/微信朋友圈/QQ,好友注册成功后,分享者即可获得1小时星动套餐时长。</p>
 					<p>2.用户通过该分享链接获取的激活码,只针对新注册用户有效领取并兑换一次。</p>
 					<p>2.用户通过该分享链接获取的激活码,只针对新注册用户有效领取并兑换一次。</p>
-					<p>3.分享者每日最多获得10位好友的注册奖励,且奖励为当日有效,奖励过期不补发。</p>
+					<p>3.分享者每日最多分享给10位好友领取激活码并获得注册奖励,且奖励为当日有效,奖励过期不补发。</p>
 					<p>4.分享者若没有云机,需要先创建星动云机才可继续领取奖励。</p>
 					<p>4.分享者若没有云机,需要先创建星动云机才可继续领取奖励。</p>
 					<p>5.新用户领取的激活码需在有效期内使用,若超过有效期则激活码失效。</p>
 					<p>5.新用户领取的激活码需在有效期内使用,若超过有效期则激活码失效。</p>
 				</div>
 				</div>

+ 16 - 8
microserviceUserH5/vcloud/actFissionShare.html

@@ -4,8 +4,8 @@
 <head>
 <head>
     <meta charset="UTF-8">
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <meta name="description" content="分享朋友">
-    <title></title>
+    <meta name="description" content="分享内容 ">
+    <title>分享内容 </title>
     <link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
     <link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
     <link rel="stylesheet" href="../static/css/index.css?v=1.0.0.2">
     <link rel="stylesheet" href="../static/css/index.css?v=1.0.0.2">
     <link rel="stylesheet" href="../static/css/vant.css" />
     <link rel="stylesheet" href="../static/css/vant.css" />
@@ -21,7 +21,6 @@
             /* align-items: center;
             /* align-items: center;
 			justify-content: center; */
 			justify-content: center; */
         }
         }
-
         .top-banner {
         .top-banner {
             width: 6.82rem;
             width: 6.82rem;
             height: 0.82rem;
             height: 0.82rem;
@@ -206,11 +205,14 @@
         .top-banner {
         .top-banner {
             margin: 0 auto;
             margin: 0 auto;
         }
         }
+        .hide{
+            display: none;
+        }
     </style>
     </style>
 </head>
 </head>
 
 
 <body>
 <body>
-    <div id="app" v-cloak class="container">
+    <div id="app" v-cloak class="container hide">
         <div v-if='isshow&&topic!=null' style="margin: 0 auto;">
         <div v-if='isshow&&topic!=null' style="margin: 0 auto;">
 
 
             <div class="top-banner">
             <div class="top-banner">
@@ -253,10 +255,15 @@
     <script src="../static/js/vender/vue/vue-clipboard.min.js"></script>
     <script src="../static/js/vender/vue/vue-clipboard.min.js"></script>
 
 
     <script type="text/javascript">
     <script type="text/javascript">
+          var meta_description = document.getElementsByTagName('meta')['description']
+          document.title = '更新标题' 
+          meta_description.content = '更新描述'; // Android iOS
+                document.querySelector('#app').classList.remove('hide');
         var u = navigator.userAgent,
         var u = navigator.userAgent,
             app = navigator.appVersion;
             app = navigator.appVersion;
         var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //g
         var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1; //g
         var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
         var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+      
         new Vue({
         new Vue({
             el: '#app',
             el: '#app',
             data: {
             data: {
@@ -276,6 +283,7 @@
                 // window.location.href = 'investigate.html'
                 // window.location.href = 'investigate.html'
             },
             },
             mounted() {
             mounted() {
+              
                 this.getActDetail();
                 this.getActDetail();
 
 
                 this.getMarquee(); //跑马灯
                 this.getMarquee(); //跑马灯
@@ -288,9 +296,9 @@
                 }
                 }
                 console.log(this.uuid);
                 console.log(this.uuid);
 
 
-
             },
             },
             methods: {
             methods: {
+                
                 //查看活动是否下架
                 //查看活动是否下架
                 getActDetail() { //获取活动状态
                 getActDetail() { //获取活动状态
                     getActDetail().then(res => {
                     getActDetail().then(res => {
@@ -337,12 +345,12 @@
 
 
                             try {
                             try {
                                 if (isIOS) {
                                 if (isIOS) {
-                                    var input = document.createElement("input");
+                                    const input = document.createElement("input");
                                     input.value = this.code;
                                     input.value = this.code;
                                     document.body.appendChild(input);
                                     document.body.appendChild(input);
                                     input.select();
                                     input.select();
-                                    input.setSelectionRange(0, input.value.length), document
-                                        .execCommand('Copy');
+                                    input.setSelectionRange(0, input.value.length);
+                                    document.execCommand('Copy');
                                     document.body.removeChild(input);
                                     document.body.removeChild(input);
                                     this.$dialog.alert({
                                     this.$dialog.alert({
                                         message: '复制成功'
                                         message: '复制成功'

+ 15 - 2
microserviceUserH5/vcloud/share.html

@@ -32,13 +32,13 @@
 		}
 		}
 
 
 		.footer img {
 		.footer img {
-	        width: 5.22rem;
+			width: 5.22rem;
 			height: 100%;
 			height: 100%;
 		}
 		}
 
 
 		.hideContainer {
 		.hideContainer {
 			width: 7.5rem;
 			width: 7.5rem;
-			display: flex; 
+			display: flex;
 			justify-content: center;
 			justify-content: center;
 			align-items: center;
 			align-items: center;
 			height: calc(100vh - 1.36rem);
 			height: calc(100vh - 1.36rem);
@@ -111,6 +111,19 @@
 			letter-spacing: 0.02rem;
 			letter-spacing: 0.02rem;
 
 
 		}
 		}
+
+		h1,
+		h2,
+		h3,
+		h4,
+		h5 {
+			font-size: 0.32rem;
+			font-family: PingFangSC-Semibold, PingFang SC;
+			font-weight: 600;
+			color: #333333;
+			margin-bottom: 0.12rem;
+			margin-top: 0.12rem;
+		}
 	</style>
 	</style>
 </head>
 </head>