后台整理

application/admin/controller/Topicdongtaianswer.php

@@ -62,7 +62,7 @@ class Topicdongtaianswer extends Backend
 
             foreach ($list as $row) {
                 
-                $row->getRelation('user')->visible(['username']);
+                $row->getRelation('user')->visible(['username','nickname']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

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

@@ -3,7 +3,7 @@
 return [
     'Id'           => 'ID',
     'Paper_id'     => '社区服务类型ID',
-    'Kind'         => '试题类型',
+    'Kind'         => '类型',
     'Kind single'  => '单选',
     'Kind multi'   => '多选',
     'Title'        => '题目',

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

@@ -4,8 +4,8 @@ return [
     'Id'            => 'ID',
     'Dt_id'         => '动态ID',
     'Floor'         => '楼层',
-    'User_id'       => '用户ID',
-    'Content'       => '内容',
+    'User_id'       => '评论用户ID',
+    'Content'       => '评论内容',
     'To_user_id'    => '对谁说',
     'Goodnum'       => '点赞数量',
     'Level'         => '回复类型',
@@ -13,5 +13,6 @@ return [
     'Level 2'       => '层中回复',
     'Createtime'    => '创建时间',
     'Updatetime'    => '更新时间',
-    'User.username' => '用户名'
+    'User.username' => '评论用户名',
+    'User.nickname' => '评论用户昵称',
 ];

application/admin/model/Servicequestion.php

@@ -26,7 +26,8 @@ class Servicequestion extends Model
     // 追加属性
     protected $append = [
         'kind_text',
-        'status_text'
+        'status_text',
+        'options_jsonstr'
     ];
 
     public function getOptionsJsonAttr($value)
@@ -43,6 +44,15 @@ class Servicequestion extends Model
         }
         return [];
     }
+
+    public function getOptionsJsonstrAttr($value, $data)
+    {
+        return $data['options_json'];
+    }
+
+
+
+
     
 
     protected static function init()

application/admin/view/jiuyezixun/index.html

@@ -18,7 +18,7 @@
                     <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('jiuyezixun/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('jiuyezixun/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('jiuyezixun/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('jiuyezixun/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
 
@@ -29,7 +29,7 @@
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 {/foreach}
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

application/admin/view/servicegrade/detail.html

@@ -9,7 +9,7 @@
 
     <el-card class="box-card" style="margin-bottom: 20px;">
         <div slot="header" class="clearfix">
-            <span>用户答题情况</span>
+            <span>用户提交情况</span>
             <!--<el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>-->
         </div>
 
@@ -36,16 +36,16 @@
                         </tbody>
                         <tbody>
                         <tr class="el-descriptions-row">
-                            <th colspan="1" class="el-descriptions-item__cell el-descriptions-item__label is-bordered-label th-fix-width">题型</th>
+                            <th colspan="1" class="el-descriptions-item__cell el-descriptions-item__label is-bordered-label th-fix-width">类型</th>
                             <td colspan="1" class="el-descriptions-item__cell el-descriptions-item__content th-fix-width">
-                                <el-tag size="small" effect="plain" v-if="question.kind == 'JUDGE'">判断题</el-tag>
-                                <el-tag size="small" effect="plain" v-else-if="question.kind == 'SINGLE'" type="success">单选题</el-tag>
-                                <el-tag size="small" effect="plain" v-else-if="question.kind == 'MULTI'" type="info">多选题</el-tag>
+                                <el-tag size="small" effect="plain" v-if="question.kind == 'JUDGE'">判断</el-tag>
+                                <el-tag size="small" effect="plain" v-else-if="question.kind == 'SINGLE'" type="success">单选</el-tag>
+                                <el-tag size="small" effect="plain" v-else-if="question.kind == 'MULTI'" type="info">多选</el-tag>
 
                             </td>
 
 
-                            <th colspan="1" class="el-descriptions-item__cell el-descriptions-item__label is-bordered-label th-fix-width">用户答案</th>
+                            <th colspan="1" class="el-descriptions-item__cell el-descriptions-item__label is-bordered-label th-fix-width">用户选择</th>
                             <td colspan="1" class="el-descriptions-item__cell el-descriptions-item__content" v-if="question.kind == 'JUDGE' || question.kind == 'SINGLE' || question.kind == 'MULTI'" :class="['answer-right']">
                                 <div>{{getUserAnswer(index) || '未答'}}</div>
                             </td>

application/admin/view/servicequestion/edit.html

@@ -34,7 +34,7 @@
                     <ins>{:__('Value')}</ins>
                 </dd>
                 <dd><a href="javascript:;" class="btn btn-sm btn-success btn-append"><i class="fa fa-plus"></i> {:__('Append')}</a></dd>
-                <textarea name="row[options_json]" class="form-control hide" cols="30" rows="5">{$row.options_json|htmlentities}</textarea>
+                <textarea name="row[options_json]" class="form-control hide" cols="30" rows="5">{$row.options_jsonstr|htmlentities}</textarea>
             </dl>
 
 

application/admin/view/topicdongtai/index.html

@@ -1,5 +1,15 @@
 <div class="panel panel-default panel-intro">
-    {:build_heading()}
+
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="auditstatus">
+            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="auditstatusList" item="vo"}
+            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
+
 
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
@@ -25,6 +35,7 @@
                     <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-answer="{:$auth->check('topicdongtaianswer/index')}"
                            width="100%">
                     </table>
                 </div>

public/assets/js/backend/jiuyezixun.js

@@ -12,6 +12,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     multi_url: 'jiuyezixun/multi',
                     import_url: 'jiuyezixun/import',
                     table: 'jiuyezixun',
+                    dragsort_url: false,
                 }
             });
 
@@ -22,6 +23,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'weigh',
+                search: false,
                 columns: [
                     [
                         {checkbox: true},
@@ -29,7 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},
                         {field: 'title', title: __('Title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'content', title: __('Content')},
+                        // {field: 'content', title: __('Content')},
                         {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: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status},

public/assets/js/backend/servicegrade.js

@@ -35,7 +35,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'user_id', title: __('User_id')},
                         {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
 
-                        {field: 'paper_id', title: __('Paper_id')},
+                        // {field: 'paper_id', title: __('Paper_id')},
                         {field: 'paper.name', title: __('Paper.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
 
                         // {field: 'question_ids', title: __('Question_ids'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},

public/assets/js/backend/servicepaper.js

@@ -12,6 +12,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     multi_url: 'servicepaper/multi',
                     import_url: 'servicepaper/import',
                     table: 'service_paper',
+                    dragsort_url: false,
                 }
             });
 

public/assets/js/backend/servicequestion.js

@@ -12,6 +12,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     multi_url: 'servicequestion/multi',
                     import_url: 'servicequestion/import',
                     table: 'service_question',
+                    dragsort_url: false,
                 }
             });
 
@@ -27,7 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'paper_id', title: __('Paper_id')},
+                        // {field: 'paper_id', title: __('Paper_id')},
                         {field: 'paper.name', title: __('Paper.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
 
                         {field: 'kind', title: __('Kind'), searchList: {"SINGLE":__('Kind single'),"MULTI":__('Kind multi')}, formatter: Table.api.formatter.normal},

public/assets/js/backend/topicdongtai.js

@@ -17,22 +17,27 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             var table = $("#table");
 
+            table.on('post-body.bs.table', function (e, settings, json, xhr) {
+                $(".btn-answer").data("area", ["80%", "80%"]);
+            });
+
             // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
                 sortOrder: 'desc',
+                search: false,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
 
                         {field: 'user_id', title: __('User_id')},
-                        {field: 'user.username', title: __('User.username'), 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: {
+                            /*cellStyle:  {css: {
                                 "white-space": "break-spaces",
                                 "max-width": "200px",
                                 "min-width": "200px",
@@ -40,7 +45,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 "text-overflow": "inherit",
                                 "overflow": "visible",
                             }
-                            }
+                            },*/
+                            table: table, class: 'autocontent', formatter: Table.api.formatter.content
                         },
                         {field: 'images', title: __('Images'), operate: false,
                             cellStyle:  {css: {
@@ -73,7 +79,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             }
                         },
                         {field: 'operate', title: __('Operate'), table: table,
+                            buttons: [{
+                                name: 'answer',
+                                text: '查看评论',
+                                icon: 'fa fa-list',
+                                classname: 'btn btn-info btn-xs btn-answer btn-dialog',
+                                url: 'topicdongtaianswer/index/dt_id/{ids}?dialog=1',
 
+                            }],
                             events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
@@ -89,6 +102,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         edit: function () {
             Controller.api.bindevent();
         },
+        answer: function () {
+            Controller.api.bindevent();
+        },
         api: {
             bindevent: function () {
                 Form.api.bindevent($("form[role=form]"));

public/assets/js/backend/topicdongtaianswer.js

@@ -22,20 +22,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                search: false,
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'dt_id', title: __('Dt_id')},
-                        {field: 'floor', title: __('Floor')},
-//                        {field: 'user_id', title: __('User_id')},
+                        // {field: 'floor', title: __('Floor')},
+                       {field: 'user_id', title: __('User_id')},
+                        {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
+
                         {field: 'content', title: __('Content'), operate: 'LIKE'},
 //                        {field: 'to_user_id', title: __('To_user_id')},
-                        {field: 'goodnum', title: __('Goodnum')},
-                        {field: 'level', title: __('Level'), searchList: {"1":__('Level 1'),"2":__('Level 2')}, formatter: Table.api.formatter.normal},
+//                         {field: 'goodnum', title: __('Goodnum')},
+//                         {field: 'level', title: __('Level'), searchList: {"1":__('Level 1'),"2":__('Level 2')}, formatter: Table.api.formatter.normal},
                         {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: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]