From 858f49844461d93dbcca8c8646004b1a88a6169c Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Fri, 1 Jul 2022 16:50:03 +0800
Subject: [PATCH] 测试
---
dewExc/index.html | 2 +-
index.html | 4 +++-
lib/login.js | 2 +-
reg/index.html | 2 +-
room/css/room.css | 4 +++-
room/css/room.less | 4 +++-
room/imagesRoom.html | 2 +-
room/liveRoom.html | 12 ++++++++----
room/videoRoom.html | 2 +-
search/index.html | 2 +-
space/index.html | 2 +-
space/like.html | 2 +-
space/myRoom.html | 21 ++++++++++++---------
13 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/dewExc/index.html b/dewExc/index.html
index cf998c8..0786c78 100644
--- a/dewExc/index.html
+++ b/dewExc/index.html
@@ -124,7 +124,7 @@
<script src="../lib/jquery-3.1.1.min.js"></script>
<script src="../layer-v3.1.0/layer/layer.js"></script>
<script src="../lib/default.js?v='20220407'"></script>
-<script src="../lib/login.js?v=20220701"></script>
+<script src="../lib/login.js?v=2022070101"></script>
<script>
$(function(){
loginGo()
diff --git a/index.html b/index.html
index 165df49..a0cd962 100644
--- a/index.html
+++ b/index.html
@@ -338,7 +338,7 @@
<script src="layer-v3.1.0/layer/layer.js"></script>
<script src="lib/fingerprint2.js"></script>
-<script src="lib/login.js?v=20220701"></script>
+<script src="lib/login.js?v=2022070101"></script>
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script>
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jsrsasign/8.0.20/jsrsasign-all-min.js"></script> -->
@@ -519,6 +519,8 @@ $(function(){
// timeNum=-1
// sortNum=-1
// dayNum=-1
+
+
$(".tag-big-box").show()
$(".side-tag-ul li").removeClass("tag-click")
liveList(1,1)
diff --git a/lib/login.js b/lib/login.js
index 0f91dcd..f4afda3 100644
--- a/lib/login.js
+++ b/lib/login.js
@@ -165,7 +165,7 @@ function loginGo(){
html+='<img class="search-icon" src="https://www.footseen.xyz/images/front/search2.png">'
$(".neck-nav-content").append(html)
var html=[];
- html+='<div class="down-tips"><img class="phone-icon" src="https://www.footseen.xyz/images/phone.png">APP下載<img src="https://www.footseen.xyz/images/down-arrow.png">';
+ html+='<div class="down-tips"><img class="phone-icon" src="https://www.footseen.xyz/images/phone.png">APP下載';
html+='<div class="down-tip-content"><div style="left: 103px;" class="nav-login-more-jiao"></div>';
html+='<p class="anzhuo-tips"><img src="https://www.footseen.xyz/images/anzhuo.png">Download APK</p>'
html+='<p class="code-tips">掃描下載APP</p>'
diff --git a/reg/index.html b/reg/index.html
index cd3f549..f1285e5 100644
--- a/reg/index.html
+++ b/reg/index.html
@@ -158,7 +158,7 @@
<script src="../lib/jquery-3.1.1.min.js"></script>
<script src="../layer-v3.1.0/layer/layer.js"></script>
<script src="../lib/default.js?v='20220407'"></script>
-<script src="../lib/login.js?v=20220701"></script>
+<script src="../lib/login.js?v=2022070101"></script>
<script src="../lib/qrcode.min.js"></script>
<script>
$(function(){
diff --git a/room/css/room.css b/room/css/room.css
index a725364..d35117d 100644
--- a/room/css/room.css
+++ b/room/css/room.css
@@ -1604,7 +1604,9 @@ input::-webkit-input-placeholder {
}
.layer-space-icon .space-sex-box {
height: 20px;
- width: 40px;
+ max-width: 40px;
+ padding-right: 5px;
+ padding-left: 5px;
font-size: 14px;
text-align: center;
line-height: 20px;
diff --git a/room/css/room.less b/room/css/room.less
index 0ae6d05..023adde 100644
--- a/room/css/room.less
+++ b/room/css/room.less
@@ -1651,7 +1651,9 @@ input::-webkit-input-placeholder{
}
.space-sex-box{
height: 20px;
- width: 40px;
+ max-width: 40px;
+ padding-right: 5px;
+ padding-left: 5px;
font-size: 14px;
text-align: center;
line-height: 20px;
diff --git a/room/imagesRoom.html b/room/imagesRoom.html
index 12e0911..7471bc6 100644
--- a/room/imagesRoom.html
+++ b/room/imagesRoom.html
@@ -138,7 +138,7 @@
<script src="../lib/jquery-3.1.1.min.js"></script>
<script src="../layer-v3.1.0/layer/layer.js"></script>
<script src="../lib/default.js?v='20220630'"></script>
-<script src="../lib/login.js?v=20220701"></script>
+<script src="../lib/login.js?v=2022070101"></script>
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script>
<script>
$(function(){
diff --git a/room/liveRoom.html b/room/liveRoom.html
index 498b3a1..49e80f1 100644
--- a/room/liveRoom.html
+++ b/room/liveRoom.html
@@ -440,7 +440,7 @@
<script src="../layer-v3.1.0/layer/layer.js"></script>
<script src="../lib/flv.js"></script>
<script src="../lib/default.js?v='20220630'"></script>
-<script src="../lib/login.js?v=20220701"></script>
+<script src="../lib/login.js?v=2022070101"></script>
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script>
<script>
$(function () {
@@ -1365,8 +1365,12 @@ $(function () {
success:function(data){
//console.log('用户资料卡',data)
var html=[];
+ //头像
if(data.zoneInfo.face=='/user/boy.png')var faceImg='https://www.footseen.xyz/images/boy.png';
else var faceImg='https://zhibocdn.yabolive.net/comm'+data.zoneInfo.face+'?x-oss-process=image/resize,w_50';
+ //年龄
+ if(data.zoneInfo.age!=0)var myAge=data.zoneInfo.age;
+ else var myAge='保密'
html+='<img class="layer-space-face" src="'+faceImg+'" alt="">';
html+='<div class="layer-space">';
html+='<img class="space-close" src="images/close.png" alt="">';
@@ -1374,8 +1378,8 @@ $(function () {
html+='<p class="layer-space-p2">Footseen ID:'+data.zoneInfo.uid+'</p>';
html+='<div class="layer-space-icon">';
if(data.zoneInfo.level!=0)html+='<img class="space-vip" src="https://app.ixiulive.com/static/vip/'+data.zoneInfo.level+'.png" alt="">';
- if(data.zoneInfo.sex==1)html+='<span class="space-sex-box"><img src="images/sex1.png" alt="">'+data.zoneInfo.age+'</span>';
- else html+='<span class="space-sex-box"><img src="images/sex2.png" alt="">'+data.zoneInfo.age+'</span>';
+ if(data.zoneInfo.sex==1)html+='<span class="space-sex-box"><img src="images/sex1.png" alt="">'+myAge+'</span>';
+ else html+='<span class="space-sex-box"><img src="images/sex2.png" alt="">'+myAge+'</span>';
for(var i=0;i<data.zoneData.medals.length;i++){
html+='<img class="space-medals-img" src="https://zhibocdn.yabolive.net/comm'+data.zoneData.medals[i]+'?x-oss-process=image/resize,w_30">';
}
@@ -2276,7 +2280,7 @@ $(function () {
if (obj.cid == 5200) {
Reconnection=0;
var list=JSON.parse(obj.content)
- //console.log('直播间接收礼物',list)
+ // console.log('直播间接收礼物',list)
if(list.content.isBigGift==false){
if(list.content.num!=1){
var numArr=list.content.num.toString().split("");
diff --git a/room/videoRoom.html b/room/videoRoom.html
index 6d77b5a..dee327d 100644
--- a/room/videoRoom.html
+++ b/room/videoRoom.html
@@ -134,7 +134,7 @@
<script src="../lib/jquery-3.1.1.min.js"></script>
<script src="../layer-v3.1.0/layer/layer.js"></script>
<script src="../lib/default.js?v='20220630'"></script>
-<script src="../lib/login.js?v=20220701"></script>
+<script src="../lib/login.js?v=2022070101"></script>
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script>
<script>
$(function(){
diff --git a/search/index.html b/search/index.html
index aa4a42e..e635bc4 100644
--- a/search/index.html
+++ b/search/index.html
@@ -122,7 +122,7 @@
<script src="../lib/jquery-3.1.1.min.js"></script>
<script src="../layer-v3.1.0/layer/layer.js"></script>
<script src="../lib/default.js?v='20220407'"></script>
-<script src="../lib/login.js?v=20220701"></script>
+<script src="../lib/login.js?v=2022070101"></script>
<script src="../lib/qrcode.min.js"></script>
<script>
$(function(){
diff --git a/space/index.html b/space/index.html
index 8119a6f..7b82ade 100644
--- a/space/index.html
+++ b/space/index.html
@@ -233,7 +233,7 @@
<script src="../lib/jquery-3.1.1.min.js"></script>
<script src="../layer-v3.1.0/layer/layer.js"></script>
<script src="../lib/default.js?v='20220407'"></script>
-<script src="../lib/login.js?v=20220701"></script>
+<script src="../lib/login.js?v=2022070101"></script>
<script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js"></script>
<script>
$(function(){
diff --git a/space/like.html b/space/like.html
index bee3f77..8f01f79 100644
--- a/space/like.html
+++ b/space/like.html
@@ -76,7 +76,7 @@
<script src="../lib/jquery-3.1.1.min.js"></script>
<script src="../layer-v3.1.0/layer/layer.js"></script>
<script src="../lib/default.js?v='20220407'"></script>
-<script src="../lib/login.js?v=20220701"></script>
+<script src="../lib/login.js?v=2022070101"></script>
<script>
$(function(){
loginGo()
diff --git a/space/myRoom.html b/space/myRoom.html
index 7d380b8..b24fa88 100644
--- a/space/myRoom.html
+++ b/space/myRoom.html
@@ -74,7 +74,7 @@
<li>簽名: <span>簽名預留簽名預留，簽名預留</span></li> -->
</ul>
<ul style="display: none;" class="myRoom-exc-ul">
- <li>暱稱 : <input maxlength="16" class="name-input" placeholder="用户昵称预留" type="text"><span class="name-tips">(首次免費)</span></li>
+ <li>暱稱 : <input autocomplete="new-password" maxlength="16" class="name-input" placeholder="用户昵称预留" type="text"><span class="name-tips">(首次免費)</span></li>
<li>ID : <span class="id-tips">1235512</span></li>
<li>性別 :
<select name="sex" class="sex-select" >
@@ -122,8 +122,8 @@
</select>
</li>
- <li>職業 : <input maxlength="10" class="profession-input" placeholder="輸入您的職業" type="text"></li>
- <li>簽名 : <input maxlength="80" class="sign-input" placeholder="請輸入簽名" type="text"></li>
+ <li>職業 : <input maxlength="10" autocomplete="new-password" class="profession-input" placeholder="輸入您的職業" type="text"></li>
+ <li>簽名 : <input maxlength="80" autocomplete="new-password" class="sign-input" placeholder="請輸入簽名" type="text"></li>
</ul>
</div>
</div>
@@ -133,7 +133,7 @@
<script src="../layer-v3.1.0/layer/layer.js"></script>
<script src="../lib/select.js"></script>
<script src="../lib/default.js?v='20220407'"></script>
-<script src="../lib/login.js?v=20220701"></script>
+<script src="../lib/login.js?v=2022070101"></script>
<script>
$(function(){
var faceGoT=null
@@ -150,7 +150,7 @@ $(function(){
fid:localStorage.uid
},
success:function(data){
- //console.log("用戶資料卡",data);
+ console.log("用戶資料卡",data);
$(".myRoom-face").attr("src","https://zhibocdn.yabolive.net/comm"+data.zoneInfo.face+"?x-oss-process=image/resize,w_90")
var html=[];
html+='<li>暱稱: <span>'+data.zoneInfo.nickname+'</span></li>';
@@ -173,6 +173,9 @@ $(function(){
if($(".myRoom-text-exc").attr("data-type")==1){
$(".myRoom-text-exc").attr("data-type","2");
$(".myRoom-text-exc").text("保存")
+ if(data.infoChanged.changedNickName==1)$(".name-tips").text("(修改暱稱需要10寶石)")
+ if(data.infoChanged.changedBirth==0)$(".birth-tips").hide()
+
var html=[];
for(var i=120;i<251;i++){
if(data.zoneInfo.height==i)html+='<option selected value="'+i+'">'+i+'cm</option>';
@@ -211,12 +214,12 @@ $(function(){
if(data.zoneInfo.sex==-1)$(".sex-select option").eq(0).attr("selected","true");
else if(data.zoneInfo.sex==0){
$(".sex-select option").eq(1).attr("selected","true");
- $(".sex-select").attr("disabled","disabled")
}
else if(data.zoneInfo.sex==1){
$(".sex-select option").eq(2).attr("selected","true");
- $(".sex-select").attr("disabled","disabled")
}
+ if(data.infoChanged.changedSex==0)$(".sex-tips").hide()
+ else $(".sex-select").attr("disabled","disabled")
$(".profession-input").val(data.zoneInfo.work)
$(".sign-input").val(data.zoneInfo.sign)
@@ -254,8 +257,8 @@ $(function(){
if(year!=0&&month!=0&&day!=0){
var birthNum=year+'-'+month+'-'+day;
}
- if($(".sex option:selected").val()!=data.zoneInfo.sex){
- var sexNum=$(".sex option:selected").val()
+ if($(".sex-select option:selected").val()!=data.zoneInfo.sex&&$(".sex-select option:selected").val()!=-1){
+ var sexNum=$(".sex-select option:selected").val()
}
if($(".sign-input").val()!=data.zoneInfo.sign){
var signNum=$(".sign-input").val()
--
libgit2 0.25.0