アイコン修正、コメント表示
このコミットが含まれているのは:
コミット
b361b687e3
|
@ -212,6 +212,8 @@ class SiteController extends Controller {
|
|||
$gname = $this->objUser->getGroupName($i->user_id);
|
||||
$showGroupName = $gname[0]->name;
|
||||
|
||||
$comment = $this->getComments($i->id);
|
||||
|
||||
array_push($res, [
|
||||
'id' => $i->id,
|
||||
'user_id' => $i->user_id,
|
||||
|
@ -224,7 +226,8 @@ class SiteController extends Controller {
|
|||
'gender' => $i->gender,
|
||||
'avatar' => $i->avatar,
|
||||
'showcol' => $showCol,
|
||||
'showname' => $showName
|
||||
'showname' => $showName,
|
||||
'comment' => $comment
|
||||
]);
|
||||
}
|
||||
|
||||
|
@ -269,6 +272,7 @@ class SiteController extends Controller {
|
|||
|
||||
if (!empty($i->display_name)) $showName = $i->display_name;
|
||||
else $showName = $i->username;
|
||||
if (empty($i->avatar) || $i->avatar == '') $i->avatar = 'assets/avatars/haznoavaz.png';
|
||||
|
||||
if (!empty($i->name_style)) $showCol = $i->name_style;
|
||||
else {
|
||||
|
|
|
@ -33,6 +33,7 @@ class UserController extends Controller {
|
|||
$get = DB::table('users')->where('id', $id)->first();
|
||||
$get->profile = DB::table('usr_profile')->where('user_id', $id)->first();
|
||||
$get->profile->showname = (!empty($get->profile->display_name) && !is_null($get->profile->display_name) ? $get->profile->display_name : $get->username);
|
||||
if (empty($get->avatar) || $get->avatar == '') $get->avatar = 'assets/avatars/haznoavaz.png';
|
||||
|
||||
return $get;
|
||||
}
|
||||
|
@ -57,6 +58,7 @@ class UserController extends Controller {
|
|||
$get->contacts = DB::table('usr_contacts')->where('user_id', $id)->first();
|
||||
$get->perm_id = DB::table('usr_perm_id')->where('user_id', $id)->first();
|
||||
$get->perm_module = DB::table('usr_perm_module')->where('usr_perm_id', $get->perm_id->usr_per_id)->first();
|
||||
if (empty($get->avatar) || $get->avatar == '') $get->avatar = '/storage/assets/avatars/haznoavaz.png';
|
||||
|
||||
$get->profile->gender_name = '不明';
|
||||
if ($get->profile->gender == 1) $get->profile->gender_name = '男性';
|
||||
|
|
|
@ -0,0 +1,50 @@
|
|||
<template>
|
||||
<div id="commentbody">
|
||||
{{ comments }}
|
||||
<hr />
|
||||
<h3>コメント(<a href="#comment-form">→コメント投稿フォームへ</a>)
|
||||
<div v-if="comments.length > 0">
|
||||
<div class="commentloop" v-for="(c, i) in comments" :key="`comment-${i}`">※{{ i }} :
|
||||
<span class="name">{{ i.showname }} </span><span class="date">{{ i.postdate }} ID:OTRhYjBi</span>
|
||||
<span class="413-reply" name="1" style="margin-left:10px;cursor:pointer;color:grey;" :title="`コメント${i}番に返信します`">▼コメント返信</span>
|
||||
<div class="commenttext">
|
||||
<div class="commentleft">{{ i.message }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else>
|
||||
<div class="commentloop">
|
||||
コメントは見つかれませんでした。
|
||||
</div>
|
||||
</div>
|
||||
<a name="comment-form"></a>
|
||||
<div class="newcomment">
|
||||
コメントの投稿
|
||||
<input v-if="cookid === 0" type="text" name="author" v-model="username">
|
||||
<textarea name="body" rows="15" cols="100%" class="textareaback" style="width:700px;">{{ message }}</textarea>
|
||||
<button type="button" class="btn btn-block btn-success" @click="send">送信</button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
props: { cookid: 0, comment: Array },
|
||||
data: function () {
|
||||
return {
|
||||
comments: this.comment,
|
||||
username: '',
|
||||
message: ''
|
||||
}
|
||||
},
|
||||
created: function () {
|
||||
if (this.cookid === 0) this.username = '名無しさん';
|
||||
}
|
||||
methods: {
|
||||
reply (i) {
|
||||
this.message += '※' + i;
|
||||
// scrollto
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
|
@ -179,6 +179,10 @@
|
|||
background-color: #31363b;
|
||||
text-align: left;
|
||||
}
|
||||
.commentloop {
|
||||
padding: 10px 4px 40px 4px;
|
||||
}
|
||||
.commentloop > .name { color: #11d116; }
|
||||
.modal-header, .modal-body, .modal-footer { color: #fcfcfc; }
|
||||
.modal-header {
|
||||
background: linear-gradient(
|
||||
|
@ -191,7 +195,7 @@
|
|||
.modal-body { background-color: #4d4d4d; }
|
||||
.modal-footer { background-color: #31363b; }
|
||||
.form-control, .form-control:focus {
|
||||
background-color: #31363b;
|
||||
background-color: #232629;
|
||||
color: #fcfcfc;
|
||||
}
|
||||
.form-control {
|
||||
|
|
新しいイシューから参照