lizhen_gitee před 1 rokem
rodič
revize
dd0a92454f

+ 6 - 5
application/admin/controller/Topicdongtai.php

@@ -5,7 +5,7 @@ namespace app\admin\controller;
 use app\common\controller\Backend;
 
 /**
- * 圈子动态
+ * 用户动态
  *
  * @icon fa fa-circle-o
  */
@@ -22,7 +22,8 @@ class Topicdongtai extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\Topicdongtai;
-        $this->view->assign("isHiddenList", $this->model->getIsHiddenList());
+        $this->view->assign("typeList", $this->model->getTypeList());
+        $this->view->assign("isPublicList", $this->model->getIsPublicList());
     }
 
     public function import()
@@ -54,15 +55,15 @@ class Topicdongtai extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['topichub','user'])
+                    ->with(['user','topichub'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
 
             foreach ($list as $row) {
                 
-                $row->getRelation('topichub')->visible(['name']);
-				$row->getRelation('user')->visible(['username']);
+                $row->getRelation('user')->visible(['username']);
+				$row->getRelation('topichub')->visible(['name']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

+ 1 - 1
application/admin/controller/Topichub.php

@@ -5,7 +5,7 @@ namespace app\admin\controller;
 use app\common\controller\Backend;
 
 /**
- * 圈子中心
+ * 话题中心
  *
  * @icon fa fa-circle-o
  */

+ 15 - 7
application/admin/lang/zh-cn/topicdongtai.php

@@ -2,18 +2,26 @@
 
 return [
     'Id'            => 'ID',
-    'Topic_id'      => '圈子id',
+    'Topic_ids'     => '话题id',
     'User_id'       => '用户ID',
     'Content'       => '内容',
-    'Images'        => '图片',
+    'Images'        => '图片集',
+    'Audio_file'    => '语音地址',
+    'Audio_second'  => '语音秒数',
+    'Type'          => '媒体类型',
+    'Type 1'        => '图片',
+    'Type 2'        => '语音',
     'Goodnum'       => '点赞数量',
+    'Answernum'     => '回复数量',
     'Createtime'    => '创建时间',
     'Updatetime'    => '更新时间',
+    'Cityname'      => '所在城市',
     'Longitude'     => '经度',
     'Latitude'      => '纬度',
-    'Is_hidden'     => '仅自己可见',
-    'Is_hidden 1'   => '是',
-    'Is_hidden 0'   => '否',
-    'Topichub.name' => '圈子名称',
-    'User.username' => '用户名'
+    'Aite'          => '艾特了谁',
+    'Is_public'     => '公开',
+    'Is_public 1'   => '公开',
+    'Is_public 2'   => '私密',
+    'User.username' => '用户名',
+    'Topichub.name' => '话题名称'
 ];

+ 1 - 3
application/admin/lang/zh-cn/topichub.php

@@ -2,12 +2,10 @@
 
 return [
     'Id'       => 'ID',
-    'Name'     => '圈子名称',
+    'Name'     => '话题名称',
     'Info'     => '简介',
     'Image'    => '封面图',
-    'P_number' => '人数',
     'T_number' => '帖子数量',
-    'Notice'   => '公告',
     'Status'   => '状态',
     'Status 1' => '正常',
     'Status 0' => '禁用',

+ 24 - 10
application/admin/model/Topicdongtai.php

@@ -25,35 +25,49 @@ class Topicdongtai extends Model
 
     // 追加属性
     protected $append = [
-        'is_hidden_text'
+        'type_text',
+        'is_public_text'
     ];
     
 
     
-    public function getIsHiddenList()
+    public function getTypeList()
     {
-        return ['1' => __('Is_hidden 1'), '0' => __('Is_hidden 0')];
+        return ['1' => __('Type 1'), '2' => __('Type 2')];
     }
 
-
-    public function getIsHiddenTextAttr($value, $data)
+    public function getIsPublicList()
     {
-        $value = $value ? $value : (isset($data['is_hidden']) ? $data['is_hidden'] : '');
-        $list = $this->getIsHiddenList();
-        return isset($list[$value]) ? $list[$value] : '';
+        return ['1' => __('Is_public 1'), '2' => __('Is_public 2')];
     }
 
 
+    public function getTypeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['type']) ? $data['type'] : '');
+        $list = $this->getTypeList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
 
 
-    public function topichub()
+    public function getIsPublicTextAttr($value, $data)
     {
-        return $this->belongsTo('Topichub', 'topic_id', 'id', [], 'LEFT')->setEagerlyType(0);
+        $value = $value ? $value : (isset($data['is_public']) ? $data['is_public'] : '');
+        $list = $this->getIsPublicList();
+        return isset($list[$value]) ? $list[$value] : '';
     }
 
 
+
+
     public function user()
     {
         return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
+
+
+    public function topichub()
+    {
+        return $this->belongsTo('Topichub', 'topic_ids', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
 }

+ 61 - 11
application/admin/view/topicdongtai/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">{:__('Topic_id')}:</label>
+        <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_id" data-rule="required" data-source="topic/index" class="form-control selectpage" name="row[topic_id]" type="text" value="">
+            <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">
@@ -15,14 +15,14 @@
     <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" data-rule="required" 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="textarea">
+                <input id="c-images" data-rule="required" 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>
@@ -33,30 +33,80 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Audio_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="">
+                <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>
+                </div>
+                <span class="msg-box n-right" for="c-audio_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">
+        </div>
+    </div>
+    <div class="form-group">
+        <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]">
+                {foreach name="typeList" 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">{:__('Goodnum')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-goodnum" class="form-control" name="row[goodnum]" type="number" value="0">
+            <input id="c-goodnum" data-rule="required" class="form-control" name="row[goodnum]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Answernum')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <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" class="form-control" name="row[longitude]" type="text">
+            <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" class="form-control" name="row[latitude]" type="text">
+            <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_hidden')}:</label>
+        <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_hidden" class="form-control selectpicker" name="row[is_hidden]">
-                {foreach name="isHiddenList" item="vo"}
-                    <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
+            <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>
 

+ 64 - 13
application/admin/view/topicdongtai/edit.html

@@ -1,17 +1,17 @@
 <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_id')}:</label>
+        <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_id" data-rule="required" data-source="topic/index" class="form-control selectpage" name="row[topic_id]" type="text" value="{$row.topic_id|htmlentities}">
+            <input id="c-topic_ids" data-rule="required" 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">
+    <!--<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}">
         </div>
-    </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">
@@ -19,10 +19,22 @@
         </div>
     </div>
     <div class="form-group">
+        <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]">
+                {foreach name="typeList" item="vo"}
+                <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </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="textarea" value="{$row.images|htmlentities}">
+                <input id="c-images" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">
                 <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>
@@ -33,30 +45,69 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Audio_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}">
+                <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>
+                </div>
+                <span class="msg-box n-right" for="c-audio_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}">
+        </div>
+    </div>
+
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Goodnum')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-goodnum" class="form-control" name="row[goodnum]" type="number" value="{$row.goodnum|htmlentities}">
+            <input id="c-goodnum" data-rule="required" class="form-control" name="row[goodnum]" type="number" value="{$row.goodnum|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Answernum')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <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" class="form-control" name="row[longitude]" type="text" value="{$row.longitude|htmlentities}">
+            <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" class="form-control" name="row[latitude]" type="text" value="{$row.latitude|htmlentities}">
+            <input id="c-latitude" data-rule="required" class="form-control" name="row[latitude]" type="text" value="{$row.latitude|htmlentities}">
         </div>
-    </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_hidden')}:</label>
+        <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_hidden" class="form-control selectpicker" name="row[is_hidden]">
-                {foreach name="isHiddenList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.is_hidden"}selected{/in}>{$vo}</option>
+            <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>
 

+ 3 - 15
application/admin/view/topichub/add.html

@@ -3,20 +3,20 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-name" class="form-control" name="row[name]" type="text">
+            <input id="c-name" class="form-control" name="row[name]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Info')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-info" class="form-control" name="row[info]" type="text">
+            <input id="c-info" class="form-control" name="row[info]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-image" class="form-control" size="50" name="row[image]" type="text">
+                <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -27,24 +27,12 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('P_number')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-p_number" class="form-control" name="row[p_number]" type="number" value="0">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('T_number')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-t_number" class="form-control" name="row[t_number]" type="number" value="0">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Notice')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-notice" class="form-control" name="row[notice]" type="text">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
             

+ 0 - 12
application/admin/view/topichub/edit.html

@@ -27,24 +27,12 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('P_number')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-p_number" class="form-control" name="row[p_number]" type="number" value="{$row.p_number|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('T_number')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-t_number" class="form-control" name="row[t_number]" type="number" value="{$row.t_number|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Notice')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-notice" class="form-control" name="row[notice]" type="text" value="{$row.notice|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
             

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

@@ -18,8 +18,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('topichub/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('topichub/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('topichub/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('topichub/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('topichub/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('topichub/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('topichub/multi')?'':'hide'}">

+ 1 - 3
application/config.php

@@ -18,11 +18,9 @@ return [
     // 应用命名空间
     'app_namespace'          => 'app',
     // 应用调试模式
-    'app_debug'              => Env::get('app.debug', false),
     'app_debug'              => true,
     // 应用Trace
-    'app_trace'              => Env::get('app.trace', false),
-    'app_trace'              => true,
+    'app_trace'              => false,
     // 应用模式状态
     'app_status'             => '',
     // 是否支持多模块

+ 19 - 10
public/assets/js/backend/topicdongtai.js

@@ -7,7 +7,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 extend: {
                     index_url: 'topicdongtai/index' + location.search,
                     add_url: 'topicdongtai/add',
-//                    edit_url: 'topicdongtai/edit',
+                    edit_url: 'topicdongtai/edit',
                     del_url: 'topicdongtai/del',
                     multi_url: 'topicdongtai/multi',
                     import_url: 'topicdongtai/import',
@@ -26,17 +26,26 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-//                        {field: 'topic_id', title: __('Topic_id')},
-//                        {field: 'user_id', title: __('User_id')},
-                        {field: 'content', title: __('Content'), operate: 'LIKE'},
-                        {field: 'goodnum', title: __('Goodnum')},
+//                        {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'), 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: 'audio_file', title: __('Audio_file'), operate: false},
+//                        {field: 'audio_second', title: __('Audio_second')},
+                        {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
+//                        {field: 'goodnum', title: __('Goodnum')},
+//                        {field: 'answernum', title: __('Answernum')},
                         {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: 'longitude', title: __('Longitude'), operate: 'LIKE'},
-                        {field: 'latitude', title: __('Latitude'), operate: 'LIKE'},
-                        {field: 'is_hidden', title: __('Is_hidden'), searchList: {"1":__('Is_hidden 1'),"0":__('Is_hidden 0')}, formatter: Table.api.formatter.normal},
-                        {field: 'topichub.name', title: __('Topichub.name'), operate: 'LIKE'},
-                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
+                        {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: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

+ 1 - 3
public/assets/js/backend/topichub.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'topichub/index' + location.search,
                     add_url: 'topichub/add',
                     edit_url: 'topichub/edit',
-//                    del_url: 'topichub/del',
+                    del_url: 'topichub/del',
                     multi_url: 'topichub/multi',
                     import_url: 'topichub/import',
                     table: 'topic_hub',
@@ -29,9 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
                         {field: 'info', title: __('Info'), operate: 'LIKE'},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'p_number', title: __('P_number')},
                         {field: 't_number', title: __('T_number')},
-                        {field: 'notice', title: __('Notice'), operate: 'LIKE'},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status},
                         {field: 'weight', title: __('Weight')},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}