diff --git a/app/article/view/index/view.html b/app/article/view/index/view.html index 3745fff..321a0e0 100644 --- a/app/article/view/index/view.html +++ b/app/article/view/index/view.html @@ -22,11 +22,13 @@ .text-detial-content li {list-style: initial;margin-left: 20px;} :not(pre)>code[class*=language-], pre[class*=language-]{background:#fff!important;border:1px solid #e8e8e8!important; border-radius:3px;} -.comment-box{border-top:1px solid #eee; background-color:#fff;width:100%; overflow:hidden} -.comment-name{font-size:16px; margin-bottom:8px;} -.comment-img{width:100px; height:100px; padding:3px; background-color:#fff;} -.comment-img img{border-radius:3px;} -.comment-tips{line-height:25px; color:#999;font-size:12px;} +.comment-input .comment-image{width:40px; height:40px; border-radius:50%} +.comment-item .comment-avatar{width:50px; float:left} +.comment-item .comment-image{width:36px; height:36px; border-radius:50%} +.comment-item .comment-body{margin-left:50px;} +.comment-item .comment-content blockquote{border-left:3px solid #f1f1f1; padding:4px 8px;} +.comment-item .comment-actions a{color:#8c95a8; cursor:pointer; font-size:12px;} +.comment-item .comment-actions a:hover{color:#3582fb;} {/block} @@ -54,22 +56,29 @@

相关评论

{volist name="$detail.comment" id="vo"} -
-
-

{$vo.name}

- {vo.name} -
-
-

发表于:{$vo.create_time}{$vo.update_time} {eq name="$vo.admin_id" value="$login_admin"} {/eq}

-
{$vo.content|raw}
+
+
+
+ {vo.name} +
+
+
+ {$vo.name}{$vo.create_time}{$vo.update_time} + {eq name="$vo.admin_id" value="$login_admin.id"} + + {/eq} +
+
{$vo.content}
+
- {/volist} + {/volist} +
- +
- +
@@ -80,23 +89,11 @@ {block name="script"} {/block} diff --git a/app/oa/view/work/index.html b/app/oa/view/work/index.html index 5657512..db41dbb 100644 --- a/app/oa/view/work/index.html +++ b/app/oa/view/work/index.html @@ -100,7 +100,7 @@ //日期范围 laydate.render({ elem: '#date', - range: ['#start_time', '#end_time']. + range: ['#start_time', '#end_time'], rangeLinked:true }); diff --git a/app/oa/view/work/read.html b/app/oa/view/work/read.html index e94dbff..3a5e6b7 100644 --- a/app/oa/view/work/read.html +++ b/app/oa/view/work/read.html @@ -1,7 +1,19 @@ {extend name="../../base/view/common/base" /} +{block name="style"} + +{/block} {block name="body"} -
-

汇报详情

+
+

汇报详情

@@ -55,12 +67,85 @@ {gt name="$detail.update_time" value="0"}
该汇报于 {$detail.update_time_str} 进行过编辑
{/gt} - +
+

工作点评

+ {empty name="$detail.comment"} +
暂无工作点评
+ {/empty} + {volist name="$detail.comment" id="vo"} +
+
+
+ {vo.name} +
+
+
+ {$vo.name}{$vo.create_time}{$vo.update_time} + {eq name="$vo.admin_id" value="$login_admin.id"} + + {/eq} +
+
{$vo.content}
+
+
+
+ {/volist} + {eq name="$detail.comment_auth" value="1"} +
+ + +
+ +
+ + {/eq} +
+ {/block} {block name="script"} {/block} \ No newline at end of file diff --git a/public/index.php b/public/index.php index 28c187d..f2a466e 100644 --- a/public/index.php +++ b/public/index.php @@ -18,7 +18,7 @@ require __DIR__ . '/../vendor/autoload.php'; define('CMS_VERSION','4.50.05'); // 定义Layui版本号 -define('LAYUI_VERSION','2.8.2'); +define('LAYUI_VERSION','2.8.3'); // 定义项目目录 define('CMS_ROOT', __DIR__ . '/../');
汇报人