홈 탐색 도움말
가입하기 로그인
tangdehang
/
android-cloud-H5
Watch 1
Star 0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

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

heyang 3 년 전
부모
d8b630f069 b8fbc9313b
커밋
2487524c1e
5개의 변경된 파일과 53개의 추가작업 그리고 34개의 파일을 삭제
분할 보기 변경상태 보기
  1. 3 3
      microserviceUserH5/vcloud/actFission.html
  2. 2 2
      microserviceUserH5/vcloud/iosEnter.html
  3. 16 19
      microserviceUserH5/vcloud/userManual.html
  4. 25 5
      screenAndroid/WXtrialInterface.html
  5. 7 5
      screenIos/WXtrialInterface.html

+ 3 - 3
microserviceUserH5/vcloud/actFission.html
파일 보기 

@@ -358,7 +358,7 @@
 
 								</div>
 
 							</div>
 
 							<div class="right-nav">
 
-								<p>[{{item.phoneType === 'VIP'?'星动':item.phoneType === 'SVIP'?'星曜':'唔即'}}3天卡]</p>
 
+								<p>[{{item.phoneType === 'VIP'?'星动':item.phoneType === 'SVIP'?'星曜':'唔即'}}1天卡]</p>
 
 								<p class="btn" @click='goGetReward(item.id, item.phoneType)' v-if='item.receiveStatus==0'>领取</p>
 
 								<p class="btn isdisabled" v-if='item.receiveStatus==1'>已领取</p>
 
 
@@ -380,9 +380,9 @@
 
 					<div class="img-box">活动规则</div>
 
 				</div> -->
 
 				<div class="rule">
 
-					<p>1.分享双子星攻略文章至微信好友/微信朋友圈/QQ等，好友通过分享链接注册成功后，分享者即可获得3天{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}云手机时长，被分享者可获{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}云手机7天激活码。</p>
 
+					<p>1.分享双子星攻略文章至微信好友/微信朋友圈/QQ等，好友通过分享链接注册成功后，分享者即可获得1天{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}云手机时长，被分享者可获{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}云手机3天激活码。</p>
 
 					<p>2.用户通过该分享链接获取的激活码仅限新注册用户兑换。</p>
 
-					<p>3.分享者每日最多获得10位好友的注册奖励，且奖励当日有效，奖励过期失效后无法领取且不予补发。</p>
 
+					<p>3.分享者每日最多获得5位好友的注册奖励，且奖励当日有效，奖励过期失效后无法领取且不予补发。</p>
 
 					<p>4.分享者需拥有{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}云机（除试用机外）才可领取奖励，若无{{phoneType === 'VIP'?'星动':phoneType === 'SVIP'?'星曜':'唔即'}}云手机请先创建，创建后继续领取奖励。</p>
 
 					<p>5.新用户领取激活码需在有效期内使用（有效期为3天），若超过有效期则激活码失效。</p>
 
 					<p>6.本活动仅限真实有效用户参与，任何非正常获利手段经核查验证，官方将进行账户回收等惩罚措施。</p>

+ 2 - 2
microserviceUserH5/vcloud/iosEnter.html
파일 보기 

@@ -3,7 +3,7 @@
 
 
 <head>
 
 	<meta charset="UTF-8">
 
-	<title>双子星</title>
 
+	<title></title>
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
 
 	<link rel="stylesheet" href="../static/js/vender/bootstrap/css/bootstrap.min.css">
 
@@ -28,7 +28,7 @@
 
 <script type="text/javascript" th:inline="javascript">
 
 	let node = document.getElementById('index-what');
 
 	node.addEventListener('click', () => {
 
-		window.location.href = 'https://www.baidu.com/s'
 
+		window.location.href = 'https://www.baidu.com/'
 
 	})
 
 </script>
 
 </body>

+ 16 - 19
microserviceUserH5/vcloud/userManual.html
파일 보기 

@@ -51,27 +51,24 @@
 
           content: '',
 
         },
 
         computed: {},
 
-
 
-        methods: {
 
-          async getUserManual() {
 
-            const response = await service.get(
 
-              '/api/public/v5/agreementApi/content/getContentByType',
 
-              {
 
-                params: {
 
-                  agreementCoding: 'XYPZYHXY2004',
 
-                  type: 1,
 
-                },
 
+        methods: {},
 
+        mounted() {
 
+          service
 
+            .get('/api/public/v5/agreementApi/content/getContentByType', {
 
+              params: {
 
+                agreementCoding: 'XYPZYHXY2004',
 
+                type: 1,
 
+              },
 
+            })
 
+            .then(
 
+              (response) => {
 
+                this.title = response.data.agreementName;
 
+                this.content = response.data.content;
 
+              },
 
+              (error) => {
 
+                toastr.error(err.message);
 
               },
 
             );
 
-            return response.data;
 
-          },
 
-        },
 
-
 
-        async mounted() {
 
-          // throw new Error('失敬失敬');
 
-          const { agreementName: title, content } = await this.getUserManual();
 
-          this.title = title;
 
-          this.content = content;
 
         },
 
         errorCaptured(err, vm, info) {
 
           toastr.error(err.message);

+ 25 - 5
screenAndroid/WXtrialInterface.html
파일 보기 

@@ -435,14 +435,34 @@
 
 
     // 处理页面可见属性的改变
 
     document.addEventListener("visibilitychange", function () {
 
-      console.log(document[hidden]);
 
-      if (document[hidden]) {
 
-        quit();
 
-        ws.close();
 
-        wsss.close();
 
+
 
+      if (navigator.userAgent.toLowerCase().includes('toutiaomicroapp')) {
 
+        visibilitychange();
 
+      } else if (window.__wxjs_environment === 'miniprogram') {
 
+        visibilitychange();
 
+      } else {
 
+        if (document[hidden]) {
 
+          ws.close();
 
+          wsss.close();
 
+          uni.webView.navigateTo({
 
+            url: '/pages/index/index'
 
+          });
 
+        }
 
       }
 
     }, false);
 
 
+    function visibilitychange() {
 
+      if (document.visibilityState == "visible") {
 
+        var buffer = RequestIFrame();
 
+        ws.send(buffer);
 
+        isVisuable = true;
 
+      } else {
 
+        isVisuable = false;
 
+        isFeed = false;
 
+        myVideo.pause();
 
+      }
 
+    }
 
+
 
     myVideo.addEventListener('pause', function () {
 
       isFeed = false;
 
     });

+ 7 - 5
screenIos/WXtrialInterface.html
파일 보기 

@@ -1113,11 +1113,13 @@
 
     // 处理页面可见属性的改变
 
     document.addEventListener("visibilitychange", function () {
 
       if (document[hidden]) {
 
-        quit();
 
-        wsss.close();
 
-        decodeWoker.postMessage('close');
 
-        decodeWoker.terminate();
 
-        webSocketWorker.terminate();
 
+        if (!navigator.userAgent.toLowerCase().includes('toutiaomicroapp') || window.__wxjs_environment !== 'miniprogram') {
 
+          ws.close();
 
+          wsss.close();
 
+          uni.webView.navigateTo({
 
+            url: '/pages/index/index'
 
+          });
 
+        }
 
       }
 
     }, false);