lizhen_gitee 1 year ago
parent
commit
b723b85e6d

+ 2 - 2
application/admin/lang/zh-cn/reportim.php

@@ -14,6 +14,6 @@ return [
     'Audio_file'    => '语音文件地址',
     'Createtime'    => '创建时间',
     'Updatetime'    => '更新时间',
-    'User.username' => '用户名',
-    'User.username' => '用户名'
+    'Usera.username' => '用户名',
+    'Userb.username' => '被举报用户名'
 ];

+ 3 - 3
application/admin/view/reportim/edit.html

@@ -4,7 +4,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
+            <select  id="c-type" data-rule="required" disabled class="form-control selectpicker" name="row[type]">
                 {foreach name="typeList" item="vo"}
                     <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
                 {/foreach}
@@ -15,13 +15,13 @@
     <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" 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" disabled data-source="user/user/index" data-field="username" 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}">
+            <input id="c-to_user_id" data-rule="required" disabled data-source="user/user/index" data-field="username" class="form-control selectpage" name="row[to_user_id]" type="text" value="{$row.to_user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">

+ 2 - 2
application/admin/view/reportim/index.html

@@ -7,7 +7,7 @@
                 <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('reportim/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('reportim/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('reportim/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('reportim/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('reportim/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>
@@ -18,7 +18,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

+ 2 - 2
application/api/controller/Report.php

@@ -54,7 +54,7 @@ class Report extends Api
         $type = input('type',1);//类型:1=文字,2=语音,3=图片,4=阅后即焚
         $to_user_id = input('to_user_id',0);
         $content = input('content','');
-        $images  = input('images','');
+        $image  = input('images','');
         $audio_file  = input('audio_file','');
 
         $data = [
@@ -62,7 +62,7 @@ class Report extends Api
             'user_id' => $this->auth->id,
             'to_user_id' => $to_user_id,
             'content' => $content,
-            'images' => $images,
+            'image' => $image,
             'audio_file' => $audio_file,
             'createtime' => time(),
             'updatetime' => time(),

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

@@ -574,8 +574,8 @@ class Topicdongtai extends Api
 
     //举报
     public function report(){
-        $field = ['dt_id'/*,'type','content','images'*/];
-        $data = request_post_hub($field);
+        $dt_id = input('dt_id',0);
+        $data['dt_id'] = $dt_id;
 
         $check = Db::name('topic_dongtai')->where('id',$data['dt_id'])->find();
         if(empty($check)){

+ 6 - 4
public/assets/js/backend/reportim.js

@@ -27,14 +27,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3'),"4":__('Type 4')}, formatter: Table.api.formatter.normal},
-                        {field: 'user_id', title: __('User_id')},
-                        {field: 'to_user_id', title: __('To_user_id')},
+//                        {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: 'audio_file', title: __('Audio_file'), operate: false},
                         {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: 'user.username', title: __('User.username'), 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}
                     ]
                 ]