ソースを参照

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

huangxiaojing 3 年 前
コミット
9d4a6e824f

+ 5 - 1
microserviceUserH5/static/css/browserDetail.css

@@ -30,7 +30,7 @@ input{
   background: #F5F7FA;
 }
 .download-wrap{
-  padding-top: 2.74rem;
+  padding-top: 1.88rem;
   padding-bottom: 0.3rem;
   height: calc(99vh - 2.94rem);
   overflow-y: scroll;
@@ -203,6 +203,10 @@ input{
   text-align: center;
 }
 
+::-webkit-scrollbar {
+  display: none; /* Chrome Safari */
+}
+
 #toast-container>.toast-error {
   background-image: none !important;
   border-radius: 0.2rem;

+ 37 - 37
microserviceUserH5/vcloud/browserDetail.html

@@ -5,7 +5,7 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<link rel="icon" href="../static/img/favicon2.ico" type="img/x-ico">
 	<meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0">
-	<title>双子星浏览器</title>
+	<title></title>
 	<link rel="stylesheet" href="https://cdn.bootcss.com/weui/1.1.3/style/weui.min.css">
 	<script src="../static/js/vender/vue/axios.min.js"></script>
 	<script src="../static/js/vender/vue/vue.min.js"></script>
@@ -27,10 +27,10 @@
 <body>
 	<div class="container">
 		<div class="header-wrap">
-			<div class="search-wrap" id="search-wrap">
+			<!-- <div class="search-wrap" id="search-wrap">
 				<img class="search-icon" src="../static/img/browser/search-icon2.png" />
 				<div class="ipt" id="ipt">双子星浏览器</div>
-			</div>
+			</div> -->
 			<div class="title-wrap">
 				<img class="left-arrow" src="../static/img/browser/left-arrow.png" />
 				<div class="title"></div>
@@ -43,6 +43,13 @@
 		</div>
 	</div>
 <script type="text/javascript">
+	document.addEventListener("visibilitychange",()=>{
+		if(document.hidden){
+			init();
+		}else{
+			init();
+		}
+	})
 	let title = decodeURIComponent(GetRequest().plateName);
 	let timer,flag = true;
 	let labelId = '', pageNum = 1, pageSize = 10, index = 0, recordFlag = true, total = 0, nowlength = 0, isLoading = false;
@@ -51,11 +58,6 @@
 		init();
 	})();
 	function init(){
-		// if(nowlength === 0) {
-		// 	stopManyClick(() => {
-		// 		toastr.error('加载中...');
-		// 	})
-		// }
 		$.ajax({
 			url: `${baseUrl}/api/public/v1/browserLabel/client/query/${GetRequest().plateId}`,
 			type: 'get',
@@ -95,9 +97,10 @@
 					if(res.code === 200){
 						let cardType = res.data.devType;
 						let phoneObj = {
-							'VIRTUAL': 'VIP',
+							'VIRTUAL_RK3399': 'VIP',
 							'RK_3399': 'SVIP',
-							'MTK_G90': 'STAR'
+							'MTK_G90': 'STAR',
+							'QUALCOMM': 'STARPRO'
 						}
 						phoneType = phoneObj[cardType];
 						resolve(phoneType);
@@ -175,9 +178,6 @@
 			pageNum = 1;
 			nowlength = 0;
 			total = 0;
-			// stopManyClick(() => {
-			// 	toastr.error('加载中...');
-			// })
 			$('.loading').eq(0).text('');
 			$('.tag-item')[index].className = 'tag-item';
 			index = e.target.dataset.index;
@@ -185,6 +185,25 @@
 			rankingGet();
 		}
 	},false);
+	// // 验证是否下架
+	// function isGetStatus(id) {
+	// 	$.ajax({
+	// 		url: `${baseUrl}/api/public/v1/browserLabel/getStatus/${id}`,
+	// 		type: 'get',
+	// 		contentType:"application/json",
+	// 		dataType: 'json',
+	// 		cache: false,
+	// 		success: function (res) {
+	// 			if(res.status === 0){
+					
+	// 			} else {
+	// 				stopManyClick(() => {
+	// 					toastr.error(res.msg);
+	// 				})
+	// 			}
+	// 		}
+	// 	})
+	// }
 	// 点击下载按钮
 	$('.download-wrap')[0].addEventListener('click',(e)=>{
 		let key = e.target.dataset.key;
@@ -219,25 +238,6 @@
 							}
 						}, false);
 						xhr.send();
-						// var formData = new FormData();
-						// formData.append("file",$("#photo")[0].files[0]);
-						// $.ajax({
-						// 	url: `${baseUrl}/document/file/breakUpload`,
-						// 	type: 'post',
-						// 	headers: {
-						// 		'file-access-key': '3dn9b4585511476691c6',
-						// 		'md5': md5
-						// 	},
-						// 	data: formData,
-						// 	contentType: false,
-        				// 	processData: false,
-						// 	cache: false,
-						// 	success: function (res) {
-						// 		console.log(res)
-						// 		if(res.status === 0){
-						// 		}
-						// 	}
-						// })
 					} else {
 						stopManyClick(() => {
 							toastr.error(res.msg);
@@ -274,11 +274,11 @@
 		timer = setTimeout(() => {flag = true}, 1500);
 	}
 	//点击按钮搜索
-	const searchDom = document.getElementById("search-wrap");
-	searchDom.addEventListener('click',()=>{
-		var wd = "https://www.baidu.com/s?ie=utf-8&f=8&rsv_bp=1&rsv_idx=1&tn=baidu";
-		window.open(wd);
-	},false);
+	// const searchDom = document.getElementById("search-wrap");
+	// searchDom.addEventListener('click',()=>{
+	// 	var wd = "https://www.baidu.com/s?ie=utf-8&f=8&rsv_bp=1&rsv_idx=1&tn=baidu";
+	// 	window.open(wd);
+	// },false);
 </script>
 </body>
 </html>

+ 3 - 2
screenAndroid/WXtrialInterface.html

@@ -1021,9 +1021,10 @@
             success: function (res) {
               if (res.status === 0) {
                 let list = res.data;
-                videoTime = list[0].forcedTime;
+                let indexs = Math.floor(Math.random()*list.length);
+                videoTime = list[indexs].forcedTime;
                 // $('#source').src = list[0].adVideoBase.videoUrl;
-                $("#source").attr("src", list[0].adVideoBase.videoUrl);//更新url
+                $("#source").attr("src", list[indexs].adVideoBase.videoUrl);//更新url
                 $("#source").attr("autoplay", "true");//直接播放
                 videoTimer = setInterval(() =>{
                   if(videoTime > 0) {

+ 3 - 2
screenIos/WXtrialInterface.html

@@ -961,9 +961,10 @@
             success: function (res) {
               if (res.status === 0) {
                 let list = res.data;
-                videoTime = list[0].forcedTime;
+                let indexs = Math.floor(Math.random()*list.length);
+                videoTime = list[indexs].forcedTime;
                 // $('#source').src = list[0].adVideoBase.videoUrl;
-                $("#source").attr("src", list[0].adVideoBase.videoUrl);//更新url
+                $("#source").attr("src", list[indexs].adVideoBase.videoUrl);//更新url
                 $("#source").attr("autoplay", "true");//直接播放
                 videoTimer = setInterval(() =>{
                   if(videoTime > 0) {