测试

index.html

@@ -314,7 +314,6 @@ $(function(){
         }else{
         }else{
             $(".side-nav").hide()
             $(".side-nav").hide()
         }
         }
-
     })
     })
     $(".more-live").on("click",function(){
     $(".more-live").on("click",function(){
         // $(".neck-nav-ul li").removeClass("neck-nav-li-click")
         // $(".neck-nav-ul li").removeClass("neck-nav-li-click")

room/liveRoom.html

@@ -2439,7 +2439,8 @@ $(function () {
     function WebSocketGo() {
     function WebSocketGo() {
         if ("WebSocket" in window) {
         if ("WebSocket" in window) {
             // 打开一个 web socket
             // 打开一个 web socket
-            var url = ""+$ws+"ws?uid=" + localStorage.uid + "&token="+localStorage.token+"&roomid=" + sessionStorage.roomId + "&connType=1";
+            if(localStorage.token==undefined||localStorage.token=='undefined')var url = ""+$ws+"ws?uid=" + localStorage.uid + "&token="+localStorage.canvasCode+"&roomid=" + sessionStorage.roomId + "&connType=2";
+            else var url = ""+$ws+"ws?uid=" + localStorage.uid + "&token="+localStorage.token+"&roomid=" + sessionStorage.roomId + "&connType=1";
             ws = new WebSocket(url);
             ws = new WebSocket(url);
             ws.onopen = function () {
             ws.onopen = function () {
                 typeof tHeart!='undefined'&&typeof tHeart!='null'?clearInterval(tHeart):tHeart=null;
                 typeof tHeart!='undefined'&&typeof tHeart!='null'?clearInterval(tHeart):tHeart=null;

room/videoRoom.html

@@ -710,11 +710,14 @@ $(function(){
 })
 })
 </script>
 </script>
 <script>
 <script>
+   
+  //17
+    // function addUrl(e){
     //     $.ajax({
     //     $.ajax({
     //         url:$ip+'frontPage/queryTopics',
     //         url:$ip+'frontPage/queryTopics',
     //         data:{
     //         data:{
     //             pageID:localStorage.canvasCode,
     //             pageID:localStorage.canvasCode,
-        //         pageNum:13,
+    //             pageNum:e,
     //             type:1,
     //             type:1,
     //             pageSize:500,
     //             pageSize:500,
     //             language:2,
     //             language:2,
@@ -733,9 +736,11 @@ $(function(){
     //                 // var videoList=JSON.parse(list.content)
     //                 // var videoList=JSON.parse(list.content)
     //                 html+='https://www.footseen.xyz/room/videoRoom.html?topicId='+list.topicId+'&mark=1<br>'
     //                 html+='https://www.footseen.xyz/room/videoRoom.html?topicId='+list.topicId+'&mark=1<br>'
     //             }
     //             }
-        //         $(".more-url").html(html);
+    //             $(".more-url").append(html);
     //         }
     //         }
     //     })
     //     })
+    // }
+
 
 
 </script>
 </script>
 </html>
 </html>
\ No newline at end of file