From e1d62a59927f13114366fe3cf381dd524e81ae1f Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Thu, 17 Nov 2022 17:38:12 +0800
Subject: [PATCH] 测试
---
mTest/index.html | 4 ++--
mTest/room/liveRoom.html | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/mTest/index.html b/mTest/index.html
index ae4c1e0..ade4346 100644
--- a/mTest/index.html
+++ b/mTest/index.html
@@ -34,7 +34,7 @@
<script src="lib/fsize.js"></script>
<link rel="stylesheet" href="css/base.css?v=2022111701">
<link rel="stylesheet" href="css/layer.css">
- <link rel="stylesheet" href="css/index.css?v=2022111701">
+ <link rel="stylesheet" href="css/index.css?v=2022111725">
<link rel="stylesheet" href="css/login.css?v=2022111725">
<script src="https://accounts.google.com/gsi/client" async defer></script>
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script>
@@ -143,7 +143,7 @@
<span><img src="images/fire.png" alt=""> <span class="zone-rich-box-num">--</span></span>
</div>
<div class="zone-diamond-box">
- <span>收穫寶石</span>
+ <span>贈出寶石</span>
<span><img src="images/diamond.png" alt=""> <span class="zone-diamond-box-num">--</span></span>
</div>
<div class="zone-car-box">
diff --git a/mTest/room/liveRoom.html b/mTest/room/liveRoom.html
index 5384b11..1a4249e 100644
--- a/mTest/room/liveRoom.html
+++ b/mTest/room/liveRoom.html
@@ -1619,10 +1619,11 @@ $(function(){
if (obj.cid == 6200) {
Reconnection=0;
var list=JSON.parse(obj.content)
- console.log('直播间发言',list);
+
//进入直播间
if(list.content.type==1){
var html=[];
+ if(list.content.lv==0&&list.content.uid!=localStorage.uid)return;
if(list.content.lv>0) html+='<div class="system-msg"><span data-type='+list.content.uid+' class="user-name"><img class="user-level-icon" src="https://app.ixiulive.com/static/vip/'+list.content.lv+'.png" alt="">'+list.content.nickname+'</span>來了，來自'+list.content.country+'</div>'
else html+='<div class="system-msg"><span data-type='+list.content.uid+' class="user-name">'+list.content.nickname+'</span>來了，來自'+list.content.country+'</div>'
@@ -1641,12 +1642,13 @@ $(function(){
}
//发言
if(list.content.type==2){
+ console.log('直播间发言',list);
var html=[];
var richLv=0
html+='<div class="user-msg">';
- if(list.content.vip_lv>0) html+='<div data-type="'+list.content.uid+'" class="user-msg-content"><img class="user-level-icon" src="https://app.ixiulive.com/static/vip/'+list.content.vip_lv+'.png" alt=""><span data-type='+list.content.uid+' class="user-msg-name">'+list.content.uid_nick+'</span>';
+ if(list.content.vip_lv>0&&list.content.vipInfo.isVip==true) html+='<div data-type="'+list.content.uid+'" class="user-msg-content"><img class="user-level-icon" src="https://app.ixiulive.com/static/vip/'+list.content.vip_lv+'.png" alt=""><span data-type='+list.content.uid+' class="user-msg-name">'+list.content.uid_nick+'</span>';
else html+='<div data-type="'+list.content.uid+'" class="user-msg-content"><span data-type='+list.content.uid+' class="user-msg-name">'+list.content.uid_nick+'</span>';
- html+='<span class="user-msg-level"><span>'+list.content.live_lv+'</span>';
+ if(list.content.live_lv>0)html+='<span class="user-msg-level"><span>'+list.content.live_lv+'</span>';
html+='</span> : '+list.content.content+'</div>';
html+='</div> ';
$(".user-msg-big").prepend(html);
--
libgit2 0.25.0