Skip to content

libai / footseen-large-website

Go to a project
Commit bcdee50e by libai
Options

测试

parent 9c9a9e7c
Inline Side-by-side
Showing with 17 additions and 20 deletions
mTest/room/css/liveRoom.css
...@@ -734,7 +734,7 @@ ...@@ -734,7 +734,7 @@
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
position: fixed; position: fixed;
bottom: 0; top: 0;
left: 0; left: 0;
z-index: -1; z-index: -1;
overflow: hidden; overflow: hidden;
......
mTest/room/css/liveRoom.less
...@@ -757,7 +757,7 @@ ...@@ -757,7 +757,7 @@
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
position: fixed; position: fixed;
bottom: 0; top: 0;
left: 0; left: 0;
z-index: -1; z-index: -1;
overflow: hidden; overflow: hidden;
......
mTest/room/liveRoom.html
...@@ -2145,19 +2145,18 @@ $(function(){ ...@@ -2145,19 +2145,18 @@ $(function(){
// console.log("向上") // console.log("向上")
touchY=e.changedTouches[0].clientY touchY=e.changedTouches[0].clientY
goDeg=Math.abs((-90+(asinGo(e.changedTouches[0].clientX-startX,e.changedTouches[0].clientY-startY)))) goDeg=Math.abs((-90+(asinGo(e.changedTouches[0].clientX-startX,e.changedTouches[0].clientY-startY))))
if(zwidth<0.5){ if(zwidth<0.5&topMoveNumBottom==0){
return; return;
} }
if(angle==null){ if(angle==null){
angle=Math.abs(goDeg-90) angle=Math.abs(goDeg-90)
} }
if(angle>15){ if(angle>30){
return; return;
} }
topMoveNumTop=e.changedTouches[0].clientY-startY topMoveNumTop=e.changedTouches[0].clientY-startY
console.log("向上",topMoveNumTop,angle)
$(".room-bg").css("top",topMoveNumTop+'px') $(".room-bg,.video-box").css("top",topMoveNumTop+'px')
}else if(touchY<e.changedTouches[0].clientY){ }else if(touchY<e.changedTouches[0].clientY){
// console.log("向下") // console.log("向下")
...@@ -2165,15 +2164,15 @@ $(function(){ ...@@ -2165,15 +2164,15 @@ $(function(){
goDeg=Math.abs((-90+(asinGo(e.changedTouches[0].clientX-startX,e.changedTouches[0].clientY-startY)))) goDeg=Math.abs((-90+(asinGo(e.changedTouches[0].clientX-startX,e.changedTouches[0].clientY-startY))))
topMoveNumBottom=e.changedTouches[0].clientY-startY topMoveNumBottom=e.changedTouches[0].clientY-startY
if(zwidth<0.5){ if(zwidth<0.5&&topMoveNumTop==0){
return; return;
} }
if(angle==null){ if(angle==null){
angle=Math.abs(goDeg-90) angle=Math.abs(goDeg-90)
} }
if(angle>15)return; if(angle>30)return;
$(".room-bg").css("top",topMoveNumBottom+'px') $(".room-bg,.video-box").css("top",topMoveNumBottom+'px')
} }
...@@ -2196,9 +2195,8 @@ $(function(){ ...@@ -2196,9 +2195,8 @@ $(function(){
angle=Math.abs(goDeg-90) angle=Math.abs(goDeg-90)
// console.log(zwidth) // console.log(zwidth)
if(angle<30&&zwidth>5){ if(angle<30&&zwidth>5){
console.log("向下了") $(".room-bg,.video-box").css("transition","0.35s all")
$(".room-bg").css("transition","0.35s all") $(".room-bg,.video-box").css("top","100vh")
$(".room-bg").css("top","100vh")
setTimeout(function() { setTimeout(function() {
window.location.href="liveRoom.html?roomId="+topRoomId+"" window.location.href="liveRoom.html?roomId="+topRoomId+""
}, 350); }, 350);
...@@ -2206,13 +2204,12 @@ $(function(){ ...@@ -2206,13 +2204,12 @@ $(function(){
} }
} }
if(startY>e.changedTouches[0].clientY){ if(startY>e.changedTouches[0].clientY){
//向下 //向上
angle=Math.abs(goDeg-90) angle=Math.abs(goDeg-90)
console.log(zwidth) console.log(zwidth)
if(angle<30&&zwidth>5){ if(angle<30&&zwidth>5){
console.log("向上了") $(".room-bg,.video-box").css("transition","0.35s all")
$(".room-bg").css("transition","0.35s all") $(".room-bg,.video-box").css("top","-100vh")
$(".room-bg").css("top","-100vh")
setTimeout(function() { setTimeout(function() {
window.location.href="liveRoom.html?roomId="+BottomRoomId+"" window.location.href="liveRoom.html?roomId="+BottomRoomId+""
}, 350); }, 350);
...@@ -2221,11 +2218,11 @@ $(function(){ ...@@ -2221,11 +2218,11 @@ $(function(){
} }
angle=null angle=null
$(".room-bg").css("transition","0.35s all") $(".room-bg,.video-box").css("transition","0.35s all")
$(".room-bg").css("top","0") $(".room-bg,.video-box").css("top","0")
touchOk=false touchOk=false
setTimeout(() => { setTimeout(function() {
$(".room-bg").css("transition","none") $(".room-bg,.video-box").css("transition","none")
touchOk=true touchOk=true
}, 350); }, 350);
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment