From 6e26436dde4bb71d3e81afd8ae9ed9ac99ba8fc4 Mon Sep 17 00:00:00 2001 From: libai <libai@yazhai.co> Date: Sat, 30 Jul 2022 15:25:35 +0800 Subject: [PATCH] 测试 --- room/css/room.css | 1 + room/css/room.less | 1 + room/liveRoom.html | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/room/css/room.css b/room/css/room.css index 9d2c45d..5e9da7e 100644 --- a/room/css/room.css +++ b/room/css/room.css @@ -1985,6 +1985,7 @@ input::-webkit-input-placeholder { margin: 0 auto; background: #EEE4DC; border-radius: 8px ; + overflow: hidden; } .layer-photo-content-left { width: 775px; diff --git a/room/css/room.less b/room/css/room.less index 5b5ae11..d306505 100644 --- a/room/css/room.less +++ b/room/css/room.less @@ -2046,6 +2046,7 @@ input::-webkit-input-placeholder{ margin: 0 auto; background:#EEE4DC; border-radius: 8px ; + overflow: hidden; } .layer-photo-content-left{ width: 775px; diff --git a/room/liveRoom.html b/room/liveRoom.html index 71ccfab..bdd90cd 100644 --- a/room/liveRoom.html +++ b/room/liveRoom.html @@ -21,7 +21,7 @@ <link rel="stylesheet" href="../css/layer.css"> <link rel="stylesheet" href="../css/swiper.min.css"> <link rel="stylesheet" href="css/index.css?v=2022072901"> - <link rel="stylesheet" href="css/room.css?v=2022072901"> + <link rel="stylesheet" href="css/room.css?v=2022073001"> <link rel="stylesheet" href="../css/login.css?v=2022072901"> <script src="../lib/flv.js"></script> <script src="https://accounts.google.com/gsi/client" async defer></script> @@ -1793,7 +1793,10 @@ $(function () { html+='</ul>'; } - if(imagesList.images[0].high>900) html+='<img style="height:900px" class="photo-content-left-img" src="https://zhibocdn.yabolive.net/comm'+imagesList.images[0].url+'?x-oss-process=image/resize,w_775" alt="">'; + if(imagesList.images[0].high>900){ + if(imagesList.images[0].high>imagesList.images[0].wide)html+='<img style="height:900px" class="photo-content-left-img" src="https://zhibocdn.yabolive.net/comm'+imagesList.images[0].url+'?x-oss-process=image/resize,w_775" alt="">'; + else html+='<img style="width:775px" class="photo-content-left-img" src="https://zhibocdn.yabolive.net/comm'+imagesList.images[0].url+'?x-oss-process=image/resize,w_775" alt="">'; + } else if(imagesList.images[0].wide>775)html+='<img style="width:775px" class="photo-content-left-img" src="https://zhibocdn.yabolive.net/comm'+imagesList.images[0].url+'?x-oss-process=image/resize,w_775" alt="">'; else html+='<img style="height:'+imagesList.images[0].high+'px;width:'+imagesList.images[0].wide+'px" class="photo-content-left-img" src="https://zhibocdn.yabolive.net/comm'+imagesList.images[0].url+'?x-oss-process=image/resize,w_775" alt="">'; $(".layer-photo-content-left").html(html); -- libgit2 0.25.0