Skip to content

C
chat_webview
Commit a4a781bf by Kang Donghun
Options

Merge branch 'release_sp3' into 'bugfix/#499-招待画面リストクリア修正' 

# Conflicts:
#   public_new/js/chat.js
parents 7d0fccf7 aeed436b
Showing with 39 additions and 35 deletions
public_new/contact.html
...@@ -49,36 +49,37 @@ ...@@ -49,36 +49,37 @@
<span class="src_icon"></span> <span class="src_icon"></span>
<a href="#" class="cancel none">キャンセル</a> <a href="#" class="cancel none">キャンセル</a>
</div> </div>
<div class="content chat_list">
<ul class="p-0 chat_make_room_list">
<li class="d-flex align-items-center">
<a href="#" style="width: 100%;">
<div class="chat_item d-flex flex-row align-items-center">
<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 class="chat_item_m px-0">
<div class="d-flex flex-column">
<div class="chat_item_t">
<span class="chat_item_ttl" id="myName"></span>
</div>
</div>
</div>
</div>
</a>
</li>
</ul>
</div>
<!-- タブ -->
<div class="content tabs"> <div class="content tabs">
<input id="tabMyGroup" type="radio" name="tab_item" checked> <input id="tabMyGroup" type="radio" name="tab_item" checked>
<label class="tab_item" for="tabMyGroup">マイグループ</label> <label class="tab_item" for="tabMyGroup">マイグループ</label>
<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">
<li class="d-flex align-items-center">
<a href="#" style="width: 100%;">
<div class="chat_item d-flex flex-row align-items-center">
<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 class="chat_item_m px-0">
<div class="d-flex flex-column">
<div class="chat_item_t">
<span class="chat_item_ttl" id="myName"></span>
</div>
</div>
</div>
</div>
</a>
</li>
</ul>
</div>
<!-- タブ -->
<div class="tab_content" id="tab1_content"> <div class="tab_content" id="tab1_content">
<div class="chat_list" id="myContactList"> <div class="chat_list" id="myContactList">
<!-- お気に入りグループ --> <!-- お気に入りグループ -->
......
public_new/css/chat.css
...@@ -59,6 +59,7 @@ input[name="tab_item"] { ...@@ -59,6 +59,7 @@ input[name="tab_item"] {
/**************************** chat list *************************/ /**************************** chat list *************************/
.chat_list ul { .chat_list ul {
padding: 0; padding: 0;
margin-top: 1rem;
} }
.chat_list img { .chat_list img {
width: 90px; width: 90px;
...@@ -777,6 +778,7 @@ input[name="tab_item"] { ...@@ -777,6 +778,7 @@ input[name="tab_item"] {
/* chat item */ /* chat item */
.tab_item { .tab_item {
font-size: 16px; font-size: 16px;
margin-bottom: 1rem;
} }
.chat_item_ttl { .chat_item_ttl {
font-size: 16px; font-size: 16px;
......
public_new/css/common.css
...@@ -6,7 +6,7 @@ body { ...@@ -6,7 +6,7 @@ body {
font-family: "Noto Sans JP", sans-serif; font-family: "Noto Sans JP", sans-serif;
margin: 0 auto; margin: 0 auto;
color: #323743; color: #323743;
margin-bottom: 60px; margin-bottom: 70px;
overflow-x: hidden; overflow-x: hidden;
} }
a:hover { a:hover {
......
public_new/css/contact.css
...@@ -14,3 +14,6 @@ ...@@ -14,3 +14,6 @@
.breadcrumb_item { .breadcrumb_item {
color: #323743; color: #323743;
} }
.my_info_sell {
clear: both;
}
public_new/js/chat-ui.js
...@@ -1916,15 +1916,13 @@ CHAT_UI.checkForMakeChat = function(checkMemberId) { ...@@ -1916,15 +1916,13 @@ CHAT_UI.checkForMakeChat = function(checkMemberId) {
CHAT.globalSelectedUserList = CHAT.globalSelectedUserList.filter(function(shopMemberId) { CHAT.globalSelectedUserList = CHAT.globalSelectedUserList.filter(function(shopMemberId) {
return checkMemberId != shopMemberId; return checkMemberId != shopMemberId;
}); });
$('.checkbox' + checkMemberId).prop("checked", false).trigger("change");
} else { } else {
// add // add
CHAT.globalSelectedUserList.push(checkMemberId); CHAT.globalSelectedUserList.push(checkMemberId);
$('.checkbox' + checkMemberId).prop("checked", true).trigger("change");
} }
if($('.checkbox' + checkMemberId).prop('checked')){
$('.checkbox' + checkMemberId).removeAttr('checked');
}else{
$('.checkbox' + checkMemberId).attr('checked', true);
}
let cnt = CHAT.globalSelectedUserList.length; let cnt = CHAT.globalSelectedUserList.length;
if (CHAT.globalSelectedUserList.length > 0) { if (CHAT.globalSelectedUserList.length > 0) {
$('.select_member_num').text(cnt); $('.select_member_num').text(cnt);
......
public_new/template/template_make_room_group_user_list.html
<div class="category"><div class="category_name"><span>{{groupName}}</span></div></div> <div class="category" onclick="CHAT_UI.toggleCategory(this);"><div class="category_name"><span>{{groupName}}</span></div></div>
<ul class="p-0 chat_make_room_list"> <ul class="p-0 chat_make_room_list">
{{#groupUserList}} {{#groupUserList}}
<li class="d-flex align-items-center"> <li class="d-flex align-items-center">
<div class="chat_item d-flex flex-row align-items-center w-100"> <div class="chat_item d-flex flex-row align-items-center w-100" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});" >
<div class="chat_item_l_chk"> <div class="chat_item_l_chk">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" id="checkbox{{shopMemberId}}" name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onchange="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}> <input type="checkbox" id="checkbox{{shopMemberId}}" name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}>
<span class="checkbox-parts"></span> <span class="checkbox-parts"></span>
</label> </label>
</div> </div>
......
public_new/template/template_make_room_user_list.html
<ul class="p-0 chat_make_room_list"> <ul class="p-0 chat_make_room_list">
{{#userList}} {{#userList}}
<li class="d-flex align-items-center"> <li class="d-flex align-items-center">
<div class="chat_item d-flex flex-row align-items-center w-100"> <div class="chat_item d-flex flex-row align-items-center w-100" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});">
<div class="chat_item_l_chk"> <div class="chat_item_l_chk">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" id="checkbox{{shopMemberId}}" name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onchange="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}> <input type="checkbox" id="checkbox{{shopMemberId}}" name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}>
<span class="checkbox-parts"></span> <span class="checkbox-parts"></span>
</label> </label>
</div> </div>
......
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