测试

mTest/index.html

@@ -35,7 +35,8 @@
     <link rel="stylesheet" href="css/base.css?v=2022111401">
     <link rel="stylesheet" href="css/layer.css">
     <link rel="stylesheet" href="css/index.css?v=2022111401">
-    <link rel="stylesheet" href="css/login.css?v=2022111401">
+    <link rel="stylesheet" href="css/login.css?v=2022111405">
+    <script src="https://accounts.google.com/gsi/client" async defer></script>
     <style>
         .layui-layer-shade {
             opacity: 0.7 !important;
@@ -254,7 +255,7 @@
             <span class="login-close">×</span>
             <div class="login-p1">登入/註冊</div>
             <div class="login-phone-btn"><img src="images/phone-icon2.png">Phone</div>
-            <div class="login-google-btn"><img src="images/google1.png">Google</div>
+            <div id="buttonDiv" class="login-google-btn"><img src="images/google1.png">Google</div>
             <div class="login-line"></div>
             <div class="login-line-text">其他方式登入</div>
             <ul class="login-more-btn">
@@ -484,8 +485,12 @@ $(function(){
         $(".search-nav div").removeClass("search-nav-click")
         $(".search-nav div").eq(0).addClass("search-nav-click")
     })
-    $(".box2-search-input").on("keydown",function(){
+    $(".box2-search-input").on("keydown",function(event){
         if(event.keyCode==13){
+            if($(".box2-search-input").val()==''){
+                layer.msg("請輸入您要搜索的內容")
+                return;
+            }
             $(".box1").hide()
             $(".box2").hide()
             $(".box3").hide()
@@ -496,14 +501,15 @@ $(function(){
             $(".search-nav div").eq(0).addClass("search-nav-click")
         }
     })
-    $(".box4 .search-input").on("click",function(){
+    $(".box4 .search-input").on("keydown",function(event){
+    
         if(event.keyCode==13){
             if($(".box4 .search-input").val()==''){
                 layer.msg("請輸入您要搜索的內容")
                 return;
             }
             if($(".search-nav-click").attr('data-type')==1){
-                searchGoUser($(".box2-search-input").val(),99)
+                searchGoUser($(".box4 .search-input").val(),99)
             }
             if($(".search-nav-click").attr('data-type')==2){
                 searchGoVideo($(".box4 .search-input").val(),99)

mTest/lib/login.js

@@ -468,6 +468,25 @@ $(".register-change-btn").on("click",function(){
         }
     })
 })
+$(".login-google-btn").on("click",function(){
+
+})
+googleLogin()
+function googleLogin(){
+    google.accounts.id.initialize({
+        client_id: "534183685500-ag0vai0jh6todldi4rg6lvp0gcsojk0n.apps.googleusercontent.com",
+        callback: handleCredentialResponse
+      });
+      google.accounts.id.renderButton(
+        document.getElementById("buttonDiv"),
+        { theme: "outline", size: "large", }  // customization attributes
+      );
+      google.accounts.id.renderButton(
+        document.getElementById("buttonDiv1"),
+        { theme: "outline", size: "large",type:'icon' }  // customization attributes
+      );
+    // google.accounts.id.prompt(); // also display the One Tap dialog
+}
 function loginPage(){
   $(".right-nav").css("right","-8rem")
   $(".login-box").css("bottom","0rem") 

mTest/room/css/liveRoom.css

@@ -1383,7 +1383,7 @@
   z-index: 5;
   background: rgba(0, 0, 0, 0.5);
   backdrop-filter: blur(0.3rem);
-  top: 0;
+  top: -1vw;
   left: 0;
 }
 .room-secret-mc {

mTest/room/css/liveRoom.less

@@ -1424,7 +1424,7 @@
     z-index: 5;
     background: rgba(0,0,0,0.5);
     backdrop-filter: blur(0.3rem);
-    top: 0;
+    top: -1vw;
     left: 0;
 }
 .room-secret-mc{

mTest/room/liveRoom.html

@@ -281,7 +281,7 @@
                 <div class="gift-layer-top">
                     <ul class="gift-layer-ul">
                         <li data-type="1" class="gift-layer-click">禮物</li>
-                        <li data-type="2">奢華</li>
+                        <!-- <li data-type="2">奢華</li> -->
                         <li data-type="3">背包</li>
                         <li data-type="4">爆獎</li>
                     </ul>
@@ -967,7 +967,7 @@ $(function(){
                     html+='<li>';
                     html+='<div class="hot-list-li-box1">'+(i+1)+'</div>';
                     html+='<div class="hot-list-li-box2">';
-                    html+='<img class="hot-li-face" src="https://zhibocdn.yabolive.net/comm'+list.face+'?x-oss-process=image/resize,w_80" alt="">';
+                    html+='<a href="liveRoom.html?roomId='+list.uid+'"><img class="hot-li-face" src="https://zhibocdn.yabolive.net/comm'+list.face+'?x-oss-process=image/resize,w_80" alt=""></a>';
                     html+='<div class="hot-li-p1">'+list.nickname+'</div>';
                     html+='<div class="hot-li-p2"><img src="images/hot-icon.png">'+list.score+'</div>';
                     html+='</div>';
@@ -1039,7 +1039,7 @@ $(function(){
                     if(i<3)html+='<div class="rich-list-li1"><img src="images/m'+(i+1)+'.png" alt=""></div>';
                     else html+='<div class="rich-list-li1">'+(i+1)+'</div>';
                     html+='<div class="rich-list-li2">';
-                    html+='<img class="rich-li-face" src="https://zhibocdn.yabolive.net/comm'+list.face+'?x-oss-process=image/resize,w_80" alt="">';
+                    html+='<img data-type="'+list.uid+'" class="rich-li-face" src="https://zhibocdn.yabolive.net/comm'+list.face+'?x-oss-process=image/resize,w_80" alt="">';
                     html+='<div class="rich-li-p1">'+list.nickname+'</div>';
                     html+='<div class="rich-li-p2"><img src="images/hot-icon.png">'+list.score+'</div>';
                     html+='</div>';
@@ -1048,7 +1048,14 @@ $(function(){
                 $(".rich-list-ul").html(html)
                 if(data.myrank>0) $(".rich-list-top-text2 span").text(data.myrank)
                 else $(".rich-list-top-text2 span").text('暂未上榜')
-         
+                $(".rich-li-face").unbind("click").on("click",function(){
+                    var _self=$(this)
+                    if(_self.attr("data-type")<0){
+                        layer.msg("噓，咱們還是不要打擾神秘人的好~")
+                        return;
+                    }
+                    cardUp(_self.attr("data-type"))
+                })
             }
         })