lizhen 1 mēnesi atpakaļ
vecāks
revīzija
5ed3f0be87

+ 4 - 51
application/admin/controller/Topicdongtai.php

@@ -23,21 +23,9 @@ class Topicdongtai extends Backend
         parent::_initialize();
         $this->model = new \app\admin\model\Topicdongtai;
         $this->view->assign("typeList", $this->model->getTypeList());
-        $this->view->assign("isPublicList", $this->model->getIsPublicList());
         $this->view->assign("auditstatusList", $this->model->getAuditstatusList());
     }
 
-    public function import()
-    {
-        parent::import();
-    }
-
-    /**
-     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
-     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
-     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
-     */
-    
 
     /**
      * 查看
@@ -56,17 +44,16 @@ class Topicdongtai extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['user','topichub'])
+                    ->with(['user'])
                     ->where($where)
-                    ->order('topicdongtai.toptime desc')
+                    ->order('topicdongtai.id desc')
                     ->order($sort, $order)
                     //->select(false);echo $list;exit;
                     ->paginate($limit);
 
             foreach ($list as $row) {
-                
-                $row->getRelation('user')->visible(['username']);
-				$row->getRelation('topichub')->visible(['name']);
+
+                $row->getRelation('user')->visible(['username','nickname']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());
@@ -77,36 +64,6 @@ class Topicdongtai extends Backend
     }
 
     /**
-     * 置顶
-     */
-    public function toptime(){
-
-        if ($this->request->isAjax()) {
-            $id = input('id',0);
-
-            $rs = Db::name('topic_dongtai')->where('id',$id)->update(['toptime'=>time()]);
-
-            $this->success('完成');
-        }
-
-    }
-
-    /**
-     * 取消置顶
-     */
-    public function untoptime(){
-
-        if ($this->request->isAjax()) {
-            $id = input('id',0);
-
-            $rs = Db::name('topic_dongtai')->where('id',$id)->update(['toptime'=>0]);
-
-            $this->success('完成');
-        }
-
-    }
-
-    /**
      * 删除
      */
     public function del($ids = "")
@@ -161,10 +118,6 @@ class Topicdongtai extends Backend
 
         $delRes = Db::name('topic_dongtai')->where('id',$id)->delete();
 
-        //话题少一个贴
-        if (!empty($dongtai['topic_ids'])) {
-            $res = Db::name('topic_hub')->where('id','IN',$dongtai['topic_ids'])->setDec('t_number');
-        }
         //删除对应的评论,
         Db::name('topic_dongtai_answer')->where('dt_id',$id)->delete();
         //点赞,

+ 3 - 14
application/admin/lang/zh-cn/topicdongtai.php

@@ -2,27 +2,18 @@
 
 return [
     'Id'            => 'ID',
-    'Topic_ids'     => '话题id',
     'User_id'       => '用户ID',
     'Content'       => '内容',
     'Images'        => '图片集',
-    'Audio_file'    => '语音地址',
-    'Audio_second'  => '语音秒数',
+    'video_file'    => '视频地址',
     'Type'          => '媒体类型',
     'Type 1'        => '图片',
-    'Type 2'        => '语音',
+    'Type 2'        => '视频',
     'Goodnum'       => '点赞数量',
     'Answernum'     => '总的回复数量',
     'Createtime'    => '创建时间',
     'Updatetime'    => '更新时间',
-    'Cityname'      => '所在城市',
-    'Longitude'     => '经度',
-    'Latitude'      => '纬度',
-    'Aite'          => '艾特了谁',
-    'Is_public'     => '是否公开',
-    'Is_public 1'   => '公开',
-    'Is_public 2'   => '私密',
-    'Toptime'       => '置顶顺序',
+
     'Auditstatus'   => '审核状态',
     'Auditstatus 0' => '待审核',
     'Auditstatus 1' => '审核通过',
@@ -30,6 +21,4 @@ return [
     'Audittime'     => '审核时间',
     'Auditremark'   => '审核备注',
     'User.username' => '用户名',
-    'Topichub.name' => '话题名称',
-    'toptime'       => '置顶时间',
 ];

+ 0 - 30
application/admin/model/Topicdongtai.php

@@ -26,8 +26,6 @@ class Topicdongtai extends Model
     // 追加属性
     protected $append = [
         'type_text',
-        'is_public_text',
-        'toptime_text',
         'auditstatus_text',
         'audittime_text'
     ];
@@ -63,11 +61,6 @@ class Topicdongtai extends Model
         return ['1' => __('Type 1'), '2' => __('Type 2')];
     }
 
-    public function getIsPublicList()
-    {
-        return ['1' => __('Is_public 1'), '2' => __('Is_public 2')];
-    }
-
     public function getAuditstatusList()
     {
         return ['0' => __('Auditstatus 0'), '1' => __('Auditstatus 1'), '2' => __('Auditstatus 2')];
@@ -82,20 +75,6 @@ class Topicdongtai extends Model
     }
 
 
-    public function getIsPublicTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['is_public']) ? $data['is_public'] : '');
-        $list = $this->getIsPublicList();
-        return isset($list[$value]) ? $list[$value] : '';
-    }
-
-
-    public function getToptimeTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['toptime']) ? $data['toptime'] : '');
-        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
-    }
-
 
     public function getAuditstatusTextAttr($value, $data)
     {
@@ -111,11 +90,6 @@ class Topicdongtai extends Model
         return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
     }
 
-    protected function setToptimeAttr($value)
-    {
-        return $value === '' ? 0 : ($value && !is_numeric($value) ? strtotime($value) : $value);
-    }
-
     protected function setAudittimeAttr($value)
     {
         return $value === '' ? 0 : ($value && !is_numeric($value) ? strtotime($value) : $value);
@@ -128,8 +102,4 @@ class Topicdongtai extends Model
     }
 
 
-    public function topichub()
-    {
-        return $this->belongsTo('Topichub', 'topic_ids', 'id', [], 'LEFT')->setEagerlyType(0);
-    }
 }

+ 7 - 59
application/admin/view/topicdongtai/add.html

@@ -1,11 +1,6 @@
 <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">{:__('Topic_ids')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-topic_ids" data-rule="required" data-source="topic/index" data-multiple="true" class="form-control selectpage" name="row[topic_ids]" type="text" value="">
-        </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">
@@ -33,23 +28,17 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Audio_file')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Video_file')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-audio_file" data-rule="required" class="form-control" size="50" name="row[audio_file]" type="text" value="">
+                <input id="c-video_file" data-rule="required" class="form-control" size="50" name="row[video_file]" type="text">
                 <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-audio_file" class="btn btn-danger faupload" data-input-id="c-audio_file" data-multiple="false" data-preview-id="p-audio_file"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-audio_file" class="btn btn-primary fachoose" data-input-id="c-audio_file" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                    <span><button type="button" id="faupload-video_file" class="btn btn-danger faupload" data-input-id="c-video_file" data-multiple="false" data-preview-id="p-video_file"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-video_file" class="btn btn-primary fachoose" data-input-id="c-video_file" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
                 </div>
-                <span class="msg-box n-right" for="c-audio_file"></span>
+                <span class="msg-box n-right" for="c-video_file"></span>
             </div>
-            <ul class="row list-inline faupload-preview" id="p-audio_file"></ul>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Audio_second')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-audio_second" data-rule="required" class="form-control" name="row[audio_second]" type="number" value="0">
+            <ul class="row list-inline faupload-preview" id="p-video_file"></ul>
         </div>
     </div>
     <div class="form-group">
@@ -76,48 +65,7 @@
             <input id="c-answernum" data-rule="required" class="form-control" name="row[answernum]" type="number" value="0">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Cityname')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-cityname" data-rule="required" class="form-control" name="row[cityname]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-longitude" data-rule="required" class="form-control" name="row[longitude]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Latitude')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-latitude" data-rule="required" class="form-control" name="row[latitude]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Aite')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-aite" data-rule="required" class="form-control" name="row[aite]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Is_public')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-is_public" data-rule="required" class="form-control selectpicker" name="row[is_public]">
-                {foreach name="isPublicList" item="vo"}
-                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
 
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Toptime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-toptime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[toptime]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Auditstatus')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 7 - 53
application/admin/view/topicdongtai/edit.html

@@ -1,11 +1,6 @@
 <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">{:__('Topic_ids')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-topic_ids" data-source="topichub/index" data-multiple="true" class="form-control selectpage" name="row[topic_ids]" type="text" value="{$row.topic_ids|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">
@@ -45,23 +40,17 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Audio_file')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Video_file')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-audio_file" class="form-control" size="50" name="row[audio_file]" type="text" value="{$row.audio_file|htmlentities}">
+                <input id="c-video_file"  class="form-control" size="50" name="row[video_file]" type="text" value="{$row.video_file|htmlentities}">
                 <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-audio_file" class="btn btn-danger faupload" data-input-id="c-audio_file" data-multiple="false" data-preview-id="p-audio_file"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-audio_file" class="btn btn-primary fachoose" data-input-id="c-audio_file" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                    <span><button type="button" id="faupload-video_file" class="btn btn-danger faupload" data-input-id="c-video_file" data-mimetype="*" data-multiple="false" data-preview-id="p-video_file"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-video_file" class="btn btn-primary fachoose" data-input-id="c-video_file" data-mimetype="*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
                 </div>
-                <span class="msg-box n-right" for="c-audio_file"></span>
+                <span class="msg-box n-right" for="c-video_file"></span>
             </div>
-            <ul class="row list-inline faupload-preview" id="p-audio_file"></ul>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Audio_second')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-audio_second" class="form-control" name="row[audio_second]" type="number" value="{$row.audio_second|htmlentities}">
+            <ul class="row list-inline faupload-preview" id="p-video_file"></ul>
         </div>
     </div>
 
@@ -77,42 +66,7 @@
             <input id="c-answernum" data-rule="required" class="form-control" name="row[answernum]" type="number" value="{$row.answernum|htmlentities}">
         </div>
     </div>-->
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Cityname')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-cityname" data-rule="required" class="form-control" name="row[cityname]" type="text" value="{$row.cityname|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-longitude" data-rule="required" class="form-control" name="row[longitude]" type="text" value="{$row.longitude|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Latitude')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-latitude" data-rule="required" class="form-control" name="row[latitude]" type="text" value="{$row.latitude|htmlentities}">
-        </div>
-    </div>-->
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Aite')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-aite" data-rule="required" class="form-control" name="row[aite]" type="text" value="{$row.aite|htmlentities}">
-        </div>
-    </div>-->
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Is_public')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-is_public" data-rule="required" class="form-control selectpicker" name="row[is_public]">
-                {foreach name="isPublicList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.is_public"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
 
-        </div>
-    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Auditstatus')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 0 - 2
application/admin/view/topicdongtai/index.html

@@ -25,8 +25,6 @@
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('topicdongtai/edit')}" 
                            data-operate-del="{:$auth->check('topicdongtai/del')}" 
-                           data-operate-toptime="{:$auth->check('topicdongtai/toptime')}"
-                           data-operate-untoptime="{:$auth->check('topicdongtai/untoptime')}"
                            width="100%">
                     </table>
                 </div>

+ 7 - 48
public/assets/js/backend/topicdongtai.js

@@ -27,12 +27,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-//                        {field: 'topic_ids', title: __('Topic_ids'), operate: 'LIKE'},
-//                        {field: 'topichub.name', title: __('Topichub.name'), operate: 'LIKE'},
 
                         {field: 'user_id', title: __('User_id')},
-                        {field: 'user.username', title: __('User.username'),sortable:true, operate: 'LIKE'},
-
+                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'content', title: __('Content'), operate: 'LIKE',
                             cellStyle:  {css: {
                                 "white-space": "break-spaces",
@@ -56,18 +54,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             },
                             events: Table.api.events.image, formatter: Table.api.formatter.images},
                         {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
-                        {field: 'audio_file', title: __('Audio_file'), operate: false,events: Table.api.events.image, formatter: Table.api.formatter.audio},
-//                        {field: 'audio_second', title: __('Audio_second')},
-//                        {field: 'goodnum', title: __('Goodnum')},
-//                        {field: 'answernum', title: __('Answernum')},
+                        // {field: 'video_file', title: __('Video_file'), operate: false, formatter: Table.api.formatter.video},
+                       {field: 'goodnum', title: __('Goodnum')},
+                       // {field: 'answernum', title: __('Answernum')},
                         {field: 'createtime', title: __('Createtime'),sortable:true, 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: 'cityname', title: __('Cityname'), operate: 'LIKE'},
-//                        {field: 'longitude', title: __('Longitude'), operate: 'LIKE'},
-//                        {field: 'latitude', title: __('Latitude'), operate: 'LIKE'},
-//                        {field: 'aite', title: __('Aite'), operate: 'LIKE'},
-                        {field: 'is_public', title: __('Is_public'), searchList: {"1":__('Is_public 1'),"2":__('Is_public 2')}, formatter: Table.api.formatter.normal},
-                        {field: 'toptime', title: __('toptime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'auditstatus', title: __('Auditstatus'), searchList: {"0":__('Auditstatus 0'),"1":__('Auditstatus 1'),"2":__('Auditstatus 2')}, formatter: Table.api.formatter.status},
                         {field: 'audittime', title: __('Audittime'),sortable:true, operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'auditremark', title: __('Auditremark'), operate: 'LIKE',
@@ -82,34 +73,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             }
                         },
                         {field: 'operate', title: __('Operate'), table: table,
-                            buttons:[
-                                {
-                                    name:'toptime',
-                                    text:'置顶',
-                                    title:'置顶',
-                                    icon:'fa fa-exclamation-circle',
-                                    classname:'btn btn-xs btn-info btn-ajax',
-                                    url:'topicdongtai/toptime/id/{ids}?dialog=1',
-                                    target:'_self',
-                                    refresh:true,
-                                },
-                                {
-                                    name:'untoptime',
-                                    text:'取消置顶',
-                                    title:'取消置顶',
-                                    icon:'fa fa-exclamation-circle',
-                                    classname:'btn btn-xs btn-info btn-ajax',
-                                    url:'topicdongtai/untoptime/id/{ids}?dialog=1',
-                                    target:'_self',
-                                    hidden:function(row){
-                                        if(row.toptime > 0){
-                                            return false;
-                                        }
-                                        return true;
-                                    },
-                                    refresh:true,
-                                }
-                            ],
+
                             events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
@@ -118,12 +82,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 为表格绑定事件
             Table.api.bindevent(table);
         },
-        toptime: function () {
-            Controller.api.bindevent();
-        },
-        untoptime: function () {
-            Controller.api.bindevent();
-        },
+
         add: function () {
             Controller.api.bindevent();
         },