Browse Source

后台微调

lizhen_gitee 1 year ago
parent
commit
cb2ab6d9e7

+ 1 - 0
application/api/controller/Index.php

@@ -303,6 +303,7 @@ class Index extends Api
         $where = [
             'user.id' => ['neq',$this->auth->id],
             'user.status' => 1,
+            'user.is_avtive' => 1,
         ];
 
         //性别

+ 3 - 3
application/api/controller/Topicdongtai.php

@@ -431,7 +431,7 @@ class Topicdongtai extends Api
             }
 
             //系统消息
-            $msg_id = \app\common\model\Message::addMessage($dt_user_id,'动态点赞','有人赞了你的动态','dongtai_good',$id);
+            $msg_id = \app\common\model\Message::addMessage($dt_user_id,'动态点赞',$this->auth->nickname.'赞了你的动态','dongtai_good',$id);
 
             Db::commit();
             $this->success('点赞成功');
@@ -499,14 +499,14 @@ class Topicdongtai extends Api
             //发给动态用户
             $msg_user_id = Db::name('topic_dongtai')->where('id',$id)->value('user_id');
             $msg_title = '动态评论';
-            $msg_content = '有人评论了你的动态';
+            $msg_content = $this->auth->nickname.'评论了你的动态';
             $infotype_id = $rs;
         }else{
             //发给层主
             $answer_info = Db::name('topic_dongtai_answer')->where(['dt_id'=>$id,'level'=>1,'floor'=>$floor])->find();
             $msg_user_id = $answer_info['user_id'];
             $msg_title = '动态评论点评';
-            $msg_content = '有人点评了你的动态评论';
+            $msg_content = $this->auth->nickname.'点评了你的动态评论';
             $infotype_id = $answer_info['id'];
         }
         $msg_id = \app\common\model\Message::addMessage($msg_user_id,$msg_title,$msg_content,'dongtai_answer',$infotype_id);

+ 4 - 4
public/assets/js/backend/user/user.js

@@ -25,9 +25,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id')},
+                        {field: 'id', title: __('Id'),sortable:true},
 //                        {field: 'intro_uid', title: __('Intro_uid')},
-                        {field: 'username', title: __('Username'), operate: 'LIKE'},
+                        {field: 'username', title: __('Username'), operate: 'LIKE',sortable:true},
                         {field: 'nickname', title: __('Nickname'), operate: 'LIKE'},
                         {field: 'introcode', title: __('Introcode'), operate: 'LIKE'},
 //                        {field: 'password', title: __('Password'), operate: 'LIKE'},
@@ -44,8 +44,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {field: 'successions', title: __('Successions')},
 //                        {field: 'maxsuccessions', title: __('Maxsuccessions')},
 //                        {field: 'prevtime', title: __('Prevtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'logintime', title: __('Logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
+                        {field: 'logintime', title: __('Logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
 //                        {field: 'loginfailure', title: __('Loginfailure')},
 //                        {field: 'joinip', title: __('Joinip'), operate: 'LIKE'},
 //                        {field: 'jointime', title: __('Jointime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},