From fe0adc6356b07ca0f40fbfa81fe94f5d2ad22a66 Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Thu, 20 Oct 2022 11:29:06 +0800
Subject: [PATCH] 测试
---
css/neck.css | 15 ++++++++++++++-
css/neck.less | 16 +++++++++++++++-
focus.html | 6 +++---
images/Lock-no.png | Bin 295 -> 0 bytes
imagesPage.html | 2 +-
index.html | 14 +++++++-------
lib/default.js | 4 ++--
live.html | 2 +-
room/liveRoom.html | 4 ++--
tag.html | 2 +-
videoPage.html | 2 +-
11 files changed, 47 insertions(+), 20 deletions(-)
diff --git a/css/neck.css b/css/neck.css
index 1ff5434..3a03766 100644
--- a/css/neck.css
+++ b/css/neck.css
@@ -616,7 +616,8 @@ html * {
z-index: 5;
top: 6px;
left: 8px;
- width: 24px;
+ width: 58px;
+ animation: lockShow 2s linear infinite;
}
.like-ul img {
width: 73px;
@@ -831,6 +832,18 @@ html * {
z-index: 5;
top: 6px;
left: 8px;
+ animation: lockShow 2s linear infinite;
+}
+@keyframes lockShow {
+ 0% {
+ opacity: 1;
+ }
+ 50% {
+ opacity: 0.8;
+ }
+ 100% {
+ opacity: 1;
+ }
}
.live-top-shadow2 {
width: 268px;
diff --git a/css/neck.less b/css/neck.less
index 6721d18..a5b0890 100644
--- a/css/neck.less
+++ b/css/neck.less
@@ -655,7 +655,8 @@
z-index: 5;
top: 6px;
left: 8px;
- width: 24px;
+ width: 58px;
+ animation: lockShow 2s linear infinite;
}
img{
width: 73px;
@@ -884,7 +885,20 @@
z-index: 5;
top: 6px;
left: 8px;
+ animation: lockShow 2s linear infinite;
}
+@keyframes lockShow{
+ 0%{
+ opacity: 1;
+ }
+ 50%{
+ opacity: 0.8;
+ }
+ 100%{
+ opacity: 1;
+ }
+}
+
.live-top-shadow2{
width: 268px;
height: 130px;
diff --git a/focus.html b/focus.html
index 19e0d88..eafa5f1 100644
--- a/focus.html
+++ b/focus.html
@@ -38,7 +38,7 @@
<link rel="alternate" media="only screen and (max-width: 640px)" href="https://www.footseen.xyz/mobile/index.html">
<link rel="stylesheet" href="css/base.css?v=20220630">
<link rel="stylesheet" href="css/layer.css">
- <link rel="stylesheet" href="css/neck.css?v=2022101301">
+ <link rel="stylesheet" href="css/neck.css?v=2022102001">
<link rel="stylesheet" href="css/login.css?v=2022101102">
<script src="https://accounts.google.com/gsi/client" async defer></script>
<script src="https://www.footseen.xyz/lib/hello.js"></script>
@@ -479,8 +479,8 @@ $(function(){
liveNum++
likeMcArr.push(list.uid)
html+='<a href="https://www.footseen.xyz/room/liveRoom.html?roomId='+list.uid+'"><li style="background: url(https://zhibocdn.yabolive.net/comm'+list.face+'?x-oss-process=image/resize,w_368) no-repeat;background-size: cover;">';
- if(list.liveScope==3&&list.selfLock==1)html+='<img class="lock" src="images/Lock-ok.png">';
- else if(list.liveScope==3&&list.selfLock==0)html+='<img class="lock" src="images/Lock-no.png">';
+ if(list.liveScope==3&&list.selfLock==1)html+='<img class="lock" src="images/Lock-no.png?v=20221020">';
+ else if(list.liveScope==3&&list.selfLock==0)html+='<img class="lock" src="images/Lock-no.png?v=20221020">';
html+='<img class="live" src="images/front/live.webp" alt="">';
html+='<div class="like-shadow"></div>';
html+='<p class="like-li-name">'+list.nickname+'</p>';
diff --git a/images/Lock-no.png b/images/Lock-no.png
index f6bcdb2..f116508 100644
Binary files a/images/Lock-no.png and b/images/Lock-no.png differ
diff --git a/imagesPage.html b/imagesPage.html
index c300a00..80b6632 100644
--- a/imagesPage.html
+++ b/imagesPage.html
@@ -38,7 +38,7 @@
<link rel="alternate" media="only screen and (max-width: 640px)" href="https://www.footseen.xyz/mobile/index.html">
<link rel="stylesheet" href="css/base.css?v=20220630">
<link rel="stylesheet" href="css/layer.css">
- <link rel="stylesheet" href="css/neck.css?v=2022101301">
+ <link rel="stylesheet" href="css/neck.css?v=2022102001">
<link rel="stylesheet" href="css/login.css?v=2022101102">
<script src="https://accounts.google.com/gsi/client" async defer></script>
<script src="https://www.footseen.xyz/lib/hello.js"></script>
diff --git a/index.html b/index.html
index 84ca161..94bb8b7 100644
--- a/index.html
+++ b/index.html
@@ -40,7 +40,7 @@
<link rel="alternate" media="only screen and (max-width: 640px)" href="mobile/index.html">
<link rel="stylesheet" href="css/base.css?v=20220630">
<link rel="stylesheet" href="css/layer.css">
- <link rel="stylesheet" href="css/neck.css?v=2022101301">
+ <link rel="stylesheet" href="css/neck.css?v=2022102001">
<link rel="stylesheet" href="css/login.css?v=2022101102">
<script src="https://accounts.google.com/gsi/client" async defer></script>
<script src="lib/hello.js"></script>
@@ -414,8 +414,8 @@ $(function(){
liveNum++
likeMcArr.push(list.uid)
html+='<a href="room/liveRoom.html?roomId='+list.uid+'"><li style="background: url(https://zhibocdn.yabolive.net/comm'+list.face+'?x-oss-process=image/resize,w_368) no-repeat;background-size: cover;">';
- if(list.liveScope==3&&list.selfLock==1)html+='<img class="lock" src="images/Lock-ok.png">';
- else if(list.liveScope==3&&list.selfLock==0)html+='<img class="lock" src="images/Lock-no.png">';
+ if(list.liveScope==3&&list.selfLock==1)html+='<img class="lock" src="images/Lock-no.png?v=2022102001">';
+ else if(list.liveScope==3&&list.selfLock==0)html+='<img class="lock" src="images/Lock-no.png?v=2022102001">';
html+='<img class="live" src="images/front/live.webp" alt="">';
html+='<div class="like-shadow"></div>';
html+='<p class="like-li-name">'+list.nickname+'</p>';
@@ -459,8 +459,8 @@ $(function(){
if(roomLikeEnd==true)continue;
html+='<li>';
html+='<a href="room/liveRoom.html?roomId='+list.roomId+'"><div style="background: url(https://zhibocdn.yabolive.net/comm'+list.face.split('?')[0]+'?x-oss-process=image/resize,w_368) no-repeat;background-size: cover;" class="live-top-box">';
- if(list.liveScope==3&&list.selfLock==1)html+='<img class="lock" src="images/Lock-ok.png">';
- else if(list.liveScope==3&&list.selfLock==0)html+='<img class="lock" src="images/Lock-no.png">';
+ if(list.liveScope==3&&list.selfLock==1)html+='<img class="lock" src="images/Lock-no.png?v=2022102001">';
+ else if(list.liveScope==3&&list.selfLock==0)html+='<img class="lock" src="images/Lock-no.png?v=2022102001">';
html+='<p class="introduce">'+list.introduce+'</p>'
html+='<div class="live-cursor-shadow"></div>';
html+='<img class="live-icon" src="images/front/live.webp" alt="美女直播">';
@@ -514,8 +514,8 @@ $(function(){
var list=data.roomList[i]
html+='<li>';
html+='<a target="_blank" rel="opener" href="room/liveRoom.html?roomId='+list.roomId+'"><div style="background: url(https://zhibocdn.yabolive.net/comm'+list.face.split('?')[0]+'?x-oss-process=image/resize,w_368) no-repeat;background-size: cover;" class="live-top-box">';
- if(list.liveScope==3&&list.selfLock==1)html+='<img class="lock" src="images/Lock-ok.png">';
- else if(list.liveScope==3&&list.selfLock==0)html+='<img class="lock" src="images/Lock-no.png">';
+ if(list.liveScope==3&&list.selfLock==1)html+='<img class="lock" src="images/Lock-no.png?v=2022102001">';
+ else if(list.liveScope==3&&list.selfLock==0)html+='<img class="lock" src="images/Lock-no.png?v=2022102001">';
html+='<p class="introduce">'+list.introduce+'</p>'
html+='<div class="live-cursor-shadow"></div>';
html+='<img class="live-icon" src="images/front/live.webp" alt="美女直播">';
diff --git a/lib/default.js b/lib/default.js
index d7f4a9c..c07d257 100644
--- a/lib/default.js
+++ b/lib/default.js
@@ -96,8 +96,8 @@ if(sessionStorage.pmt!=undefined&&sessionStorage.pmt!="undefined"){
webVersion:'1000'
},
dataType: "JSON"
- })
-}
+ })
+}
sessionStorage.tag=data.tag
sessionStorage.qd=data.qd
sessionStorage.like=data.like;
diff --git a/live.html b/live.html
index 60b85dc..5767817 100644
--- a/live.html
+++ b/live.html
@@ -38,7 +38,7 @@
<link rel="alternate" media="only screen and (max-width: 640px)" href="https://www.footseen.xyz/mobile/index.html">
<link rel="stylesheet" href="css/base.css?v=20220630">
<link rel="stylesheet" href="css/layer.css">
- <link rel="stylesheet" href="css/neck.css?v=2022101301">
+ <link rel="stylesheet" href="css/neck.css?v=2022102001">
<link rel="stylesheet" href="css/login.css?v=2022101102">
<script src="https://accounts.google.com/gsi/client" async defer></script>
<script src="https://www.footseen.xyz/lib/hello.js"></script>
diff --git a/room/liveRoom.html b/room/liveRoom.html
index 3f82dce..10e251c 100644
--- a/room/liveRoom.html
+++ b/room/liveRoom.html
@@ -1801,8 +1801,8 @@ $(function () {
var list=data.roomList[i]
if(list.roomId==sessionStorage.roomId)continue;
html+='<a title='+keyEArr[Math.floor(Math.random()*200)]+' href="https://www.footseen.xyz/room/liveRoom.html?roomId='+list.roomId+'"><li data-type="https://zhibocdn.yabolive.net/comm'+list.face.split('?')[0]+'?x-oss-process=image/resize,w_268" style="background:#E5E5E5;background-size: cover;">';
- if(list.liveScope==3&&list.selfLock==1)html+='<img class="lock" src="../images/Lock-ok.png">';
- else if(list.liveScope==3&&list.selfLock==0)html+='<img class="lock" src="../images/Lock-no.png">';
+ if(list.liveScope==3&&list.selfLock==1)html+='<img class="lock" src="../images/Lock-no.png?v=2022102001">';
+ else if(list.liveScope==3&&list.selfLock==0)html+='<img class="lock" src="../images/Lock-no.png?v=2022102001">';
html+='<img class="move-live-online" src="images/live.png" alt="直播中">';
html+='<img class="more-live-poster" src="images/face.png" alt="'+list.introduce+'">'
html+='<div class="more-live-name">'+list.nickname+'</div>';
diff --git a/tag.html b/tag.html
index 3ab5d4c..73046e6 100644
--- a/tag.html
+++ b/tag.html
@@ -38,7 +38,7 @@
<link rel="alternate" media="only screen and (max-width: 640px)" href="https://www.footseen.xyz/mobile/index.html">
<link rel="stylesheet" href="css/base.css?v=20220630">
<link rel="stylesheet" href="css/layer.css">
- <link rel="stylesheet" href="css/neck.css?v=2022101301">
+ <link rel="stylesheet" href="css/neck.css?v=2022102001">
<link rel="stylesheet" href="css/login.css?v=2022101102">
<script src="https://accounts.google.com/gsi/client" async defer></script>
<script src="https://www.footseen.xyz/lib/hello.js"></script>
diff --git a/videoPage.html b/videoPage.html
index 765b372..18fbb6b 100644
--- a/videoPage.html
+++ b/videoPage.html
@@ -38,7 +38,7 @@
<link rel="alternate" media="only screen and (max-width: 640px)" href="https://www.footseen.xyz/mobile/index.html">
<link rel="stylesheet" href="css/base.css?v=20220630">
<link rel="stylesheet" href="css/layer.css">
- <link rel="stylesheet" href="css/neck.css?v=2022101301">
+ <link rel="stylesheet" href="css/neck.css?v=2022102001">
<link rel="stylesheet" href="css/login.css?v=2022101102">
<script src="https://accounts.google.com/gsi/client" async defer></script>
<script src="https://www.footseen.xyz/lib/hello.js"></script>
--
libgit2 0.25.0