举报类型和举报

application/admin/controller/Report.php

@@ -54,15 +54,15 @@ class Report extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['reporttype','user'])
+                    ->with(['usera','userb'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
 
             foreach ($list as $row) {
                 
-                $row->getRelation('reporttype')->visible(['name']);
-				$row->getRelation('user')->visible(['username']);
+                $row->getRelation('usera')->visible(['username']);
+				$row->getRelation('userb')->visible(['username']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

application/admin/lang/zh-cn/report.php

@@ -1,13 +1,14 @@
 <?php
 
 return [
-    'Id'              => 'ID',
-    'Type_id'         => '举报类型',
-    'User_id'         => '用户id',
-    'Content'         => '举报内容',
-    'Images'          => '图片',
-    'Createtime'      => '创建时间',
-    'Updatetime'      => '更新时间',
-    'Reporttype.name' => '举报类型',
-    'User.username'   => '用户名'
+    'Id'            => 'ID',
+    'Type'          => '举报类型',
+    'User_id'       => '用户id',
+    'To_user_id'    => '被举报用户id',
+    'Content'       => '举报内容',
+    'Images'        => '图片',
+    'Createtime'    => '创建时间',
+    'Updatetime'    => '更新时间',
+    'Usera.username' => '用户名',
+    'Userb.username' => '被举报用户名'
 ];

application/admin/model/Report.php

@@ -37,14 +37,14 @@ class Report extends Model
 
 
 
-    public function reporttype()
+    public function usera()
     {
-        return $this->belongsTo('Reporttype', 'type_id', 'id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 
 
-    public function user()
+    public function userb()
     {
-        return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('User', 'to_user_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 }

application/admin/view/report/add.html

@@ -1,9 +1,9 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Type_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-type_id" data-rule="required" data-source="type/index" class="form-control selectpage" name="row[type_id]" type="text" value="">
+            <input id="c-type" class="form-control" name="row[type]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -13,16 +13,22 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('To_user_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-to_user_id" data-rule="required" data-source="to/user/index" class="form-control selectpage" name="row[to_user_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-content" class="form-control" name="row[content]" type="text">
+            <input id="c-content" class="form-control" name="row[content]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-images" class="form-control" size="50" name="row[images]" type="text">
+                <input id="c-images" class="form-control" size="50" name="row[images]" type="text" value="">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>

application/admin/view/report/edit.html

@@ -1,15 +1,21 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Type_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-type_id" data-rule="required" disabled data-source="reporttype/index" class="form-control selectpage" name="row[type_id]" type="text" value="{$row.type_id|htmlentities}">
+            <input id="c-type" class="form-control" name="row[type]" type="text" value="{$row.type|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" disabled data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('To_user_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-to_user_id" data-rule="required" data-source="to/user/index" class="form-control selectpage" name="row[to_user_id]" type="text" value="{$row.to_user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">

application/admin/view/report/index.html

@@ -7,8 +7,8 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('report/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('report/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('report/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('report/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('report/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('report/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
 

application/admin/view/reporttype/index.html

@@ -8,8 +8,8 @@
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
                         <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('reporttype/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('reporttype/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <!--<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('reporttype/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('reporttype/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('reporttype/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('reporttype/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
 
                         <div class="dropdown btn-group {:$auth->check('reporttype/multi')?'':'hide'}">

public/assets/js/backend/report.js

@@ -7,7 +7,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 extend: {
                     index_url: 'report/index' + location.search,
                     add_url: 'report/add',
-                    edit_url: 'report/edit',
+//                    edit_url: 'report/edit',
                     del_url: 'report/del',
                     multi_url: 'report/multi',
                     import_url: 'report/import',
@@ -26,14 +26,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        /*{field: 'type_id', title: __('Type_id')},
-                        {field: 'user_id', title: __('User_id')},*/
+                        {field: 'type', title: __('Type'), operate: 'LIKE'},
+                        {field: 'user_id', title: __('User_id')},
+                        {field: 'usera.username', title: __('Usera.username'), operate: 'LIKE'},
+
+                        {field: 'to_user_id', title: __('To_user_id')},
+                        {field: 'userb.username', title: __('Userb.username'), operate: 'LIKE'},
+
                         {field: 'content', title: __('Content'), operate: 'LIKE'},
                         {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'reporttype.name', title: __('Reporttype.name'), operate: 'LIKE'},
-                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

public/assets/js/backend/reporttype.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'reporttype/index' + location.search,
                     add_url: 'reporttype/add',
                     edit_url: 'reporttype/edit',
-//                    del_url: 'reporttype/del',
+                    del_url: 'reporttype/del',
                     multi_url: 'reporttype/multi',
                     import_url: 'reporttype/import',
                     table: 'report_type',