heyang 3 years ago
parent
commit
7fa7d89f26

+ 37 - 37
microserviceUserH5/vcloud/browserDetail.html

@@ -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);
@@ -172,19 +175,35 @@
 		labelId = e.target.dataset.id;
 		let className = e.target.className;
 		if(className.includes('tag-item')){
-			pageNum = 1;
-			nowlength = 0;
-			total = 0;
-			// stopManyClick(() => {
-			// 	toastr.error('加载中...');
-			// })
-			$('.loading').eq(0).text('');
-			$('.tag-item')[index].className = 'tag-item';
-			index = e.target.dataset.index;
-			$('.tag-item')[index].className = 'tag-item active';
-			rankingGet();
+			isGetStatus(labelId)
 		}
 	},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){
+					pageNum = 1;
+					nowlength = 0;
+					total = 0;
+					$('.loading').eq(0).text('');
+					$('.tag-item')[index].className = 'tag-item';
+					index = e.target.dataset.index;
+					$('.tag-item')[index].className = 'tag-item active';
+					rankingGet();
+				} 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);

+ 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) {