edit

doc/apidoc.php

@@ -365,6 +365,7 @@
  * @apiSuccess {String}   comment.username 用户名
  * @apiSuccess {String}   comment.avatar 头像
  * @apiSuccess {String}   comment.content 内容
+ * @apiSuccess {String}   comment.num_up 点赞数
  * @apiSuccess {String}   comment.cdate 时间
  */
 

journal/assets/manage/html/journal.html

@@ -1,12 +1,14 @@
 <style>
 .layui-col-md2
 {
-    height: 450px;
+    max-height: 450px;
+    border:1px solid #bababa;
+    margin:5px;
 }
 </style>
 <div class="layui-fluid layadmin-cmdlist-fluid">
   <ul class="layui-row layui-col-space30" id="sortable">
-    <li class="layui-col-md2 layui-col-sm4" id="data">
+    <li class="layui-col-md2 layui-col-sm4" id="data" style="">
         <div class="cmdlist-container">
             <div href="javascript:;" style="height:auto;text-align: center;">
               <img src="../../layuiadmin/style/res/template/portrait.png">

journal/database/content.php

@@ -289,7 +289,7 @@ return array
         # 自定义快捷新增和编辑
         'button' => array
         (
-            '新增内页' => array('fasts'),
+            '新增内页' => array('location', 'add'),
             '预览' => array('fast', 'main/preview.get?type=4&id=' . Dever::input('search_option_info_id')),
         ),
     ),

journal/lib/Manage.php

@@ -123,6 +123,8 @@ class Manage
 
                 $data[$k]['edit'] = "fastEdit($(this), '".$link."', '编辑内页', '', 1)";
 
+                $data[$k]['editurl'] = $link;
+
                 $data[$k]['delete'] = $database->url('delete', $v['id']);
             }
         }

journal/template/manage/journal.php

@@ -35,7 +35,7 @@ $view
 
         '.info' => array
         (
-            'html' => '<{$v.name}>',
+            'html' => '<{Dever::cut($v.name, 20)}>',
         ),
 
         '.edit' => array

video/database/vod.php

@@ -42,7 +42,7 @@ $share = array
 	2 => '不显示',
 );
 
-$col = 'id,name,pic_cover,pdate,num_add_view+num_view as num_view,num_up+num_add_up as num_up,num_comment,share_yes,share_title,share_pic,share_content,function,content,cate_id';
+$col = 'id,name,pic_cover,pdate,num_add_view+num_view as num_view,num_up+num_add_up as num_up,num_comment,share_yes,share_title,share_pic,share_content,function,content,cate_id,video';
 
 return array
 (