Commit 3b660c5f by Lee Munkyeong

Merge branch 'features/#574_全グループでお気に入りを登録すると自身情報セールが表示される' into 'release_sp3'

自身情報セールの位置修正

See merge request !64
parents 41fff884 57cf03d4
...@@ -56,31 +56,30 @@ ...@@ -56,31 +56,30 @@
<input id="tabAllGroup" type="radio" name="tab_item"> <input id="tabAllGroup" type="radio" name="tab_item">
<label class="tab_item" for="tabAllGroup">全グループ</label> <label class="tab_item" for="tabAllGroup">全グループ</label>
<div class="content chat_list my_info_sell"> <!-- タブ -->
<ul class="p-0 chat_make_room_list"> <div class="tab_content" id="tab1_content">
<li class="d-flex align-items-center"> <div class="content chat_list my_info_sell">
<a href="#" style="width: 100%;"> <ul class="p-0 chat_make_room_list">
<div class="chat_item d-flex flex-row align-items-center"> <li class="d-flex align-items-center">
<div class="chat_item_l"> <a href="#" style="width: 100%;">
<div class="thumbnail"> <div class="chat_item d-flex flex-row align-items-center" style="background: none !important;">
<div class="img_wrap"><img id="myImg" src="img/noImage.png" onError="this.src='./img/noImage.png'" /></div> <div class="chat_item_l">
<div class="thumbnail">
<div class="img_wrap"><img id="myImg" src="img/noImage.png" onError="this.src='./img/noImage.png'" /></div>
</div>
</div> </div>
</div> <div class="chat_item_m px-0">
<div class="chat_item_m px-0"> <div class="d-flex flex-column">
<div class="d-flex flex-column"> <div class="chat_item_t">
<div class="chat_item_t"> <span class="chat_item_ttl" id="myName"></span>
<span class="chat_item_ttl" id="myName"></span> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </a>
</a> </li>
</li> </ul>
</ul> </div>
</div>
<!-- タブ -->
<div class="tab_content" id="tab1_content">
<div class="chat_list" id="myContactList"> <div class="chat_list" id="myContactList">
<!-- お気に入りグループ --> <!-- お気に入りグループ -->
<div class="category"><div class="category_name"><span>お気に入り</span></div></div> <div class="category"><div class="category_name"><span>お気に入り</span></div></div>
......
...@@ -912,7 +912,6 @@ CHAT_UI.refreshContactScreen = function() { ...@@ -912,7 +912,6 @@ CHAT_UI.refreshContactScreen = function() {
$('#userNameCard').modal('hide'); $('#userNameCard').modal('hide');
$('#favoriteList').html(''); $('#favoriteList').html('');
$('#myGroupList').html(''); $('#myGroupList').html('');
$('.my_info_sell').css('display','block');
//画面タイトル設定 //画面タイトル設定
let contactListTitle = getLocalizedString("contactListTitle"); let contactListTitle = getLocalizedString("contactListTitle");
$('#title').text(contactListTitle); $('#title').text(contactListTitle);
...@@ -1460,7 +1459,6 @@ CHAT_UI.refreshAllGroupSearch = function(paramGroupId) { ...@@ -1460,7 +1459,6 @@ CHAT_UI.refreshAllGroupSearch = function(paramGroupId) {
$('.overlay_src_msg').empty(); $('.overlay_src_msg').empty();
$('#contactSearch').attr('placeholder', getLocalizedString('searchUserAndGroup')); $('#contactSearch').attr('placeholder', getLocalizedString('searchUserAndGroup'));
$('#tabAllGroup').prop('checked', true); $('#tabAllGroup').prop('checked', true);
$('.my_info_sell').css('display','none');
//オンライン状態であればサーバから情報更新。 //オンライン状態であればサーバから情報更新。
if (IS_ONLINE == 'true') { if (IS_ONLINE == 'true') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment