后台按钮调整，新的dedebiz主题

src/admin/article_keywords_select.php

@@ -22,12 +22,12 @@ $dlist->SetSource($sql);
 $dlist->Display();
 function GetSta($sta)
 {
-    if ($sta == 1) return " <span class='btn btn-outline-success btn-sm'>正常</span>";
+    if ($sta == 1) return " <span class='btn btn-success btn-sm'>已启用</span>";
     else return " <span class='btn btn-outline-danger btn-sm'>禁用</span>";
 }
 function GetMan($sta)
 {
-    if ($sta == 1) return " <span class='btn btn-outline-danger btn-sm'>禁用</span>";
+    if ($sta == 1) return " <span class='btn btn-danger btn-sm'>已禁用</span>";
     else return " <span class='btn btn-outline-success btn-sm'>启用</span>";
 }
 ?>

src/admin/diy_list.php

@@ -194,7 +194,7 @@ elseif ($action == 'excel') {
         {
             echo "<td>".$arr[$key]."</td>";
         }
-    $status = $arr['ifcheck'] == 1 ? '<span class="btn btn-outline-success btn-sm">已审核</span>' : '<span class="btn btn-outline-danger btn-sm">未审核</span>';
+    $status = $arr['ifcheck'] == 1 ? '<span class="btn btn-success btn-sm">已审核</span>' : '<span class="btn btn-danger btn-sm">未审核</span>';
     echo "<td>".$status."</td>";
     echo "</tr>";
     }

src/admin/feedback_main.php

@@ -16,7 +16,7 @@ require_once(DEDEINC."/typelink/typelink.class.php");
 setcookie("ENV_GOBACK_URL", $dedeNowurl, time() + 3600, "/");
 function IsCheck($st)
 {
-    return $st == 1 ? '<span class="btn btn-outline-success btn-sm">已审核</span>' : '<span class="btn btn-outline-danger btn-sm">未审核</span>';
+    return $st == 1 ? '<span class="btn btn-success btn-sm">已审核</span>' : '<span class="btn btn-danger btn-sm">未审核</span>';
 }
 function jsTrimjajx($str, $len)
 {

src/admin/inc/inc_list_functions.php

@@ -46,7 +46,7 @@ function IsCommendArchives($iscommend)
     }
     $sn = trim($sn);
     if ($sn == '') return '';
-    else return " <span class='btn btn-outline-success btn-sm'>$sn</span>";
+    else return " <span class='btn btn-light btn-sm'>$sn</span>";
 }
 //获得推荐的标题
 function GetCommendTitle($title, $iscommend)
@@ -77,11 +77,11 @@ function CheckPic($picname)
 function IsHtmlArchives($ismake)
 {
     if ($ismake == 1) {
-        return ' <span class="btn btn-outline-warning btn-sm">已生成</span>';
+        return ' <span class="btn btn-warning btn-sm">已生成</span>';
     } else if ($ismake == -1) {
-        return ' <span class="btn btn-outline-warning btn-sm">仅动态</span>';
+        return ' <span class="btn btn-warning btn-sm">仅动态</span>';
     } else {
-        return ' <span class="btn btn-outline-danger btn-sm">未生成</span>';
+        return ' <span class="btn btn-danger btn-sm">未生成</span>';
     }
 }
 //获得文档的限定级别名称
@@ -105,7 +105,7 @@ function GetRankName($arcrank)
 function IsPicArchives($picname)
 {
     if ($picname != '') {
-        return ' <span class="btn btn-outline-success btn-sm">图片</span>';
+        return ' <span class="btn btn-light btn-sm">图片</span>';
     } else {
         return '';
     }

src/admin/makehtml_homepage.php

@@ -81,13 +81,13 @@ if ($dopost == "view") {
         $GLOBALS['_arclistEnv'] = 'index';
         $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet);
         $pv->SaveToHtml($homeFile);
-        echo "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/web/css/bootstrap.min.css\"><style>.modal {position: static;}</style>";
-        echo "<div class=\"alert alert-success\">成功更新首页：".$position." <a href='{$position}' target='_blank' class='btn btn-success btn-sm'>浏览</a></div>";
+        echo "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/web/css/bootstrap.min.css\"><link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/web/css/admin.css\">";
+        echo "<div class=\"alert alert-success my-3\">更新首页模式：".$position." <a href='{$position}' target='_blank' class='btn btn-success btn-sm'>浏览</a></div>";
     } else {
         //动态浏览
         if (file_exists($homeFile)) @unlink($homeFile);
-        echo "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/web/css/bootstrap.min.css\"><style>.modal {position: static;}</style>";
-        echo "<div class=\"alert alert-success\">采用动态浏览：<a href='../index.php' target='_blank' class='btn btn-success btn-sm'>浏览</a></div>";
+        echo "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/web/css/bootstrap.min.css\"><link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/web/css/admin.css\">";
+        echo "<div class=\"alert alert-success my-3\">动态浏览模式：<a href='../index.php' target='_blank' class='btn btn-success btn-sm'>浏览</a></div>";
     }
     $iquery = "UPDATE `#@__homepageset` SET showmod='$showmod'";
     $dsql->ExecuteNoneQuery($iquery);

src/admin/makehtml_list_action.php

@@ -104,11 +104,11 @@ if ($nextpage >= $totalpage && $finishType) {
     $typename = isset($cfg_Cs[$tid][3])? base64_decode($cfg_Cs[$tid][3]) : "";
     if ($finishType) {
         $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$nextpage";
-        ShowMsg("更新栏目<span class='text-primary'>[".$tid."]{$typename}</span>，继续执行任务", $gourl, 0, 100);
+        ShowMsg("更新栏目id：<span class='text-primary'>".$tid."</span>，栏目名称：<span class='text-primary'>{$typename}</span>，继续执行任务", $gourl, 0, 100);
         exit();
     } else {
         $gourl = "makehtml_list_action.php?gotype={$gotype}&uppage=$uppage&mkpage=$mkpage&maxpagesize=$maxpagesize&typeid=$typeid&pageno=$pageno";
-        ShowMsg("更新栏目<span class='text-primary'>[".$tid."]{$typename}</span>，继续执行任务", $gourl, 0, 100);
+        ShowMsg("更新栏目id：<span class='text-primary'>".$tid."</span>，栏目名称：<span class='text-primary'>{$typename}</span>，继续执行任务", $gourl, 0, 100);
         exit();
     }
 }

src/admin/member_main.php

@@ -82,7 +82,7 @@ function GetMemberName($rank, $mt)
 function GetMAtt($m)
 {
     if ($m < 1) return '';
-    else if ($m == 10) return " <span class='btn btn-outline-success btn-sm'>管理</span>";
-    else return " <span class='btn btn-outline-success btn-sm'>推荐</span>";
+    else if ($m == 10) return " <span class='btn btn-success btn-sm'>管理</span>";
+    else return " <span class='btn btn-success btn-sm'>推荐</span>";
 }
 ?>

src/admin/mychannel_main.php

@@ -20,9 +20,9 @@ $dlist->display();
 function GetSta($sta, $id)
 {
     if ($sta == 1) {
-        return ($id != -1 ? "<span class='btn btn-outline-success btn-sm'>已启用</span><a href='mychannel_edit.php?dopost=hide&id=$id' class='btn btn-outline-danger btn-sm'>禁用</a>" : "<span class='btn btn-outline-success btn-sm'>固定项目</span>");
+        return ($id != -1 ? "<span class='btn btn-success btn-sm'>启用</span><a href='mychannel_edit.php?dopost=hide&id=$id' class='btn btn-outline-warning btn-sm'>隐藏</a>" : "<span class='btn btn-success btn-sm'>固定</span>");
     } else {
-        return "<span class='btn btn-outline-danger btn-sm'>已禁用</span><a href='mychannel_edit.php?dopost=show&id=$id' class='btn btn-outline-success btn-sm'>启用</a>";
+        return "<a href='mychannel_edit.php?dopost=show&id=$id' class='btn btn-outline-success btn-sm'>启用</a><span class='btn btn-warning btn-sm'>隐藏</span>";
     }
 }
 function IsSystem($s)

src/admin/plus_main.php

@@ -20,9 +20,9 @@ $dlist->display();
 function GetSta($sta, $id, $title)
 {
     if ($sta == 1) {
-        return "<span class='btn btn-outline-success btn-sm'>已启用</span><a href='plus_edit.php?dopost=hide&aid=$id' class='btn btn-outline-danger btn-sm'>禁用</a><a href='plus_edit.php?dopost=edit&aid=$id' class='btn btn-outline-warning btn-sm'>修改</a><a href='plus_edit.php?dopost=delete&aid=$id&title=".urlencode($title)."' class='btn btn-outline-danger btn-sm'>删除</a>";
+        return "<span class='btn btn-success btn-sm'>启用</span><a href='plus_edit.php?dopost=hide&aid=$id' class='btn btn-outline-warning btn-sm'>隐藏</a><a href='plus_edit.php?dopost=edit&aid=$id' class='btn btn-light btn-sm'>修改</a><a href='plus_edit.php?dopost=delete&aid=$id&title=".urlencode($title)."' class='btn btn-danger btn-sm'>删除</a>";
     } else {
-        return "<span class='btn btn-outline-danger btn-sm'>已禁用</span><a href='plus_edit.php?dopost=show&aid=$id' class='btn btn-outline-success btn-sm'>启用</a><a href='plus_edit.php?aid=$id' class='btn btn-outline-success btn-sm' class='btn btn-outline-warning btn-sm'>修改</a><a href='plus_edit.php?dopost=delete&aid=$id&title=".urlencode($title)."' class='btn btn-outline-danger btn-sm'>册除</a>";
+        return "<a href='plus_edit.php?dopost=show&aid=$id' class='btn btn-outline-success btn-sm'>启用</a><span class='btn btn-warning btn-sm'>隐藏</span><a href='plus_edit.php?aid=$id' class='btn btn-light btn-sm' class='btn btn-outline-warning btn-sm'>修改</a><a href='plus_edit.php?dopost=delete&aid=$id&title=".urlencode($title)."' class='btn btn-danger btn-sm'>册除</a>";
     }
 }
 ?>

src/admin/templets/diy_list.htm

@@ -33,7 +33,7 @@
 				<?php 
 				if (!empty($fields)) {
 					$allowhtml = array('htmltext');
-					$fields['sta'] = $fields['ifcheck'] == 1 ? '<span class="btn btn-outline-success btn-sm">已审核</span>':'<span class="btn btn-outline-danger btn-sm">未审核</span>';
+					$fields['sta'] = $fields['ifcheck'] == 1 ? '<span class="btn btn-success btn-sm">已审核</span>':'<span class="btn btn-danger btn-sm">未审核</span>';
 					echo '<tr bgcolor="#e9ecef"><td width="8%"><input type="checkbox" name="id[]" value="'.$fields['id'].'"></td><td width="8%"><a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'">'.$fields['id'].'</a></td><td align="right">'.$fields['sta'].'<a href="diy_list.php?action=edit&diyid='.$diy->diyid.'&id='.$fields['id'].'" class="btn btn-light btn-sm"><i class="fa fa-pencil-square"></i></a></td></tr>';
 					foreach($fieldlist as $field=>$fielddata)
 					{

src/admin/templets/tags_main.htm

@@ -50,7 +50,7 @@
 						<div class="col-sm-9"><textarea id="iptDes" name="des" class="form-control" placeholder="例如：DedeBIZ系统基于PHP7版本开发，具有很强的可扩展性，并且完全开放源代码。">${description}</textarea></div>
 					</div>
 					`, {
-						footer: `<button type="button" class="btn btn-outline-success btn-sm" onclick="UpdateKwDesDo(${tid}, '~modalID~')">设置</button>`,
+						footer: `<button type="button" class="btn btn-success btn-sm" onclick="UpdateKwDesDo(${tid}, '~modalID~')">设置</button>`,
 					});
 				})
 			}

src/static/web/css/style.css

@@ -5,25 +5,24 @@ body {
 	color:#545b62
 }
 a {
-	color:#545b62;
-	text-decoration:none
+	color:#545b62
 }
 a:hover {
-	color:#ec982c;
+	color:#ff8400;
 	text-decoration:none
 }
 img {
 	max-width:100%;
 	border-radius:.25rem
 }
-ul,ol {
+ul,ol,li {
 	margin:0;
 	padding:0;
 	list-style:none
 }
 h1,h2,h3,h4,h5,h6 {
 	margin:0;
-	line-height:1.6;
+	line-height:1.5;
 	font-weight:600;
 	color:#393d49
 }
@@ -56,169 +55,145 @@ input[type=file] {
 	background-repeat:no-repeat;
 	background-position:top center
 }
-.navbar-toggler {
-	font-size:16px
-}
-.spec .card {
-	background:#f5f5f5;
-	text-align:center
-}
-.spec .card img {
-	height:160px;
-	border-radius:.25rem .25rem 0 0
+.item-title h2 {
+	font-size:24px
 }
-.spec .card-body {
-	padding:.65rem
+.item-article h2,.item-vote h2,.item-tag h2,.list-info-search h2 {
+	font-size:18px
 }
-.spec .card-title {
-	margin-bottom:0;
-	font-size:14px;
-	font-weight:400;
+.item-article li {
+	margin-bottom:10px;
 	overflow:hidden;
 	text-overflow:ellipsis;
 	white-space:nowrap
 }
-.spec .border-bottom-dashed {
-	border-bottom:dashed 1px #929292
-}
-.spec > li .title h4 {
-	display:inline
-}
-.spec > li .title a {
-	color:#212529
+.item-article li:last-child {
+	margin-bottom:0
 }
-.spec > li > a > img,.article-spec > a > img {
-	width:120px
+.item-theme {
+	margin-bottom:2rem;
+	transition:all .3s
 }
-.spec > li .title .label {
-	padding:0 10px;
-	color:#1eb867;
-	background:#b7e9b4;
-	border-radius:.25rem
+.item-theme-box {
+	padding:1.5rem
 }
-.ddcard,.ddcard-normal {
-	border:none
+.item-theme-img img {
+	width:100%;
+	height:250px;
+	border-radius:.2rem .2rem 0 0
 }
-.ddcard > .card-header {
-	padding:0;
-	background:#fff;
-	border-bottom:solid 3px #1eb867
+.item-theme p,.item-news p {
+	margin-bottom:0;
+	color:#999;
+	overflow:hidden;
+	text-overflow:ellipsis;
+	display:-webkit-box;
+	-webkit-line-clamp:2;
+	-webkit-box-orient:vertical
 }
-.ddcard-normal > .card-header {
-	padding:10px;
-	background:#fff;
-	border-bottom:0
+.item-news {
+	margin-bottom:2rem;
+	padding:1.5rem;
+	transition:all .3s
 }
-.ddcard > .card-header .more a,.ddcard-normal > .card-header .more a {
-	font-size:14px;
-	color:#1eb867
+.item-theme:hover,.item-news:hover {
+	box-shadow:0 14px 30px -16px rgba(0,36,100,.25);
+	transform:translateY(-6px)
 }
-.ddcard > ul > li,.ddcard > ol > li,.ddcard-normal > ul > li,.ddcard-normal > ol > li {
-	padding-bottom:10px;
-	color:#c0c0c0;
+.item-news h4 {
+	margin:20px 0 16px;
 	overflow:hidden;
 	text-overflow:ellipsis;
 	white-space:nowrap
 }
-.ddcard > ul > li:nth-child(1),.ddcard > ol > li:nth-child(1) {
-	margin-top:10px
+.item-news-img img {
+	width:100%;
+	height:200px
 }
-.ddcard > ul > li:last-child,.ddcard > ol > li:last-child,.ddcard-normal > ul > li:last-child,.ddcard-normal > ol > li:last-child {
-	padding-bottom:0
+.item-news i,.item-news span {
+	color:#999
 }
-.ddcard > .card-header .caption span {
-	display:inline-block;
-	padding:6px 12px;
-	font-size:18px;
-	font-weight:600;
-	color:#fff;
-	background:#1eb867;
+.list-article-img img {
+	width:100%;
+	height:260px;
 	border-radius:.2rem .2rem 0 0
 }
-.ddcard-normal {
-	padding:0;
-	box-shadow:0 .125rem .25rem rgba(0,0,0,.075)
+.list-article-body {
+	border-radius:0 0 .2rem .2rem
 }
-.ddcard-normal ul {
-	padding:10px
+.list-article-body h2 {
+	font-size:18px;
+	overflow:hidden;
+	text-overflow:ellipsis;
+	white-space:nowrap
 }
-.breadcrumb {
-	margin-bottom:0
+.list-article-body h2 a {
+	color:#393d49
 }
-.spec > li .description,.spec > li .description a {
-	line-height:30px;
-	font-size:16px;
-	color:#868686;
-	display:-webkit-box;
-	-webkit-line-clamp:3;
-	-webkit-box-orient:vertical;
-	overflow:hidden
+.list-article-body p {
+	margin-bottom:0
 }
-.items > li .type {
-	position:relative;
-	padding:0 5px;
+.list-info-select a {
+	display:inline-block;
 	margin-right:10px;
-	top:-3px;
-	height:18px;
-	line-height:18px;
-	font-size:14px;
-	color:#fff;
-	background:#1eb867
+	color:#1eb867
+}
+.item-vote .table {
+	margin-bottom:0
+}
+.article-theme-title h1 {
+	margin-bottom:1rem;
+	font-size:24px
 }
-.items > li .pane {
+.article-theme-img {
+	width:100%
+}
+.article-theme-info .item {
 	display:inline-block;
-	margin-right:10px;
-	margin-bottom:10px;
-	width:10px;
-	height:10px;
-	background:#1eb867;
-	vertical-align:middle
+	width:100px
 }
-.items > li .caption {
-	line-height:30px
+.article-theme-info .price {
+	font-size:18px;
+	font-weight:600
 }
-.items > li .title,.items > li .caption a {
-	display:inline
+.article-theme-body p:last-child,.article-hot:last-child {
+	margin-bottom:0
 }
-.items > li .source span,.items > li .source a {
-	color:#c0c0c0
+.article-theme-body h2,.article-right h2 {
+	margin-bottom:1rem;
+	font-size:18px
 }
-.items > li .description,.items > li .description a,.items > li .addinfo {
-	display:-webkit-box;
-	-webkit-line-clamp:3;
-	-webkit-box-orient:vertical;
-	overflow:hidden;
-	line-height:30px;
-	word-break:break-all
+.article-hot {
+	margin-bottom:1.5rem
 }
-.items .border-bottom-dashed {
-	border-bottom:dashed 1px #929292
+.article-hot-img img {
+	width:100%;
+	border-radius:.2rem .2rem 0 0
 }
-.items img {
-	max-width:100px
+.article-hot-box {
+	padding:1rem 1.5rem;
+	background:#fff
 }
-.items > li .label {
-	margin-left:10px;
-	padding:0 5px;
-	color:#fff840;
+.article-hot-box h4 {
 	font-size:14px;
-	height:30px;
-	line-height:30px;
-	background:#fff840;
-	border:1px solid #fff840;
-	border-radius:.25rem;
-	text-decoration-line:none
+	font-weight:400;
+	overflow:hidden;
+	text-overflow:ellipsis;
+	white-space:nowrap
 }
-.items > li .label:hover {
-	color:#fff
+.article-hot-box i,.article-hot-box span {
+	color:#999
 }
 .article-main h1,.article-main h2,.article-main h3,.article-main h4,.article-main h5,.article-main h6 {
 	margin-bottom:1rem;
-	font-size:24px
+	font-size:18px
 }
 .article-meta span {
 	margin-right:1rem
 }
+.article-meta span,.item-theme-box i,.item-theme-box span,.list-article-body i,.list-article-body span {
+	color:#999
+}
 .digg .comment-container {
 	width:200px;
 	padding:10px 20px;
@@ -276,12 +251,31 @@ input[type=file] {
 	float:left;
 	margin-left:10px
 }
-.copyright {
-	padding:1.5rem;
-	background:#343a40
+.feedbacks .face {
+	width:40px;
+	height:40px;
+	border-radius:50%;
+	border:solid 1px #ccc
 }
-.flink,.flink a,.copyright,.copyright a {
-	color:#fff
+.feedbacks .media {
+	border-bottom:solid 1px #ccc;
+	padding-top:10px
+}
+.feedbacks .feedback_replies .media {
+	border-top:solid 1px #ccc;
+	border-bottom:0
+}
+.feedbacks .media-body {
+	padding:0 1rem 1rem 1rem
+}
+.feedbacks .media-body small {
+	color:#999
+}
+.feedbacks .feedback-action {
+	float:right
+}
+.feedbacks ._feedback_reply .alert {
+	margin-bottom:0
 }
 .nav-link {
 	padding:0 10px;
@@ -309,25 +303,41 @@ input[type=file] {
 	line-height:40px;
 	text-align:right
 }
-.user-admin-img {
-	max-width:60px;
-	min-height:60px;
-	border-radius:50%;
-	border:1px solid #eee
+.copyright {
+	padding:1.5rem;
+	background:#343a40
 }
-.user-admin-img-xs {
-	margin-right:10px;
-	width:30px;
-	height:30px;
+.flink,.flink a,.copyright,.copyright a {
+	color:#fff
+}
+.l-height-30 {
+	line-height:30px
+}
+.biz-mb {
+	margin-bottom:-2rem
+}
+.bannr-img {
+	width:100%;
+	height:375px
+}
+.user-img-md {
+	width:70px;
+	height:70px;
 	border-radius:50%;
 	border:1px solid #eee
 }
-.user-edit-img {
+.user-img-sm {
 	width:36px;
 	height:36px;
 	border-radius:50%;
 	border:1px solid #eee
 }
+.user-img-xs {
+	width:30px;
+	height:30px;
+	border-radius:50%;
+	border:1px solid #eee
+}
 .user-meter i {
 	font-size:24px!important;
 	color:#1eb867
@@ -338,16 +348,6 @@ input[type=file] {
 .list-group-flush>.list-group-item {
 	cursor:pointer
 }
-.dropdown {
-	display:inline-block;
-	margin-left:.25rem;
-	content:"";
-	border-top:.3rem solid;
-	border-right:.3rem solid transparent;
-	border-bottom:0;
-	border-left:.3rem solid transparent;
-	vertical-align:.25rem
-}
 .pannel-main-container {
 	padding:1.5rem;
 	background:#fff
@@ -355,6 +355,10 @@ input[type=file] {
 .table {
 	color:#545b62
 }
+.table td,.table th {
+	padding:.65rem;
+	vertical-align:middle
+}
 .form-control {
 	display:inline-block;
 	height:36px
@@ -413,10 +417,16 @@ input[type=file] {
 .m-pb-2 {
 	padding-bottom:2rem
 }
-.spec .card img {
-	height:130px
-}
 .login-from,.login-box {
 	width:100%
 }
+.bannr-img,.item-theme-img img,.list-article-img img {
+	height:250px
+}
+.item-news-img img {
+	height:210px
+}
+.feedbacks .feedback-action {
+	float:none
+}
 }

src/static/web/js/style.js

@@ -1,215 +1,202 @@
 //滚动到页面顶部
 function gotop() {
-    $('html, body').animate({ scrollTop: 0 }, 'slow');
+	$('html, body').animate({ scrollTop: 0 }, 'slow');
 }
 //读写cookie函数
 function GetCookie(c_name) {
-    if (document.cookie.length > 0) {
-        c_start = document.cookie.indexOf(c_name + "=")
-        if (c_start != -1) {
-            c_start = c_start + c_name.length + 1;
-            c_end = document.cookie.indexOf(";", c_start);
-            if (c_end == -1) {
-                c_end = document.cookie.length;
-            }
-            return unescape(document.cookie.substring(c_start, c_end));
-        }
-    }
-    return null
+	if (document.cookie.length > 0) {
+		c_start = document.cookie.indexOf(c_name + "=")
+		if (c_start != -1) {
+			c_start = c_start + c_name.length + 1;
+			c_end = document.cookie.indexOf(";", c_start);
+			if (c_end == -1) {
+				c_end = document.cookie.length;
+			}
+			return unescape(document.cookie.substring(c_start, c_end));
+		}
+	}
+	return null
 }
 function SetCookie(c_name, value, expiredays) {
-    var exdate = new Date();
-    exdate.setDate(exdate.getDate() + expiredays);
-    document.cookie = c_name + "=" + escape(value) + ((expiredays == null) ? "" : ";expires=" + exdate.toGMTString()); //使设置的有效时间正确。添加toGMTString()
+	var exdate = new Date();
+	exdate.setDate(exdate.getDate() + expiredays);
+	document.cookie = c_name + "=" + escape(value) + ((expiredays == null) ? "" : ";expires=" + exdate.toGMTString()); //使设置的有效时间正确。添加toGMTString()
 }
 //全局消息提示框，生成一个随机id
 function guid() {
-    function S4() {
-        return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
-    }
-    return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
+	function S4() {
+		return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+	}
+	return (S4() + S4() + "-" + S4() + "-" + S4() + "-" + S4() + "-" + S4() + S4() + S4());
 }
-
 var _DedeConfirmFuncs = {};
 var _DedeConfirmFuncsClose = {};
 function __DedeConfirmRun(modalID) {
-    _DedeConfirmFuncs[modalID]();
+	_DedeConfirmFuncs[modalID]();
 }
 function __DedeConfirmRunClose(modalID) {
-    _DedeConfirmFuncsClose[modalID]();
+	_DedeConfirmFuncsClose[modalID]();
 }
 function DedeConfirm(content="",title="确认提示") {
-    let modalID = guid();
-    return new Promise((resolve, reject) => {
-        _DedeConfirmFuncs[modalID] = ()=>{
-            resolve("success");
-            CloseModal(`DedeModal${modalID}`);
-        }
-        _DedeConfirmFuncsClose[modalID] = ()=>{
-            reject("cancel");
-            CloseModal(`DedeModal${modalID}`);
-        }
-
-        let footer = `<button type="button" class="btn btn-outline-success btn-sm" onClick="__DedeConfirmRunClose(\'${modalID}\')">取消</button> <button type="button" class="btn btn-success btn-sm" onClick="__DedeConfirmRun(\'${modalID}\')">确定</button>`;
-        let modal = `<div id="DedeModal${modalID}" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="DedeModalLabel${modalID}">
-    <div class="modal-dialog modal-dialog-centered" role="document">
-    <div class="modal-content"><div class="modal-header">
-    <h6 class="modal-title" id="DedeModalLabel${modalID}">${title}</h6>`;
-        modal += `<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-    <span>&times;</span>
-    </button>`;
-        modal += `</div><div class="modal-body">${content}</div><div class="modal-footer">${footer}</div></div></div></div>`;
-        $("body").append(modal)
-        $("#DedeModal" + modalID).modal({
-            backdrop: 'static',
-            show: true
-        });
-        $("#DedeModal" + modalID).on('hidden.bs.modal', function (e) {
-            $("#DedeModal" + modalID).remove();
-        })
-    })
+	let modalID = guid();
+	return new Promise((resolve, reject) => {
+		_DedeConfirmFuncs[modalID] = ()=>{
+			resolve("success");
+			CloseModal(`DedeModal${modalID}`);
+		}
+		_DedeConfirmFuncsClose[modalID] = ()=>{
+			reject("cancel");
+			CloseModal(`DedeModal${modalID}`);
+		}
+		let footer = `<button type="button" class="btn btn-success btn-sm" onClick="__DedeConfirmRun(\'${modalID}\')">确定</button> <button type="button" class="btn btn-outline-success btn-sm" onClick="__DedeConfirmRunClose(\'${modalID}\')">取消</button>`;
+		let modal = `<div id="DedeModal${modalID}" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="DedeModalLabel${modalID}">
+<div class="modal-dialog modal-dialog-centered" role="document">
+<div class="modal-content"><div class="modal-header">
+<h6 class="modal-title" id="DedeModalLabel${modalID}">${title}</h6>`;modal +=`<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span>&times;</span></button>`;
+		modal += `</div><div class="modal-body">${content}</div><div class="modal-footer">${footer}</div></div></div></div>`;
+		$("body").append(modal)
+		$("#DedeModal" + modalID).modal({
+			backdrop: 'static',
+			show: true
+		});
+		$("#DedeModal" + modalID).on('hidden.bs.modal', function (e) {
+			$("#DedeModal" + modalID).remove();
+		})
+	})
 }
 //函数会返回一个modalID，通过这个id可自已定义一些方法，这里用到了一个展开语法：https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/Spread_syntax
 function ShowMsg(content, ...args) {
-    title = "系统提示";
-    if (typeof content == "undefined") content = "";
-    modalID = guid();
-    var footer = `<button type="button" class="btn btn-outline-success btn-sm" onClick="CloseModal(\'DedeModal${modalID}\')">确定</button>`;
-    var noClose = false;
-    if (args.length == 1) {
-        //存在args参数
-        if (typeof args[0].title !== 'undefined' && args[0].title != "") {
-            title = args[0].title;
-        }
-        if (typeof args[0].footer !== 'undefined' && args[0].footer != "") {
-            footer = args[0].footer;
-        }
-        if (typeof args[0].noClose !== 'undefined' && args[0].noClose == true) {
-            noClose = true;
-        }
-    }
-    String.prototype.replaceAll = function (s1, s2) {
-        return this.replace(new RegExp(s1, "gm"), s2);
-    }
-    footer = footer.replaceAll("~modalID~", modalID);
-    content = content.replaceAll("~modalID~", modalID);
-    var modal = `<div id="DedeModal${modalID}" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="DedeModalLabel${modalID}">
+	title = "系统提示";
+	if (typeof content == "undefined") content = "";
+	modalID = guid();
+	var footer = `<button type="button" class="btn btn-success btn-sm" onClick="CloseModal(\'DedeModal${modalID}\')">确定</button>`;
+	var noClose = false;
+	if (args.length == 1) {
+		//存在args参数
+		if (typeof args[0].title !== 'undefined' && args[0].title != "") {
+			title = args[0].title;
+		}
+		if (typeof args[0].footer !== 'undefined' && args[0].footer != "") {
+			footer = args[0].footer;
+		}
+		if (typeof args[0].noClose !== 'undefined' && args[0].noClose == true) {
+			noClose = true;
+		}
+	}
+	String.prototype.replaceAll = function (s1, s2) {
+		return this.replace(new RegExp(s1, "gm"), s2);
+	}
+	footer = footer.replaceAll("~modalID~", modalID);
+	content = content.replaceAll("~modalID~", modalID);
+	var modal = `<div id="DedeModal${modalID}" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="DedeModalLabel${modalID}">
 <div class="modal-dialog modal-dialog-centered" role="document">
 <div class="modal-content"><div class="modal-header">
 <h6 class="modal-title" id="DedeModalLabel${modalID}">${title}</h6>`;
-    if (!noClose) {
-        modal += `<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-		<span>&times;</span>
-		</button>`;
-    }
-    modal += `</div><div class="modal-body">${content}</div><div class="modal-footer">${footer}</div></div></div></div>`;
-    $("body").append(modal)
-    $("#DedeModal" + modalID).modal({
-        backdrop: 'static',
-        show: true
-    });
-    $("#DedeModal" + modalID).on('hidden.bs.modal', function (e) {
-        $("#DedeModal" + modalID).remove();
-    })
-    return modalID;
+	if (!noClose) {
+		modal += `<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span>&times;</span></button>`;
+	}
+	modal += `</div><div class="modal-body">${content}</div><div class="modal-footer">${footer}</div></div></div></div>`;
+	$("body").append(modal)
+	$("#DedeModal" + modalID).modal({
+		backdrop: 'static',
+		show: true
+	});
+	$("#DedeModal" + modalID).on('hidden.bs.modal', function (e) {
+		$("#DedeModal" + modalID).remove();
+	})
+	return modalID;
 }
 //隐藏并销毁modal
 function CloseModal(modalID) {
-    $("#" + modalID).modal('hide');
-    $("#" + modalID).on('hidden.bs.modal', function (e) {
-        if ($("#" + modalID).length > 0) {
-            $("#" + modalID).remove();
-        }
-    })
+	$("#" + modalID).modal('hide');
+	$("#" + modalID).on('hidden.bs.modal', function (e) {
+		if ($("#" + modalID).length > 0) {
+			$("#" + modalID).remove();
+		}
+	})
 }
 //在某个元素内显示alert信息
 function ShowAlert(ele, content, type, showtime = 3000) {
-    let msg = `<div class="alert alert-${type}" role="alert">
-        ${content}
-    </div>`;
-    $(ele).html(msg);
-    $(ele).show();
-    setTimeout(() => {
-        $(ele).html("");
-    }, showtime);
+	let msg = `<div class="alert alert-${type}" role="alert">
+		${content}
+	</div>`;
+	$(ele).html(msg);
+	$(ele).show();
+	setTimeout(() => {
+		$(ele).html("");
+	}, showtime);
 }
 //提交纠错信息
 function ErrAddSaveDo(modalID) {
-    let aid = $("#iptID").val();
-    let title = $("#iptTitle").val();
-    let type = $("#selType").val();
-    let err = $("#iptErr").val();
-    let erradd = $("#iptErradd").val();
-    let parms = {
-        format: "json",
-        dopost: "saveedit",
-        aid: aid,
-        title: title,
-        type: type,
-        err: err,
-        erradd: erradd,
-    };
-    $("#btnSubmit").attr("disabled", "disabled");
-    if (typeof PHPURL === "undefined") {
-        const PHPURL = "/plus";
-    }
-    $.post(PHPURL + "/erraddsave.php", parms, function (data) {
-        let result = JSON.parse(data);
-        if (result.code === 200) {
-            CloseModal(modalID);
-        } else {
-            ShowAlert("#error-add-alert", `提交失败：${result.msg}`, "danger");
-        }
-        $("#btnSubmit").removeAttr("disabled");
-    });
+	let aid = $("#iptID").val();
+	let title = $("#iptTitle").val();
+	let type = $("#selType").val();
+	let err = $("#iptErr").val();
+	let erradd = $("#iptErradd").val();
+	let parms = {
+		format: "json",
+		dopost: "saveedit",
+		aid: aid,
+		title: title,
+		type: type,
+		err: err,
+		erradd: erradd,
+	};
+	$("#btnSubmit").attr("disabled", "disabled");
+	if (typeof PHPURL === "undefined") {
+		const PHPURL = "/plus";
+	}
+	$.post(PHPURL + "/erraddsave.php", parms, function (data) {
+		let result = JSON.parse(data);
+		if (result.code === 200) {
+			CloseModal(modalID);
+		} else {
+			ShowAlert("#error-add-alert", `提交失败：${result.msg}`, "danger");
+		}
+		$("#btnSubmit").removeAttr("disabled");
+	});
 }
 //错误提示
 function ErrorAddSave(id, title) {
-    let content = `
-    <input type="hidden" value="${id}" class="form-control" id="iptID">
-    <div class="form-group">
-	<div id="error-add-alert">
-	</div>
-    <label for="iptTitle" class="col-form-label">标题：</label>
-    <input type="text" disabled=true value="${title}" class="form-control" id="iptTitle">
-    </div>
-    <div class="form-group">
-    <label for="message-text" class="col-form-label">错误类型：</label>
-    <select id="selType" class="form-control">
-            <option value="1">错别字(除的、地、得)</option>
-            <option value="2">成语运用不当</option>
-            <option value="3">专业术语写法不规则</option>
-            <option value="4">产品与图片不符</option>
-            <option value="5">事实年代以及文档错误</option>
-            <option value="6">技术参数错误</option>
-            <option value="7">其他</option>
-    </select>
-    </div>
-    <div class="form-group">
-    <label for="message-text" class="col-form-label">错误文档：</label>
-    <textarea name="iptErr" class="form-control" id="iptErr"></textarea>
-    </div>
-    <div class="form-group">
-    <label for="message-text" class="col-form-label">修正建议：</label>
-    <textarea name="optErradd" class="form-control" id="iptErradd"></textarea>
-    </div>
-        `;
-    let footer = `
-        <button type="button" id="btnSubmit" class="btn btn-success btn-sm" onClick="ErrAddSaveDo('DedeModal~modalID~')">提交</button>
-        <button type="button" class="btn btn-outline-success btn-sm" onClick="CloseModal('DedeModal~modalID~')">确定</button>
-        `;
-    ShowMsg(content, {
-        'footer': footer,
-    });
+	let content = `<input type="hidden" value="${id}" class="form-control" id="iptID">
+<div class="form-group">
+	<div id="error-add-alert"></div>
+	<label for="iptTitle" class="col-form-label">标题：</label>
+	<input type="text" disabled=true value="${title}" class="form-control" id="iptTitle">
+</div>
+<div class="form-group">
+	<label for="message-text" class="col-form-label">错误类型：</label>
+	<select id="selType" class="form-control">
+		<option value="1">错别字(除的、地、得)</option>
+		<option value="2">成语运用不当</option>
+		<option value="3">专业术语写法不规则</option>
+		<option value="4">产品与图片不符</option>
+		<option value="5">事实年代以及文档错误</option>
+		<option value="6">技术参数错误</option>
+		<option value="7">其他</option>
+	</select>
+</div>
+<div class="form-group">
+	<label for="message-text" class="col-form-label">错误文档：</label>
+	<textarea name="iptErr" class="form-control" id="iptErr"></textarea>
+</div>
+<div class="form-group">
+	<label for="message-text" class="col-form-label">修正建议：</label>
+	<textarea name="optErradd" class="form-control" id="iptErradd"></textarea>
+</div>`;
+	let footer = `<button type="button" id="btnSubmit" class="btn btn-success btn-sm" onClick="ErrAddSaveDo('DedeModal~modalID~')">提交</button> <button type="button" class="btn btn-outline-success btn-sm" onClick="CloseModal('DedeModal~modalID~')">确定</button>`;
+	ShowMsg(content, {
+		'footer': footer,
+	});
 }
 //页面加载触发
 $(document).ready(function () {
-    window.onscroll = function () { scrollFunction() };
-    function scrollFunction() {
-        if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {
-            $("#btnScrollTop").show();
-        } else {
-            $("#btnScrollTop").hide();
-        }
-    }
+	window.onscroll = function () { scrollFunction() };
+	function scrollFunction() {
+		if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {
+			$("#btnScrollTop").show();
+		} else {
+			$("#btnScrollTop").hide();
+		}
+	}
 });

src/system/archive/searchview.class.php

@@ -301,8 +301,8 @@ class SearchView
                 continue;
             }
             //这里不区分大小写进行关键词替换
-            $fstr = str_ireplace($k, "<span class='text-primary'>$k</span>", $fstr);
-            //速度更快，效率更高$fstr = str_replace($k, "<span class='text-primary'>$k</span>", $fstr);
+            $fstr = str_ireplace($k, "<span class='text-danger'>$k</span>", $fstr);
+            //速度更快，效率更高$fstr = str_replace($k, "<span class='text-danger'>$k</span>", $fstr);
         }
         return $fstr;
     }

src/system/common.inc.php

@@ -7,7 +7,7 @@
  * @link           https://www.dedebiz.com
  */
 //系统默认运行模式为安全模式，模板管理、标签管理、数据库管理、模块管理等功能已暂停，如果您需要这些功能，DEDEBIZ_SAFE_MODE后面值`TRUE`改为`FALSE`恢复使用
-define('DEDEBIZ_SAFE_MODE', TRUE);
+define('DEDEBIZ_SAFE_MODE', FALSE);
 //生产环境使用`production`，如果采用`dev`模式，会有一些php的报错信息提示，用于开发调试
 if (!defined('DEDE_ENVIRONMENT')) {
     define('DEDE_ENVIRONMENT', 'production');

src/system/typelink/typeunit.class.admin.php

@@ -154,9 +154,8 @@ class TypeUnit
             }
             echo "</td></tr></table>";
             $i++;
-        }
-        if ($i === 0) {
-            echo "<div class='text-center py-3'>暂无栏目，请先添加栏目</div>";
+        } if ($i === 0) {
+            echo "<div class='text-center py-3'>暂无栏目，请添加栏目</div>";
         }
     }
     /**

src/theme/dedebiz/article_article.htm

@@ -16,70 +16,71 @@
 		<script src="{dede:global.cfg_cmsurl/}/static/ckeditor/plugins/codesnippet/lib/highlight/highlight.pack.js"></script>
 		<script>hljs.initHighlightingOnLoad();</script>
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-9 article-main">
-					<h2>{dede:field.title/}</h2>
-					<div class="article-meta">
-						<span>时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
-						<span>来源：{dede:field.source/}</span>
-						<span>作者：{dede:field.writer/}</span>
-						<span>浏览：<script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
-					</div>
-					<div class="py-3">{dede:field.body/}</div>
-					<div class="py-3">作者：{dede:adminname/}</div>
-					<nav class="py-3">
-						<ul class="pagination justify-content-center">{dede:pagebreak/}</ul>
-					</nav>
-					<div class="clearfix"></div>
-					<div class="row">
-						<div class="col-md-4 prenext">
-							<div class="pagination-previous mb-3">{dede:prenext get='pre'/}</div>
-							<div class="pagination-next">{dede:prenext get='next'/}</div>
+				<div class="col-md-9">
+					<div class="article-main bg-white shadow-sm rounded p-3">
+						<h2>{dede:field.title/}</h2>
+						<div class="article-meta">
+							<span><img src="{dede:field.mid function='face(@me)'/}" class="user-img-xs mr-1">{dede:field.mid function="GetMemberInfos('uname',@me)"/}</span>
+							<span><i class="fa fa-calendar mr-1"></i>{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
+							<span><i class="fa fa-globe mr-1"></i>{dede:field.source/}</span>
+							<span><i class="fa fa-eye mr-1"></i><script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
 						</div>
-						<div class="col-md-8">
-							<div class="row actbox">
-								<ul>
-									<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
-									<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
-									<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-									<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
-								</ul>
+						<div class="py-3">{dede:field.body/}</div>
+						<div class="py-3">作者：{dede:adminname/}</div>
+						<nav class="py-3">
+							<ul class="pagination justify-content-center">{dede:pagebreak/}</ul>
+						</nav>
+						<div class="py-3 row">
+							<div class="col-md-4 prenext">
+								<div class="pagination-previous mb-3">{dede:prenext get='pre'/}</div>
+								<div class="pagination-next">{dede:prenext get='next'/}</div>
+							</div>
+							<div class="col-md-8">
+								<div class="row actbox">
+									<ul>
+										<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
+										<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
+										<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
+										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
+									</ul>
+								</div>
 							</div>
 						</div>
+						{dede:include comment='文档顶踩模块' filename='widget_article_likes.htm'/}
+						{dede:include comment='文档评论模块' filename='widget_article_feedback.htm'/}
 					</div>
-					{dede:include comment='文档顶踩模块' filename='widget_article_digg.htm'/}
-					{dede:include comment='文档评论模块' file='widget_article_feedback.htm'/}
 				</div>
 				<div class="col-md-3">
 					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/article_default.htm

@@ -15,84 +15,84 @@
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 	</head>
 	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-9 article-main">
-					<h2>{dede:field.title/}</h2>
-					<div class="article-meta">
-						<span>时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
-						<span>来源：{dede:field.source/}</span>
-						<span>作者：{dede:field.writer/}</span>
-						<span>浏览：<script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
-					</div>
-					<div class="py-3">{dede:field.body/}</div>
-					<div class="py-3">作者：{dede:adminname/}</div>
-					<nav class="py-3">
-						<ul class="pagination justify-content-center">{dede:pagebreak/}</ul>
-					</nav>
-					<div class="alert alert-warning">您会看到这个提示，那是因为您的系统无法识别某栏目的模型信息，或者您新建模型后，没为这个模型设计单独的模板不同模型的文档浏览页的模板为：article_模型名字标识.htm如“article_article.htm”，更多的信息您可以在栏目模型管理的地方查看</div>
-					{dede:fieldlist}
-					<table width="100%" cellpadding="1" cellspacing="1" class="table">
-						<tr>
-							<td width="70%" align="center">
-								[field:name/]文档：<br>
-								模板调用标记：<br>
-								<script>
-									document.write("{" + "dede:field.[field:tagname/] /" + "}");
-								</script>
-							</td>
-							<td width="70%">[field:value/]</td>
-						</tr>
-					</table>
-					{/dede:fieldlist}
-					<div class="clearfix"></div>
-					<div class="row">
-						<div class="col-md-4 prenext">
-							<div class="pagination-previous mb-3">{dede:prenext get='pre'/}</div>
-							<div class="pagination-next">{dede:prenext get='next'/}</div>
+				<div class="col-md-9">
+					<div class="article-main bg-white shadow-sm rounded p-3">
+						<h2>{dede:field.title/}</h2>
+						<div class="article-meta">
+							<span><img src="{dede:field.mid function='face(@me)'/}" class="user-img-xs mr-1">{dede:field.mid function="GetMemberInfos('uname',@me)"/}</span>
+							<span><i class="fa fa-calendar mr-1"></i>{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
+							<span><i class="fa fa-globe mr-1"></i>{dede:field.source/}</span>
+							<span><i class="fa fa-eye mr-1"></i><script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
 						</div>
-						<div class="col-md-8">
-							<div class="row actbox">
-								<ul>
-									<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
-									<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
-									<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-									<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
-								</ul>
+						<div class="py-3">{dede:field.body/}</div>
+						<div class="py-3">作者：{dede:adminname/}</div>
+						<nav class="py-3">
+							<ul class="pagination justify-content-center">{dede:pagebreak/}</ul>
+						</nav>
+						<div class="alert alert-warning">您会看到这个提示，那是因为您的系统无法识别某栏目的模型信息，或者您新建模型后，没为这个模型设计单独的模板不同模型的文档浏览页的模板为：article_模型名字标识.htm如“article_article.htm”，更多的信息您可以在栏目模型管理的地方查看</div>
+						{dede:fieldlist}
+						<table width="100%" cellpadding="1" cellspacing="1" class="table">
+							<tr>
+								<td width="70%" align="center">
+									[field:name/]文档：<br>
+									模板调用标记：<br>
+									<script>document.write("{" + "dede:field.[field:tagname/] /" + "}");</script>
+								</td>
+								<td width="70%">[field:value/]</td>
+							</tr>
+						</table>
+						{/dede:fieldlist}
+						<div class="py-3 row">
+							<div class="col-md-4 prenext">
+								<div class="pagination-previous mb-3">{dede:prenext get='pre'/}</div>
+								<div class="pagination-next">{dede:prenext get='next'/}</div>
+							</div>
+							<div class="col-md-8">
+								<div class="row actbox">
+									<ul>
+										<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
+										<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
+										<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
+										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
+									</ul>
+								</div>
 							</div>
 						</div>
+						{dede:include comment='文档顶踩模块' filename='widget_article_likes.htm'/}
+						{dede:include comment='文档评论模块' filename='widget_article_feedback.htm'/}
 					</div>
-					{dede:include comment='文档顶踩模块' filename='widget_article_digg.htm'/}
-					{dede:include comment='文档评论模块' file='widget_article_feedback.htm'/}
 				</div>
 				<div class="col-md-3">
 					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/article_default_sg.htm

@@ -17,85 +17,84 @@
 		<script src="{dede:global.cfg_cmsurl/}/static/ckeditor/plugins/codesnippet/lib/highlight/highlight.pack.js"></script>
 		<script>hljs.initHighlightingOnLoad();</script>
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-9 article-main">
-					<h2>{dede:field.title/}</h2>
-					<div class="article-meta">
-						<span>时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
-						<span>来源：{dede:field.source/}</span>
-						<span>作者：{dede:field.writer/}</span>
-						<span>浏览：<script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
-					</div>
-					<div class="py-3">{dede:field.body/}</div>
-					<div class="py-3">作者：{dede:adminname/}</div>
-					<nav class="py-3">
-						<ul class="pagination justify-content-center">{dede:pagebreak/}</ul>
-					</nav>
-					<div class="alert alert-warning mt-3">您会看到这个提示，那是因为您的系统无法识别某栏目的模型信息，或者您新建模型后，没为这个模型设计单独的模板不同模型的文档浏览页的模板为：article_模型名字标识.htm如“article_article.htm”，更多的信息您可以在栏目模型管理的地方查看</div>
-					{dede:fieldlist}
-					<table width="100%" cellpadding="1" cellspacing="1" bgcolor="#BED1AB" class="table">
-						<tr>
-							<td width="30%" align="center" bgcolor="#FBFEF5">
-								[field:name/] 文档：<br>
-								模板调用标记：<br>
-								<script>
-									document.write("{" + "dede:field.[field:tagname/] /" + "}");
-								</script>
-							</td>
-							<td width="70%">[field:value/]</td>
-						</tr>
-					</table>
-					{/dede:fieldlist}
-					<div class="clearfix"></div>
-					{dede:include comment='文档顶踩模块' filename='widget_article_digg.htm'/}
-					<div class="row">
-						<div class="col-md-4 prenext">
-							<div class="pagination-previous mb-3">{dede:prenext get='pre'/}</div>
-							<div class="pagination-next">{dede:prenext get='next'/}</div>
+				<div class="col-md-9">
+					<div class="article-main bg-white shadow-sm rounded p-3">
+						<h2>{dede:field.title/}</h2>
+						<div class="article-meta">
+							<span><img src="{dede:field.mid function='face(@me)'/}" class="user-img-xs mr-1">{dede:field.mid function="GetMemberInfos('uname',@me)"/}</span>
+							<span><i class="fa fa-calendar mr-1"></i>{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
+							<span><i class="fa fa-globe mr-1"></i>{dede:field.source/}</span>
+							<span><i class="fa fa-eye mr-1"></i><script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
 						</div>
-						<div class="col-md-8">
-							<div class="row actbox">
-								<ul>
-									<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
-									<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
-									<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-									<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
-								</ul>
+						<div class="py-3">{dede:field.body/}</div>
+						<div class="py-3">作者：{dede:adminname/}</div>
+						<nav class="py-3">
+							<ul class="pagination justify-content-center">{dede:pagebreak/}</ul>
+						</nav>
+						<div class="alert alert-warning mt-3">您会看到这个提示，那是因为您的系统无法识别某栏目的模型信息，或者您新建模型后，没为这个模型设计单独的模板不同模型的文档浏览页的模板为：article_模型名字标识.htm如“article_article.htm”，更多的信息您可以在栏目模型管理的地方查看</div>
+						{dede:fieldlist}
+						<table width="100%" cellpadding="1" cellspacing="1" bgcolor="#BED1AB" class="table">
+							<tr>
+								<td width="30%" align="center" bgcolor="#FBFEF5">
+									[field:name/] 文档：<br>
+									模板调用标记：<br>
+									<script>document.write("{" + "dede:field.[field:tagname/] /" + "}");</script>
+								</td>
+								<td width="70%">[field:value/]</td>
+							</tr>
+						</table>
+						{/dede:fieldlist}
+						<div class="py-3 row">
+							<div class="col-md-4 prenext">
+								<div class="pagination-previous mb-3">{dede:prenext get='pre'/}</div>
+								<div class="pagination-next">{dede:prenext get='next'/}</div>
+							</div>
+							<div class="col-md-8">
+								<div class="row actbox">
+									<ul>
+										<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
+										<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
+										<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
+										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
+									</ul>
+								</div>
 							</div>
 						</div>
+						{dede:include comment='文档顶踩模块' filename='widget_article_likes.htm'/}
+						{dede:include comment='文档评论模块' filename='widget_article_feedback.htm'/}
 					</div>
-					{dede:include comment='文档评论模块' file='widget_article_feedback.htm'/}
 				</div>
 				<div class="col-md-3">
 					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/article_image.htm

@@ -62,107 +62,100 @@
 			}
 		</script>
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-9 article-main">
-					<h2>{dede:field.title/}</h2>
-					<div class="article-meta">
-						<span>时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
-						<span>来源：{dede:field.source/}</span>
-						<span>作者：{dede:field.writer/}</span>
-						<span>浏览：<script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
-					</div>
-					<div class="picbox py-3">
-						{dede:field name='pagestyle' alt='根据不同的页面风格输出不同的头信息' runphp='yes'}
-						if (@me==3) {
-						@me = '<ul class="e8">';
-							}
-							else if (@me==2) {
-							@me = "
-							<div class='text-center mb-3'>
-								<a href='javascript:dPlayBig();' class='btn btn-success'>原始图片</a>
-								<a href='javascript:dPlayPre();' class='btn btn-success'>上一张</a>
-								<a href='javascript:dPlayNext();' class='btn btn-success'>下一张</a>
-								<a href='javascript:dStopPlay();' class='btn btn-success'>自动 / 暂停播放</a>
-							</div>
-							";
+				<div class="col-md-9">
+					<div class="article-main bg-white shadow-sm rounded p-3">
+						<h2>{dede:field.title/}</h2>
+						<div class="article-meta">
+							<span><img src="{dede:field.mid function='face(@me)'/}" class="user-img-xs mr-1">{dede:field.mid function="GetMemberInfos('uname',@me)"/}</span>
+							<span><i class="fa fa-calendar mr-1"></i>{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
+							<span><i class="fa fa-globe mr-1"></i>{dede:field.source/}</span>
+							<span><i class="fa fa-eye mr-1"></i><script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
+						</div>
+						<div class="picbox py-3">
+							{dede:field name='pagestyle' alt='输出不同的图片头信息' runphp='yes'}
+							if (@me==3) {
+								@me = '<ul class="e8">';
+							} else if (@me==2) {
+								@me = "<div class='text-center mb-3'>
+									<a href='javascript:dPlayBig();' class='btn btn-success'>原始图片</a>
+									<a href='javascript:dPlayPre();' class='btn btn-success'>上一张</a>
+									<a href='javascript:dPlayNext();' class='btn btn-success'>下一张</a>
+									<a href='javascript:dStopPlay();' class='btn btn-success'>自动 / 暂停播放</a>
+								</div>";
 							} else {
-							@me = '';
+								@me = '';
 							}
 							{/dede:field}
 							<!-- 如果使用的是多页单图模式幻灯，把href里的链接改为 javascript:dPlayNext(); 表示点击看下一页 -->
-							{dede:field name='imgurls' alt='图片输出区'}
-								[field:pagestyle runphp='yes'] @me= (@me==3 ? '<li>' : '');[/field:pagestyle]
-								<p><a href='[field:linkurl/]' [field:pagestyle runphp='yes' ] @me=(@me==3 ? 'class="pic"' : '' ); [/field:pagestyle]><img src='[field:imgsrc/]' id='bigimg' [field:imgwidth/] alt='[field:alttext/]'></a></p>
-								<a href='[field:linkurl/]' [field:pagestyle runphp='yes' ]@me=(@me==3 ? 'class="title"' : '' );[/field:pagestyle]>[field:title/]</a>
-								[field:pagestyle runphp='yes'] @me = (@me==3 ? '</li>' : ''); [/field:pagestyle]
+							{dede:field name='imgurls' alt='输出不同的图片信息'}
+							[field:pagestyle runphp='yes'] @me= (@me==3 ? '<li>' : '');[/field:pagestyle]
+							<p><a href='[field:linkurl/]' [field:pagestyle runphp='yes' ] @me=(@me==3 ? 'class="pic"' : '' ); [/field:pagestyle]><img src='[field:imgsrc/]' id='bigimg' [field:imgwidth/] alt='[field:alttext/]' title='[field:alttext/]'></a></p>
+							<div class='text-center'><a href='[field:linkurl/]' [field:pagestyle runphp='yes' ]@me=(@me==3 ? 'class="title"' : '' );[/field:pagestyle]>（[field:alttext/]）</a></div>
+							[field:pagestyle runphp='yes'] @me = (@me==3 ? '</li>' : ''); [/field:pagestyle]
 							{/dede:field}
-							{dede:field name='pagestyle' alt='根据不同的风格输出不同的结尾信息' runphp='yes'}
+							{dede:field name='pagestyle' alt='输出不同的图片尾信息' runphp='yes'}
 							if (@me==3) {
-							@me = '
-						</ul>';
-						}
-						else if (@me==2) {
-						@me = "
-						<script>
-							dStartPlay();
-						</script>";
-						} else {
-						@me = '';
-						}
-						{/dede:field}
-					</div>
-					<div class="py-3">{dede:field.body/}</div>
-					<div class="py-3">作者：{dede:adminname/}</div>
-					<div class="clearfix"></div>
-					<div class="row">
-						<div class="col-md-4 prenext">
-							<div class="pagination-previous mb-3">{dede:prenext get='pre'/}</div>
-							<div class="pagination-next">{dede:prenext get='next'/}</div>
+								@me = '</ul>';
+							} else if (@me==2) {
+								@me = "<script>dStartPlay();</script>";
+							} else {
+								@me = '';
+							}
+							{/dede:field}
 						</div>
-						<div class="col-md-8">
-							<div class="row actbox">
-								<ul>
-									<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
-									<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
-									<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-									<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
-								</ul>
+						<div class="py-3">{dede:field.body/}</div>
+						<div class="py-3">作者：{dede:adminname/}</div>
+						<div class="py-3 row">
+							<div class="col-md-4 prenext">
+								<div class="pagination-previous mb-3">{dede:prenext get='pre'/}</div>
+								<div class="pagination-next">{dede:prenext get='next'/}</div>
+							</div>
+							<div class="col-md-8">
+								<div class="row actbox">
+									<ul>
+										<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
+										<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
+										<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
+										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
+									</ul>
+								</div>
 							</div>
 						</div>
+						{dede:include comment='文档顶踩模块' filename='widget_article_likes.htm'/}
+						{dede:include comment='文档评论模块' filename='widget_article_feedback.htm'/}
 					</div>
-					{dede:include comment='文档顶踩模块' filename='widget_article_digg.htm'/}
-					{dede:include comment='文档评论模块' file='widget_article_feedback.htm'/}
 				</div>
 				<div class="col-md-3">
 					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/article_infos.htm

@@ -13,69 +13,80 @@
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-9 article-main">
-					<h2>{dede:field.title/}</h2>
-					<div class="article-meta">
-						<span>时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
-						<span>来源：{dede:field.source/}</span>
-						<span>作者：{dede:field.writer/}</span>
-						<span>浏览：<script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
-					</div>
-					<div class="py-3">{dede:field name='image'/}</div>
-					<div class="py-3">
-						<p>所属区域：{dede:field.nativeplace/}</p>
-						<p>信息类型：{dede:field.infotype/}</p>
-						<p>发布时间：{dede:field.pubdate function="MyDate('Y-m-d H:i:s',@me)"/}</p>
-						<p>截止日期：{dede:field.endtime function="MyDate('Y-m-d H:m',@me)"/}</p>
-						<p>联系人：{dede:field.linkman/}</p>
-						<p>电话：{dede:field.tel/}</p>
-						<p>邮箱：{dede:field.email/}</p>
-						<p>地址：{dede:field.address/}</p>
-					</div>
-					<div class="py-3">{dede:field.body/}</div>
-					<div class="py-3">作者：{dede:adminname/}</div>
-					<div class="clearfix"></div>
-					<div class="row">
-						<div class="col-md-4 prenext">
-							<div class="pagination-previous mb-3">{dede:prenext get='pre'/}</div>
-							<div class="pagination-next">{dede:prenext get='next'/}</div>
+				<div class="col-md-9">
+					<div class="article-main bg-white shadow-sm rounded p-3">
+						<h2>{dede:field.title/}</h2>
+						<div class="article-meta">
+							<span><img src="{dede:field.mid function='face(@me)'/}" class="user-img-xs mr-1">{dede:field.mid function="GetMemberInfos('uname',@me)"/}</span>
+							<span><i class="fa fa-calendar mr-1"></i>{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
+							<span><i class="fa fa-globe mr-1"></i>{dede:field.source/}</span>
+							<span><i class="fa fa-eye mr-1"></i><script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
+						</div>
+						<div class="py-3">{dede:field name='image'/}</div>
+						<div class="py-3">
+							<p>所属区域：{dede:field.nativeplace/}</p>
+							<p>信息类型：{dede:field.infotype/}</p>
+							<p>发布时间：{dede:field.pubdate function="MyDate('Y-m-d H:i:s',@me)"/}</p>
+							<p>截止日期：{dede:field.endtime function="MyDate('Y-m-d H:m',@me)"/}</p>
+							<p>联系人：{dede:field.linkman/}</p>
+							<p>电话：{dede:field.tel/}</p>
+							<p>邮箱：{dede:field.email/}</p>
+							<p>地址：{dede:field.address/}</p>
 						</div>
-						<div class="col-md-8">
-							<div class="row actbox">
-								<ul>
-									<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
-									<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
-									<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-									<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
-								</ul>
+						<div class="py-3">{dede:field.body/}</div>
+						<div class="py-3">作者：{dede:adminname/}</div>
+						<div class="clearfix"></div>
+						<div class="row">
+							<div class="col-md-4 prenext">
+								<div class="pagination-previous mb-3">{dede:prenext get='pre'/}</div>
+								<div class="pagination-next">{dede:prenext get='next'/}</div>
+							</div>
+							<div class="col-md-8">
+								<div class="row actbox">
+									<ul>
+										<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
+										<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
+										<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
+										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
+									</ul>
+								</div>
 							</div>
 						</div>
+						{dede:include comment='文档顶踩模块' filename='widget_article_likes.htm'/}
+						{dede:include comment='文档评论模块' filename='widget_article_feedback.htm'/}
 					</div>
-					{dede:include comment='文档顶踩模块' filename='widget_article_digg.htm'/}
-					{dede:include comment='文档评论模块' file='widget_article_feedback.htm'/}
 				</div>
 				<div class="col-md-3">
-					{dede:include comment='推荐文档' filename='widget_recommend_sg.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot_sg.htm'/}
+					<div class="pb-3">
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/article_soft.htm

@@ -13,87 +13,88 @@
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-9 article-main">
-					<h2 >{dede:field.title/}</h2>
-					<div class="article-meta">
-						<span>时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
-						<span>来源：{dede:field.source/}</span>
-						<span>作者：{dede:field.writer/}</span>
-						<span>浏览：<script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
-					</div>
-					<div class="py-3">{dede:field name='image'/}</div>
-					<div class="py-3">
-						<p>软件类型：{dede:field.softtype/}</p>
-						<p>授权方式：{dede:field.accredit/}</p>
-						<p>界面语言：{dede:field.language/}</p>
-						<p>软件大小：{dede:field.softsize/}</p>
-						<p>文件类型：{dede:field.filetype/}</p>
-						<p>运行环境：{dede:field.os/}</p>
-						<p>软件等级：{dede:field.softrank function='GetRankStar(@me)'/}</p>
-						<p>发布时间：{dede:field.pubdate function="GetDateMk('@me')"/}</p>
-						<p>官方网址：{dede:field.officialurl/}</p>
-						<p>演示网址：{dede:field.officialdemo/}</p>
-						<p>下载次数：<script src="{dede:field.phpurl/}/disdls.php?aid={dede:field.id/}"></script></p>
-					</div>
-					<div class="py-3">{dede:field name='introduce'/}</div>
-					<div class="py-3">
-						<h4>下载地址</h4>
-						<ul class="downurllist">
-							{dede:field name='softlinks'/}
-						</ul>
-					</div>
-					<div class="alert alert-success my-3">{dede:softmsg/}</div>
-					<div class="clearfix"></div>
-					{dede:include comment='文档顶踩模块' filename='widget_article_digg.htm'/}
-					<div class="row">
-						<div class="col-md-4 prenext">
-							<div class="pagination-previous mb-3">{dede:prenext get='pre'/}</div>
-							<div class="pagination-next">{dede:prenext get='next'/}</div>
+				<div class="col-md-9">
+					<div class="article-main bg-white shadow-sm rounded p-3">
+						<h2>{dede:field.title/}</h2>
+						<div class="article-meta">
+							<span><img src="{dede:field.mid function='face(@me)'/}" class="user-img-xs mr-1">{dede:field.mid function="GetMemberInfos('uname',@me)"/}</span>
+							<span><i class="fa fa-calendar mr-1"></i>{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
+							<span><i class="fa fa-globe mr-1"></i>{dede:field.source/}</span>
+							<span><i class="fa fa-eye mr-1"></i><script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
+						</div>
+						<div class="py-3">{dede:field name='image'/}</div>
+						<div class="py-3">
+							<p>软件类型：{dede:field.softtype/}</p>
+							<p>授权方式：{dede:field.accredit/}</p>
+							<p>界面语言：{dede:field.language/}</p>
+							<p>软件大小：{dede:field.softsize/}</p>
+							<p>文件类型：{dede:field.filetype/}</p>
+							<p>运行环境：{dede:field.os/}</p>
+							<p>软件等级：{dede:field.softrank function='GetRankStar(@me)'/}</p>
+							<p>发布时间：{dede:field.pubdate function="GetDateMk('@me')"/}</p>
+							<p>官方网址：{dede:field.officialurl/}</p>
+							<p>演示网址：{dede:field.officialdemo/}</p>
+							<p>下载次数：<script src="{dede:field.phpurl/}/disdls.php?aid={dede:field.id/}"></script></p>
 						</div>
-						<div class="col-md-8">
-							<div class="row actbox">
-								<ul>
-									<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
-									<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
-									<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-									<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
-								</ul>
+						<div class="py-3">{dede:field name='introduce'/}</div>
+						<div class="py-3">
+							<h4>下载地址</h4>
+							<ul class="downurllist">
+								{dede:field name='softlinks'/}
+							</ul>
+						</div>
+						<div class="alert alert-success my-3">{dede:softmsg/}</div>
+						<div class="py-3 row">
+							<div class="col-md-4 prenext">
+								<div class="pagination-previous mb-3">{dede:prenext get='pre'/}</div>
+								<div class="pagination-next">{dede:prenext get='next'/}</div>
+							</div>
+							<div class="col-md-8">
+								<div class="row actbox">
+									<ul>
+										<li><i class="fa fa-star-o mr-2"></i><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
+										<li><i class="fa fa-bug mr-2"></i><a href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a></li>
+										<li><i class="fa fa-thumbs-o-up mr-2"></i><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
+										<li><i class="fa fa-print mr-2"></i><a href="javascript:;" onClick="window.print();">打印</a></li>
+									</ul>
+								</div>
 							</div>
 						</div>
+						{dede:include comment='文档顶踩模块' filename='widget_article_likes.htm'/}
+						{dede:include comment='文档评论模块' filename='widget_article_feedback.htm'/}
 					</div>
-					{dede:include comment='文档评论模块' file='widget_article_feedback.htm'/}
 				</div>
 				<div class="col-md-3">
 					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/article_spec.htm

@@ -14,51 +14,52 @@
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-9 article-main">
-					<h2 >{dede:field.title/}</h2>
-					<div class="article-meta">
-						<span>时间：{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
-						<span>来源：{dede:field.source/}</span>
-						<span>作者：{dede:field.writer/}</span>
-						<span>浏览：<script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
+				<div class="col-md-9">
+					<div class="article-main bg-white shadow-sm rounded p-3">
+						<h2>{dede:field.title/}</h2>
+						<div class="article-meta">
+							<span><img src="{dede:field.mid function='face(@me)'/}" class="user-img-xs mr-1">{dede:field.mid function="GetMemberInfos('uname',@me)"/}</span>
+							<span><i class="fa fa-calendar mr-1"></i>{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}</span>
+							<span><i class="fa fa-globe mr-1"></i>{dede:field.source/}</span>
+							<span><i class="fa fa-eye mr-1"></i><script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}"></script>次</span>
+						</div>
+						<div class="speciallist row py-3">{dede:field.note/}</div>
+						<div class="py-3">{dede:field.body/}</div>
+						<div class="py-3">作者：{dede:adminname/}</div>
+						<div class="alert alert-success my-3">{dede:softmsg/}</div>
 					</div>
-					<div class="speciallist row py-3">{dede:field.note/}</div>
-					<div class="py-3">{dede:field.body/}</div>
-					<div class="py-3">作者：{dede:adminname/}</div>
-					<div class="alert alert-success my-3">{dede:softmsg/}</div>
-					<div class="clearfix"></div>
 				</div>
 				<div class="col-md-3">
 					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/foot.htm

@@ -1,31 +1,31 @@
 <footer class="copyright shadow-sm rounded mt-3">
-    <div class="container text-center">
-        <p>{dede:global.cfg_powerby/} Powered by <a href="https://www.dedebiz.com" target="_blank">DedeBIZ开发团队</a></p>
-        <p class="mb-0">友情连接：{dede:flink row='20'/}</p>
-    </div>
+	<div class="container text-center">
+		<p>{dede:global.cfg_powerby/} Powered by <a href="https://www.dedebiz.com" target="_blank">DedeBIZ开发团队</a></p>
+		<p class="mb-0">友情连接：{dede:flink row='20'/}</p>
+	</div>
 </footer>
 <div class="scroll-top">
-    <button onclick="gotop()" id="btnScrollTop" title="返回顶部"><i class="fa fa-chevron-up"></i> </button>
+	<button onclick="gotop()" id="btnScrollTop" title="返回顶部"><i class="fa fa-chevron-up"></i> </button>
 </div>
 <script src="{dede:global.cfg_cmsurl/}/static/web/js/bootstrap.min.js"></script>
 <script src="{dede:global.cfg_cmsurl/}/static/web/js/style.js"></script>
 {dede:statistics/}
 <script>
-    //校验是否登录
-    function CheckLogin() {
-        $.get("{dede:global.cfg_cmsurl/}/user/api.php?format=json",function(result) {
-            if (result.code === 200) {
-                $("#_login").html(`<a href="{dede:global.cfg_cmsurl/}/user" class="mr-3"><img src="${result.data.facepic}" alt="${result.data.username}" title="${result.data.username}" class="user-admin-img-xs">${result.data.username}</a><a href="/user/pm.php" class="btn btn-primary btn-sm rounded-circle"><i class="fa fa-bell"></i></a><a href="{dede:global.cfg_cmsurl/}/user/index_do.php?fmdo=login&dopost=exit" class="btn btn-success btn-sm rounded-circle"><i class="fa fa-sign-out"></i></a>`);
-                $("#iptUsername").val(result.data.username);
-                $("#iptUsername").attr("disabled", "disabled");
-                $(".areaValidate").hide();
-            } else {
-                $(".areaValidate").show();
-            }
-        });
-    }
-    //页面加载触发
-    $(document).ready(function () {
-        CheckLogin();
-    });
+	//校验是否登录
+	function CheckLogin() {
+		$.get("{dede:global.cfg_cmsurl/}/user/api.php?format=json",function(result) {
+			if (result.code === 200) {
+				$("#_login").html(`<a href="{dede:global.cfg_cmsurl/}/user" class="mr-3"><img src="${result.data.facepic}" alt="${result.data.username}" title="${result.data.username}" class="user-img-xs mr-1">${result.data.username}</a><a href="/user/pm.php" class="btn btn-primary btn-sm rounded-circle"><i class="fa fa-bell"></i></a><a href="{dede:global.cfg_cmsurl/}/user/index_do.php?fmdo=login&dopost=exit" class="btn btn-success btn-sm rounded-circle"><i class="fa fa-sign-out"></i></a>`);
+				$("#iptUsername").val(result.data.username);
+				$("#iptUsername").attr("disabled", "disabled");
+				$(".areaValidate").hide();
+			} else {
+				$(".areaValidate").show();
+			}
+		});
+	}
+	//页面加载触发
+	$(document).ready(function () {
+		CheckLogin();
+	});
 </script>

src/theme/dedebiz/head.htm

@@ -1,19 +1,24 @@
 <header class="container py-3">
-    <div class="row">
-        <div class="col-md-12">
-            <div class="navbar navbar-expand-md navbar-dark bg-success shadow-sm rounded">
-                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbars" aria-controls="navbars" aria-expanded="false" aria-label="展开导航">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <nav class="collapse navbar-collapse" id="navbars">
-                    <ul class="navbar-nav mr-auto">
-                        <li class="nav-item"><a class="nav-link" href="{dede:global.cfg_cmsurl/}/">首页</a></li>
-                        {dede:channel type='top' row='10' currentstyle="<li class='nav-item'><a class='nav-link active' href='~typelink~' ~rel~><span>~typename~</span></a></li>"}
-                        <li class="nav-item"><a class="nav-link" href="[field:typeurl/]">[field:typename/]</a></li>
-                        {/dede:channel}
-                    </ul>
-                </nav>
-            </div>
-        </div>
-    </div>
+	<div class="row">
+		<div class="col-md-12">
+			<div class="navbar navbar-expand-md navbar-dark bg-success shadow-sm rounded">
+				<a class="navbar-brand" href="javascript:;"></a>
+				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbars" aria-controls="navbars" aria-expanded="false">
+					<span class="navbar-toggler-icon"></span>
+				</button>
+				<nav class="collapse navbar-collapse" id="navbars">
+					<ul class="navbar-nav mr-auto">
+						<li class="nav-item"><a href="/" class="nav-link {dede:field name='typeid' runphp='yes'}(@me=='')?@me='active':@me='';{/dede:field}">首页</a></li>
+						{dede:channelartlist typeid='top' row='10'}
+						<li class="nav-item {dede:channel type='son' noself='yes' row='1'}dropdown{/dede:channel}">
+							<a class="nav-link {dede:channel type='son' noself='yes' row='1'}dropdown-toggle{/dede:channel}" href="{dede:field.typeurl/}" {dede:channel type='son' noself='yes' row='1'}id="dropdown-auth" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"{/dede:channel}>{dede:field.typename/}</a>
+							{dede:channel type='son' noself='yes' row='1'}<div class="dropdown-menu" aria-labelledby="dropdown-auth">{/dede:channel}{dede:channel type='son'}
+								<a href="[field:typelink/]" class="dropdown-item">[field:typename/]</a>{/dede:channel}
+							{dede:channel type='son' noself='yes' row='1'}</div>{/dede:channel}
+						</li>{/dede:channelartlist}
+					</ul>
+				</nav>
+			</div>
+		</div>
+	</div>
 </header>

src/theme/dedebiz/index.htm

@@ -12,25 +12,20 @@
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/jquery.min.js"></script>
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-9 m-pb-2">
+				<div class="col-md-3 m-pb-2">{dede:include comment='栏目列表' filename='widget_menu.htm'/}</div>
+				<div class="col-md-6 m-pb-2">
 					<div class="row">
 						<div id="carouselIndex" class="col-12 carousel slide" data-ride="carousel">
-							<ol class="carousel-indicators">
-								{dede:arclist flag='f' row='6'}
-								<li data-target="#carouselIndex" data-slide-to="[field:global.autoindex function='trim(IndexSub(@me,1))'/]" class="[field:global.autoindex function='IndexActive(@me)'/]"></li>
-								{/dede:arclist}
+							<ol class="carousel-indicators">{dede:arclist row='6' flag='f' orderby='id'}
+								<li data-target="#carouselIndex" data-slide-to="[field:global.autoindex function='trim(IndexSub(@me,1))'/]" class="[field:global.autoindex function='IndexActive(@me)'/]"></li>{/dede:arclist}
 							</ol>
-							<div class="carousel-inner">
-								{dede:arclist channelid='1' flag='f' row='6'}
-								<div class="carousel-item[field:global.autoindex function='IndexActive(@me)'/]">
-									<a href="[field:arcurl/]" title="[field:fulltitle/]"><img src="[field:litpic/]" alt="[field:fulltitle/]"></a>
-								</div>
-								{/dede:arclist}
+							<div class="carousel-inner">{dede:arclist row='6' orderby='id'}
+								<div class="carousel-item[field:global.autoindex function='IndexActive(@me)'/]"><a href="[field:arcurl/]" title="[field:fulltitle/]"><img src="[field:litpic/]" alt="[field:fulltitle/]" class="bannr-img"></a></div>{/dede:arclist}
 							</div>
 							<a href="#carouselIndex" class="carousel-control-prev" role="button" data-slide="prev">
 								<span class="carousel-control-prev-icon"></span>
@@ -43,94 +38,77 @@
 						</div>
 					</div>
 				</div>
-				<div class="col-md-3">
-					<div class="row">
-				        <div class="col-md-12">
-							<div class="card ddcard-normal">
-								<div class="card-header">
-									<div class="row">
-										<div class="col-md-12">
-											<h4>推荐头条</h4>
-										</div>
-									</div>
+				<div class="col-md-3 m-pb-2">{dede:include comment='推荐文档' filename='widget_recommend.htm'/}</div>
+			</div>
+		</div>
+		<div class="container py-3">
+			<div class="row biz-mb">{dede:channelartlist typeid='1,1'}
+				<div class="col-md-12 mb-3">
+					<div class="item-title text-left">
+						<h2>{dede:field.typename/}</h2>
+					</div>
+				</div>{dede:arclist row='3' orderby='id'}
+				<div class="col-md-4">
+					<div class="item-theme bg-white shadow-sm rounded">
+						<div class="item-theme-img"><a href="[field:arcurl/]" target="_blank"><img src="[field:picname/]" alt="[field:title/]" title="[field:title/]"></a></div>
+						<div class="item-theme-box">
+							<h4 class="mb-3"><a href="[field:arcurl/]" target="_blank">[field:flag runphp='yes']if (stristr(@me,"h")) @me="<span class='btn btn-success btn-sm mr-2'>头条</span>";else if(stristr(@me,"c")) @me="<span class='btn btn-success btn-sm mr-2'>推荐</span>";else @me="";[/field:flag][field:title/]</a></h4>
+							<div class="row">
+								<div class="col-4 text-left l-height-30 text-danger">
+									<i class="fa fa-download mr-1"></i>
+									<span><script src="/apps/disdls.php?aid=[field:id/]"></script></span>
+								</div>
+								<div class="col-8 text-right">
+									<img src="[field:mid function='face(@me)'/]" class="user-img-xs mr-1">
+									<span>[field:mid function="GetMemberInfos('uname',@me)"/]</span>
 								</div>
-								<ul class="list-group list-group-flush">
-									{dede:arclist flag='h' titlelen='100' row='7' orderby='pubdate'}
-									<li><a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a></li>
-									{/dede:arclist}
-								</ul>
 							</div>
 						</div>
 					</div>
-				</div>
+				</div>{/dede:arclist}{/dede:channelartlist}
 			</div>
 		</div>
 		<div class="container py-3">
-			<div class="row">
-				<div class="col-md-9 mb-3">
-					<div class="row spec">
-						<div class="col-md-12 mb-3">
-							<h4 class="title">图文资讯</h4>
-						</div>
-						<div class="col-md-12">
-							<div class="row row-cols-2 row-cols-md-4">
-								{dede:arclist row='4' orderby='pubdate' type='image.'}
-								<div class="col">
-									<div class="card image-item border-0 mb-3">
-										<a href="[field:arcurl/]" class="text-body stretched-link"><img src="[field:litpic/]" class="card-img-top" alt="[field:fulltitle/]"></a>
-										<div class="card-body">
-											<h5 class="card-title"><a href="[field:arcurl/]">[field:title/]</a></h5>
-										</div>
-									</div>
-								</div>
-								{/dede:arclist}
-							</div>
-						</div>
+			<div class="row biz-mb">{dede:channelartlist typeid='2,2'}
+				<div class="col-md-12 mb-3">
+					<div class="item-title text-left">
+						<h2>{dede:field.typename/}</h2>
 					</div>
-					<div class="row">
-						{dede:channelartlist}
-						<div class="col-md-6 my-3">
-							<div class="card ddcard-normal">
-								<div class="card-header">
-									<div class="row">
-										<div class="col-md-6">
-											<h4>{dede:field.typename/}</h4>
-										</div>
-										<div class="col-md-6 d-flex justify-content-end more"><a href="{dede:field.typeurl/}">更多</a></div>
-									</div>
-								</div>
-								<ul class="list-group list-group-flush">
-									{dede:arclist titlelen='60' limit='0,1'}
-									<li>
-										<p><a title="[field:fulltitle/]" href="[field:arcurl/]"><i class="fa fa-file-word-o mr-1"></i>[field:title/]</a></p>
-										<p class="text-right mb-0">
-											<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-admin-img-xs">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
-											<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
-										</p>
-									</li>
-									{/dede:arclist}
-									{dede:arclist titlelen='50' limit='1,9'}
-									<li><a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a><span class="float-right">[field:pubdate function="MyDate('Y-m-d',@me)"/]</span></li>
-									{/dede:arclist}
-								</ul>
-							</div>
+				</div>{dede:arclist row='3' orderby='id'}
+				<div class="col-md-4">
+					<div class="item-news bg-white shadow-sm rounded">
+						<div class="item-news-img"><a href="[field:arcurl/]" target="_blank"><img src="[field:picname/]" alt="[field:title/]" title="[field:title/]"></a></div>
+						<h4><a href="[field:arcurl/]" target="_blank">[field:title/]</a></h4>
+						<div class="mb-3">
+							<img src="[field:mid function='face(@me)'/]" class="user-img-xs mr-1">
+							<span class="mr-1">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
+							<i class="fa fa-calendar mr-1"></i>
+							<span>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
 						</div>
-						{/dede:channelartlist}
+						<p>[field:description function="cn_substr(@me,180)"/]... </p>
 					</div>
-				</div>
-				<div class="col-md-3">
-					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
-				</div>
+				</div>{/dede:arclist}{/dede:channelartlist}
+			</div>
+		</div>
+		<div class="container py-3">
+			<div class="row">{dede:channelartlist typeid='1,1'}
+				<div class="col-md-6 m-pb-2">
+					<div class="item-article bg-white shadow-sm rounded p-3">
+						<h2 class="mb-3">{dede:field.typename/}</h2>
+						<ul>{dede:arclist row='10' titlelen='120' orderby='id'}
+							<li>[field:global.autoindex/].<a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a></li>{/dede:arclist}
+						</ul>
+					</div>
+				</div>{/dede:channelartlist}{dede:channelartlist typeid='2,2'}
+				<div class="col-md-6">
+					<div class="item-article bg-white shadow-sm rounded p-3">
+						<h2 class="mb-3">{dede:field.typename/}</h2>
+						<ul>{dede:arclist row='10' titlelen='120' orderby='id'}
+							<li>[field:global.autoindex/].<a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a></li>{/dede:arclist}
+						</ul>
+					</div>
+				</div>{/dede:channelartlist}
+
 			</div>
 		</div>
 		{dede:include filename='foot.htm'/}

src/theme/dedebiz/index_article.htm

@@ -12,20 +12,18 @@
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/jquery.min.js"></script>
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
@@ -35,48 +33,29 @@
 					<div class="row">
 						{dede:channelartlist}
 						<div class="col-md-6 mb-3">
-							<div class="card ddcard-normal">
-								<div class="card-header">
-									<div class="row">
-										<div class="col-6 caption">
-											<span><a href="{dede:field.typeurl/}">{dede:field.typename/}</a></span>
-										</div>
-										<div class="col-6 d-flex justify-content-end more">
-											<a href="{dede:field.typeurl/}">更多</a>
-										</div>
-									</div>
-								</div>
-								<ul class="list-group list-group-flush">
-									{dede:arclist titlelen='60' limit='0,1'}
-									<li>
-										<p><a title="[field:fulltitle/]" href="[field:arcurl/]"><i class="fa fa-file-word-o mr-1"></i>[field:title/]</a></p>
-										<p class="text-right mb-0">
-											<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-admin-img-xs">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
-											<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
-										</p>
-									</li>
-									{/dede:arclist}
-									{dede:arclist titlelen='60' limit='1,9'}
-									<li><a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a></li>
-									{/dede:arclist}
+							<div class="item-article bg-white shadow-sm rounded mb-3 p-3">
+								<h2 class="mb-3">{dede:field.typename/}</h2>
+								<ul>{dede:arclist row='10' titlelen='120' orderby='rand'}
+									<li>[field:global.autoindex/].<a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a></li>{/dede:arclist}
 								</ul>
 							</div>
-						</div>
-						{/dede:channelartlist}
+						</div>{/dede:channelartlist}
 					</div>
 				</div>
 				<div class="col-md-3">
 					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/index_default.htm

@@ -12,20 +12,18 @@
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/jquery.min.js"></script>
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
@@ -35,48 +33,29 @@
 					<div class="row">
 						{dede:channelartlist}
 						<div class="col-md-6 mb-3">
-							<div class="card ddcard-normal">
-								<div class="card-header">
-									<div class="row">
-										<div class="col-6 caption">
-											<span><a href="{dede:field.typeurl/}">{dede:field.typename/}</a></span>
-										</div>
-										<div class="col-6 d-flex justify-content-end more">
-											<a href="{dede:field.typeurl/}">更多</a>
-										</div>
-									</div>
-								</div>
-								<ul class="list-group list-group-flush">
-									{dede:arclist titlelen='60' limit='0,1'}
-									<li>
-										<p><a title="[field:fulltitle/]" href="[field:arcurl/]"><i class="fa fa-file-word-o mr-1"></i>[field:title/]</a></p>
-										<p class="text-right mb-0">
-											<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-admin-img-xs">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
-											<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
-										</p>
-									</li>
-									{/dede:arclist}
-									{dede:arclist titlelen='60' limit='1,9'}
-									<li><a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a></li>
-									{/dede:arclist}
+							<div class="item-article bg-white shadow-sm rounded mb-3 p-3">
+								<h2 class="mb-3">{dede:field.typename/}</h2>
+								<ul>{dede:arclist row='10' titlelen='120' orderby='rand'}
+									<li>[field:global.autoindex/].<a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a></li>{/dede:arclist}
 								</ul>
 							</div>
-						</div>
-						{/dede:channelartlist}
+						</div>{/dede:channelartlist}
 					</div>
 				</div>
 				<div class="col-md-3">
 					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/index_default_sg.htm

@@ -12,20 +12,18 @@
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/jquery.min.js"></script>
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
@@ -35,39 +33,29 @@
 					<div class="row">
 						{dede:channelartlist}
 						<div class="col-md-6 mb-3">
-							<div class="card ddcard-normal">
-								<div class="card-header">
-									<div class="row">
-										<div class="col-6 caption">
-											<span><a href="{dede:field.typeurl/}">{dede:field.typename/}</a></span>
-										</div>
-										<div class="col-6 d-flex justify-content-end more">
-											<a href="{dede:field.typeurl/}">更多</a>
-										</div>
-									</div>
-								</div>
-								<ul class="list-group list-group-flush">
-									{dede:arclistsg titlelen='60' limit='0,1'}
-									<li>
-										<p><a title="[field:fulltitle/]" href="[field:arcurl/]"><i class="fa fa-file-word-o mr-1"></i>[field:title/]</a></p>
-										<p class="text-right mb-0">
-											<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-admin-img-xs">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
-											<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
-										</p>
-									</li>
-									{/dede:arclistsg}
-									{dede:arclistsg titlelen='60' limit='1,9'}
-									<li><a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a></li>
-									{/dede:arclistsg}
+							<div class="item-article bg-white shadow-sm rounded mb-3 p-3">
+								<h2 class="mb-3">{dede:field.typename/}</h2>
+								<ul>{dede:arclist row='10' titlelen='120' orderby='rand'}
+									<li>[field:global.autoindex/].<a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a></li>{/dede:arclist}
 								</ul>
 							</div>
-						</div>
-						{/dede:channelartlist}
+						</div>{/dede:channelartlist}
 					</div>
 				</div>
 				<div class="col-md-3">
-					{dede:include comment='推荐文档' filename='widget_recommend_sg.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot_sg.htm'/}
+					<div class="pb-3">
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/index_image.htm

@@ -12,72 +12,41 @@
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/jquery.min.js"></script>
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
-			<div class="row">
-				<div class="col-md-9">
-					<div class="row">
-						{dede:channelartlist}
-						<div class="col-md-12 mb-3">
-							<div class="card ddcard-normal">
-								<div class="card-header">
-									<div class="row">
-										<div class="col-6 caption">
-											<span><a href="{dede:field.typeurl/}">{dede:field.typename/}</a></span>
-										</div>
-										<div class="col-6 d-flex justify-content-end more">
-											<a href="{dede:field.typeurl/}">更多</a>
-										</div>
-									</div>
-								</div>
-								<div class="row row-cols-2 row-cols-md-4 pt-3">
-									{dede:arclist row='4'}
-									<div class="col">
-										<div class="card image-item border-0 mb-3">
-											<a href="[field:arcurl/]" title="[field:fulltitle/]" class="text-body stretched-link">
-												<img src="[field:litpic/]" class="card-img-top" alt="[field:fulltitle/]">
-												<div class="card-body">
-													<h6 class="card-title">[field:title/]</h6>
-												</div>
-											</a>
-										</div>
-									</div>
-									{/dede:arclist}
-								</div>
-							</div>
+			<div class="row biz-mb">{dede:channelartlist}
+				<div class="col-md-12 mb-3">
+					<div class="item-title text-left">
+						<h2>{dede:field.typename/}</h2>
+					</div>
+				</div>{dede:arclist row='3' orderby='rand'}
+				<div class="col-md-4">
+					<div class="item-news bg-white shadow-sm rounded">
+						<div class="item-news-img"><a href="[field:arcurl/]" target="_blank"><img src="[field:picname/]" alt="[field:title/]" title="[field:title/]"></a></div>
+						<h4><a href="[field:arcurl/]" target="_blank">[field:title/]</a></h4>
+						<div class="mb-3">
+							<img src="[field:mid function='face(@me)'/]" class="user-img-xs mr-1">
+							<span class="mr-1">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
+							<i class="fa fa-calendar mr-1"></i>
+							<span>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
 						</div>
-						{/dede:channelartlist}
+						<p>[field:description function="cn_substr(@me,180)"/]... </p>
 					</div>
-				</div>
-				<div class="col-md-3">
-					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
-				</div>
+				</div>{/dede:arclist}{/dede:channelartlist}
 			</div>
 		</main>
 		{dede:include filename='foot.htm'/}

src/theme/dedebiz/index_infos.htm

@@ -12,20 +12,18 @@
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/jquery.min.js"></script>
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
@@ -35,39 +33,29 @@
 					<div class="row">
 						{dede:channelartlist}
 						<div class="col-md-6 mb-3">
-							<div class="card ddcard-normal">
-								<div class="card-header">
-									<div class="row">
-										<div class="col-6 caption">
-											<span><a href="{dede:field.typeurl/}">{dede:field.typename/}</a></span>
-										</div>
-										<div class="col-6 d-flex justify-content-end more">
-											<a href="{dede:field.typeurl/}">更多</a>
-										</div>
-									</div>
-								</div>
-								<ul class="list-group list-group-flush">
-									{dede:arclistsg titlelen='60' limit='0,1'}
-									<li>
-										<p><a title="[field:fulltitle/]" href="[field:arcurl/]"><i class="fa fa-file-word-o mr-1"></i>[field:title/]</a></p>
-										<p class="text-right mb-0">
-											<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-admin-img-xs">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
-											<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
-										</p>
-									</li>
-									{/dede:arclistsg}
-									{dede:arclistsg titlelen='60' limit='1,9'}
-									<li><a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a></li>
-									{/dede:arclistsg}
+							<div class="item-article bg-white shadow-sm rounded mb-3 p-3">
+								<h2 class="mb-3">{dede:field.typename/}</h2>
+								<ul>{dede:arclistsg row='10' titlelen='120' orderby='rand'}
+									<li>[field:global.autoindex/].<a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a></li>{/dede:arclistsg}
 								</ul>
 							</div>
-						</div>
-						{/dede:channelartlist}
+						</div>{/dede:channelartlist}
 					</div>
 				</div>
 				<div class="col-md-3">
-					{dede:include comment='推荐文档' filename='widget_recommend_sg.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot_sg.htm'/}
+					<div class="pb-3">
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/index_soft.htm

@@ -12,72 +12,44 @@
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/jquery.min.js"></script>
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
-			<div class="row">
-				<div class="col-md-9">
-					<div class="row">
-						{dede:channelartlist}
-						<div class="col-md-6 mb-3">
-							<div class="card ddcard-normal">
-								<div class="card-header">
-									<div class="row">
-										<div class="col-6 caption">
-											<span><a href="{dede:field.typeurl/}">{dede:field.typename/}</a></span>
-										</div>
-										<div class="col-6 d-flex justify-content-end more">
-											<a href="{dede:field.typeurl/}">更多</a>
-										</div>
-									</div>
-								</div>
-								<ul class="list-group list-group-flush">
-									{dede:arclist titlelen='60' limit='0,1'}
-									<li>
-										<p><a title="[field:fulltitle/]" href="[field:arcurl/]"><i class="fa fa-file-word-o mr-1"></i>[field:title/]</a></p>
-										<p class="text-right mb-0">
-											<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-admin-img-xs">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
-											<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
-										</p>
-									</li>
-									{/dede:arclist}
-									{dede:arclist titlelen='60' limit='1,9'}
-									<li><a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a></li>
-									{/dede:arclist}
-								</ul>
-							</div>
+			<div class="row biz-mb">{dede:channelartlist}
+				<div class="col-md-12 mb-3">
+					<div class="item-title text-left">
+						<h2>{dede:field.typename/}</h2>
+					</div>
+				</div>{dede:arclist row='3' orderby='rand'}
+				<div class="col-md-4">
+					<div class="item-news bg-white shadow-sm rounded">
+						<div class="item-news-img"><a href="[field:arcurl/]" target="_blank"><img src="[field:picname/]" alt="[field:title/]" title="[field:title/]"></a></div>
+						<h4><a href="[field:arcurl/]" target="_blank">[field:title/]</a></h4>
+						<div class="mb-3">
+							<img src="[field:mid function='face(@me)'/]" class="user-img-xs mr-1">
+							<span class="mr-1">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
+							<i class="fa fa-calendar mr-1"></i>
+							<span>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+						</div>
+						<p class="mb-3">[field:description function="cn_substr(@me,120)"/]...</p>
+						<div>
+							<span class="mr-2">下载次数：<script src="/apps/disdls.php?aid=[field:id/]"></script></span>
 						</div>
-						{/dede:channelartlist}
 					</div>
-				</div>
-				<div class="col-md-3">
-					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
-				</div>
+				</div>{/dede:arclist}{/dede:channelartlist}
 			</div>
 		</main>
 		{dede:include filename='foot.htm'/}

src/theme/dedebiz/list_article.htm

@@ -12,59 +12,54 @@
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-9 list-main">
-					<ul class="list-unstyled items">
-						{dede:list pagesize='10'}
-						<li class="media border-bottom-dashed py-3">
-							<div class="media-body row">
-								<div class="col-md-12 caption">
-									<a href="[field:arcurl/]"><h4>[field:title/]</h4></a>
-								</div>
-								<div class="col-md-12 description">
-									<a href="[field:arcurl/]">[field:description/]...</a>
-								</div>
-								<div class="col-md-12 source text-right">
-									<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-admin-img-xs">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
-									<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+				<div class="col-md-9 m-pb-2">
+					<div class="row">{dede:list pagesize='10'}
+						<div class="col-md-12 mb-3">
+							<div class="list-article mb-3">
+								<div class="list-article-body bg-white rounded shadow-sm p-3">
+									<h2 class="mb-3"><a href="[field:arcurl/]">[field:title/]</a></h2>
+									<div class="mb-3">
+										<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-img-xs mr-1">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
+										<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+									</div>
+									<p>[field:description function="cn_substr(@me,180)"/]...</p>
 								</div>
 							</div>
-						</li>
-						{/dede:list}
-					</ul>
-					<ul class="pagination justify-content-center py-3">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
+						</div>{/dede:list}
+					</div>
+					<ul class="pagination">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
 				</div>
 				<div class="col-md-3">
 					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-                    {dede:include comment='栏目列表' filename='widget_channels.htm'/}
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/list_default.htm

@@ -12,59 +12,54 @@
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-9 list-main">
-					<ul class="list-unstyled items">
-						{dede:list pagesize='10'}
-						<li class="media border-bottom-dashed py-3">
-							<div class="media-body row">
-								<div class="col-md-12 caption">
-									<a href="[field:arcurl/]"><h4 class="title">[field:code/] [field:title/]</h4></a>
-								</div>
-								<div class="col-md-12 description">
-									<a href="[field:arcurl/]">[field:description/]...</a>
-								</div>
-								<div class="col-md-12 source text-right">
-									<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-admin-img-xs">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
-									<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+				<div class="col-md-9 m-pb-2">
+					<div class="row">{dede:list pagesize='10'}
+						<div class="col-md-12 mb-3">
+							<div class="list-article mb-3">
+								<div class="list-article-body bg-white rounded shadow-sm p-3">
+									<h2 class="mb-3"><a href="[field:arcurl/]">[field:title/]</a></h2>
+									<div class="mb-3">
+										<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-img-xs mr-1">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
+										<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+									</div>
+									<p>[field:description function="cn_substr(@me,180)"/]...</p>
 								</div>
 							</div>
-						</li>
-						{/dede:list}
-					</ul>
-					<ul class="pagination justify-content-center py-3">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
+						</div>{/dede:list}
+					</div>
+					<ul class="pagination">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
 				</div>
 				<div class="col-md-3">
 					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-                    {dede:include comment='栏目列表' filename='widget_channels.htm'/}
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/list_default_sg.htm

@@ -12,50 +12,54 @@
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-9 list-main">
-					<ul class="list-unstyled items">
-						{dede:list pagesize='10'}
-						<li class="media border-bottom-dashed py-3">
-							<div class="media-body row">
-								<div class="col-md-12 caption">
-									<a href="[field:arcurl/]"><h4 class="title">[field:code/] [field:title/]</h4></a>
-								</div>
-								<div class="col-md-12 description">
-									<a href="[field:arcurl/]">[field:description/]...</a>
-								</div>
-								<div class="col-md-12 source text-right">
-									<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-admin-img-xs">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
-									<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+				<div class="col-md-9 m-pb-2">
+					<div class="row">{dede:list pagesize='10'}
+						<div class="col-md-12 mb-3">
+							<div class="list-article mb-3">
+								<div class="list-article-body bg-white rounded shadow-sm p-3">
+									<h2 class="mb-3"><a href="[field:arcurl/]">[field:title/]</a></h2>
+									<div class="mb-3">
+										<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-img-xs mr-1">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
+										<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+									</div>
+									<p>[field:description function="cn_substr(@me,120)"/]...</p>
 								</div>
 							</div>
-						</li>
-						{/dede:list}
-					</ul>
-					<ul class="pagination justify-content-center py-3">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
+						</div>{/dede:list}
+					</div>
+					<ul class="pagination">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
 				</div>
 				<div class="col-md-3">
-					{dede:include comment='栏目列表' filename='widget_channels.htm'/}
-					{dede:include comment='推荐文档' filename='widget_recommend_sg.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot_sg.htm'/}
+					<div class="pb-3">
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/list_free.htm

@@ -12,44 +12,45 @@
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-8 list-main">
-					<ul class="list-unstyled items">
-						{dede:freelist/}
-					</ul>
-					<ul class="pagination justify-content-center py-3">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
+				<div class="col-md-9 m-pb-2">
+					<div class="row">
+						<div class="col-md-12 mb-3">
+							{dede:freelist/}
+						</div>
+					</div>
+					<ul class="pagination">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
 				</div>
-				<div class="col-md-4">
+				<div class="col-md-3">
 					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-                    {dede:include comment='栏目列表' filename='widget_channels.htm'/}
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/list_image.htm

@@ -12,55 +12,55 @@
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-8 list-main spec">
-					<div class="row row-cols-2 row-cols-md-4">
-						{dede:list pagesize='12'}
-						<div class="col">
-							<div class="card image-item border-0 mb-3">
-								<a href="[field:arcurl/]" title="[field:fulltitle/]" class="text-body stretched-link">
-									<img src="[field:litpic/]" class="card-img-top" alt="[field:fulltitle/]">
-									<div class="card-body">
-										<h6 class="card-title">[field:title/]</h6>
+				<div class="col-md-9 m-pb-2">
+					<div class="row">{dede:list pagesize='10'}
+						<div class="col-md-6 mb-3">
+							<div class="list-article rounded mb-3">
+								[field:array runphp='yes']@me=(strpos(@me['litpic'],'thumbnail')?"":"<div class='list-article-img'><a href='{@me['arcurl']}'><img src='{@me['litpic']}' alt='{@me['title']}' title='{@me['title']}'></a></div>");[/field:array]
+								<div class="list-article-body bg-white shadow-sm p-3">
+									<h2 class="mb-3"><a href="[field:arcurl/]">[field:title/]</a></h2>
+									<div class="mb-3">
+										<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-img-xs mr-1">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
+										<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
 									</div>
-								</a>
+									<p>[field:description function="cn_substr(@me,120)"/]...</p>
+								</div>
 							</div>
-						</div>
-						{/dede:list}
+						</div>{/dede:list}
 					</div>
-					<ul class="pagination justify-content-center py-3">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
+					<ul class="pagination">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
 				</div>
-				<div class="col-md-4">
+				<div class="col-md-3">
 					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-                    {dede:include comment='栏目列表' filename='widget_channels.htm'/}
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/list_infos.htm

@@ -11,93 +11,85 @@
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
-		<style>.dedeinfolink a{color:#1eb867;margin-right:10px;}.info-search .info-guide{line-height:32px;}</style>
+		<style>.form-control{display:block;margin-right:0;margin-bottom:10px;width:100%}</style>
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-8 list-main">
-					{dede:infolink}
-					<table class="dedeinfolink table table-borderless">
-						<tr class="table-success">
-							<td colspan="3" class="iftitle">信息附加条件：</td>
-						</tr>
-						<tr>
-							<td width="80">地区：</td>
-							<td align="center" nowrap="yes">
-								<div>[field:linkallplace/]</div>
-							</td>
-							<td>[field:nativeplace/]</td>
-						</tr>
-						<tr>
-							<td>类型：</td>
-							<td align="center" nowrap="yes">
-								<div>[field:linkalltype/]</div>
-							</td>
-							<td>[field:infotype/]</td>
-						</tr>
-					</table>
-					{/dede:infolink}
-					<ul class="list-unstyled items">
+				<div class="col-md-9 m-pb-2">
+					<div class="row">
+						{dede:infolink}
+						<div class="col-md-12 mb-3">
+							<div class="list-info-select">
+								<h5 class="mb-3">筛选条件</h5>
+								<div class="mb-3">地区：[field:linkallplace/] [field:nativeplace/]</div>
+								<div>类型：[field:linkalltype/] [field:infotype/]</div>
+							</div>
+						</div>
+						{/dede:infolink}
 						{dede:list pagesize='10'}
-						<li class="media border-bottom-dashed py-3">
-							<div class="media-body row">
-								<div class="col-md-12 caption">
-									<a href="[field:arcurl/]"><h4 class="title">[field:code/] [field:title/]</h4></a>
-								</div>
-								<div class="col-md-12 source text-right">
-									<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-admin-img-xs">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
-									<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+						<div class="col-md-12 mb-3">
+							<div class="list-article mb-3">
+								<div class="list-article-body bg-white rounded shadow-sm p-3">
+									<h2 class="mb-3"><a href="[field:arcurl/]">[field:title/]</a></h2>
+									<div class="mb-3">
+										<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-img-xs mr-1">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
+										<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+									</div>
+									<p>[field:description function="cn_substr(@me,180)"/]...</p>
 								</div>
 							</div>
-						</li>
-						{/dede:list}
-					</ul>
-					<ul class="pagination justify-content-center py-3">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
+						</div>{/dede:list}
+					</div>
+					<ul class="pagination">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
 				</div>
-				<div class="col-md-4">
-					<div class="info-search card ddcard pb-3">
-						<div class="card-header">
-							<div class="row">
-								<div class="col-md-12 caption"><span>信息搜索</span></div>
-							</div>
+				<div class="col-md-3">
+					<div class="pb-3">
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
 						</div>
-						<div class="info-guide mt-3">
+					</div>
+					<div class="py-3">
+						<div class="list-info-search bg-white shadow-sm rounded p-3">
+							<h2 class="mb-3">信息搜索</h2>
 							{dede:infoguide}
 							<form name="infoguide" method="get" action="/apps/list.php">
-								[field:nativeplace/]
-								[field:infotype/]
 								<input type="hidden" name="tid" value="[field:typeid/]">
 								<input type="hidden" name="channelid" value="-8">
+								<div class="form-group">[field:nativeplace/]</div>
+								<div class="form-group">[field:infotype/]</div>
 								<div class="form-group">
 									<label for="iptKeyword">关键词</label>
 									<input type="text" name="keyword" id="iptKeyword" class="form-control">
 								</div>
-								<button type="submit" class="btn btn-warning">搜索信息</button>
-								<button type="button" class="btn btn-warning" onclick="location='/user/archives_sg_add.php?channelid=-8';">发布信息</button>
+								<button type="submit" class="btn btn-warning btn-sm">搜索信息</button>
+								<button type="button" class="btn btn-warning btn-sm" onclick="location='/user/archives_sg_add.php?channelid=-8';">发布信息</button>
 							</form>
 							{/dede:infoguide}
 						</div>
 					</div>
-					{dede:include comment='栏目列表' filename='widget_channels.htm'/}
-					{dede:include comment='推荐文档' filename='widget_recommend_sg.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot_sg.htm'/}
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/list_soft.htm

@@ -12,60 +12,58 @@
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-9 list-main">
-					<ul class="list-unstyled items">
-						{dede:list pagesize='10'}
-						<li class="media border-bottom-dashed py-3">
-							<a href="[field:arcurl/]"><img src="[field:litpic/]" alt="[field:title/]" class="mr-3"></a>
-							<div class="media-body row">
-								<div class="col-md-12 title">
-									<a href="[field:arcurl/]"><h4>[field:title/]</h4></a>
-								</div>
-								<div class="col-md-12 description">
-									<a href="[field:arcurl/]">[field:description/]...</a>
-								</div>
-								<div class="col-md-12 addinfo">
-									<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-admin-img-xs">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
-									<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+				<div class="col-md-9 m-pb-2">
+					<div class="row">{dede:list pagesize='10'}
+						<div class="col-md-6 mb-3">
+							<div class="list-article rounded mb-3">
+								[field:array runphp='yes']@me=(strpos(@me['litpic'],'thumbnail')?"":"<div class='list-article-img'><a href='{@me['arcurl']}'><img src='{@me['litpic']}' alt='{@me['title']}' title='{@me['title']}'></a></div>");[/field:array]
+								<div class="list-article-body bg-white shadow-sm p-3">
+									<h2 class="mb-3"><a href="[field:arcurl/]">[field:title/]</a></h2>
+									<div class="mb-3">
+										<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-img-xs mr-1">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
+										<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+									</div>
+									<p class="mb-3">[field:description function="cn_substr(@me,120)"/]...</p>
+									<div>
+										<span class="mr-2">下载次数：<script src="/apps/disdls.php?aid=[field:id/]"></script></span>
+									</div>
 								</div>
 							</div>
-						</li>
-						{/dede:list}
-					</ul>
-					<ul class="pagination justify-content-center py-3">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
+						</div>{/dede:list}
+					</div>
+					<ul class="pagination">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
 				</div>
 				<div class="col-md-3">
 					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-                    {dede:include comment='栏目列表' filename='widget_channels.htm'/}
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/list_spec.htm

@@ -12,60 +12,54 @@
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								{dede:field name='position'/}
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							{dede:field name='position'/}
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-9 list-main">
-					<ul class="list-unstyled items">
-						{dede:list pagesize='10'}
-						<li class="media border-bottom-dashed list-image py-3">
-							<a href="[field:arcurl/]"><img src="[field:litpic/]" alt="[field:title/]" class="mr-3"></a>
-							<div class="media-body row">
-								<div class="col-md-12 title">
-									<a href="[field:arcurl/]"><h4>[field:title/]</h4></a>
-								</div>
-								<div class="col-md-12 description">
-									<a href="[field:arcurl/]">[field:description/]...</a>
-								</div>
-								<div class="col-md-12 addinfo">
-									<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-admin-img-xs">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
-									<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+				<div class="col-md-9 m-pb-2">
+					<div class="row">{dede:list pagesize='10'}
+						<div class="col-md-12 mb-3">
+							<div class="list-article mb-3">
+								<div class="list-article-body bg-white rounded shadow-sm p-3">
+									<h2 class="mb-3"><a href="[field:arcurl/]">[field:title/]</a></h2>
+									<div class="mb-3">
+										<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-img-xs mr-1">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
+										<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+									</div>
+									<p>[field:description function="cn_substr(@me,180)"/]...</p>
 								</div>
 							</div>
-						</li>
-						{/dede:list}
-					</ul>
-					<ul class="pagination justify-content-center py-3">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
+						</div>{/dede:list}
+					</div>
+					<ul class="pagination">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
 				</div>
 				<div class="col-md-3">
 					<div class="pb-3">
-	                    <form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
-	                        <input type="hidden" name="kwtype" value="0">
-	                        <div class="input-group">
-		                        <input name="q" type="text" class="form-control" placeholder="请输入...">
-		                        <button type="submit" class="btn"><i class="fa fa-search"></i></button>
-		                    </div>
-	                    </form>
-                    </div>
-                    {dede:include comment='栏目列表' filename='widget_channels.htm'/}
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="py-3">{dede:include comment='推荐栏目' filename='widget_menu.htm'/}</div>
+					<div class="pt-3">{dede:include comment='热门文档' filename='widget_hot.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/search.htm

@@ -3,55 +3,62 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title>搜索{dede:global name='keyword'/}结果-{dede:global name='cfg_webname'/}</title>
-		<meta name="keywords" content="{dede:field name='keywords'/}">
-		<meta name="description" content="{dede:field name='description' function='html2text(@me)'/}">
+		<title>搜索{dede:global name='keyword' function='RemoveXSS(@me)'/}-{dede:global.cfg_webname/}</title>
+		<meta name="keywords" content="{dede:field.keywords/}">
+		<meta name="description" content="{dede:field.description function='html2text(@me)'/}">
 		<script src="{dede:global.cfg_cmsurl/}/static/web/js/jquery.min.js"></script>
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								<li class="breadcrumb-item"><a href="{dede:global.cfg_cmsurl/}/">首页</a></li>
-								<li class="breadcrumb-item">搜索{dede:global name='keyword' function='RemoveXSS(@me)'/}的结果</li>
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							<li class="breadcrumb-item"><a href="{dede:global.cfg_cmsurl/}/">首页</a></li>
+							<li class="breadcrumb-item">搜索{dede:global name='keyword' function='RemoveXSS(@me)'/}</li>
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-9 list-main">
-					<ul class="list-unstyled items">
-						{dede:list pagesize='10'}
-						<li class="media border-bottom-dashed">
-							<div class="media-body row py-3">
-								<div class="col-md-12 caption">
-									<a href="[field:arcurl/]"><h4 class="title">[field:code/] [field:title/]</h4></a>
-								</div>
-								<div class="col-md-12 description">
-									<a href="[field:arcurl/]">[field:description/]...</a>
+				<div class="col-md-9 m-pb-2">
+					<div class="row">{dede:list pagesize='10'}
+						<div class="col-md-12 mb-3">
+							<div class="list-article mb-3">
+								<div class="list-article-body bg-white rounded shadow-sm p-3">
+									<h2 class="mb-3"><a href="[field:arcurl/]">[field:title/]</a></h2>
+									<div class="mb-3">
+										<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-img-xs mr-1">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
+										<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+									</div>
+									<p>[field:description function='cn_substr(Html2text("@me"),180)'/]...</p>
 								</div>
 							</div>
-						</li>
-						{/dede:list}
-					</ul>
-					<ul class="pagination justify-content-center py-3">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
+						</div>{/dede:list}
+					</div>
+					<ul class="pagination">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
 				</div>
 				<div class="col-md-3">
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+					<div class="pb-3">
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/singlepage.htm

@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
-		<title>{dede:field.title/}-{dede:global.cfg_webname/}</title>
-		<meta name="keywords" content="{dede:field.keywords/}">
-		<meta name="description" content="{dede:field.description function='html2text(@me)'/}">
-		<script src="{dede:global.cfg_cmsurl/}/static/web/js/jquery.min.js"></script>
-		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/bootstrap.min.css">
-		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/font/css/font-awesome.min.css">
-		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
-		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
-	</head>
-	<body>
-		{dede:include filename='top.htm'/}
-		{dede:include filename='head.htm'/}
-		<div class="container py-3">
-			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								<li class="breadcrumb-item"><a href="{dede:global.cfg_cmsurl/}/">首页</a></li>
-								<li class="breadcrumb-item">{dede:field name='title'/}</li>
-							</ol>
-						</nav>
-					</div>
-				</div>
-			</div>
-		</div>
-		<main class="container py-3">
-			<div class="row">
-				<div class="col-12 article-main">
-					<h2>{dede:field.title/}</h2>
-					<div class="py-3">{dede:field.body/}</div>
-					<ul class="pagination justify-content-center py-3">{dede:pagebreak/}</ul>
-				</div>
-			</div>
-		</main>
-		{dede:include filename='foot.htm'/}
-	</body>
-</html>

src/theme/dedebiz/tag.htm

@@ -14,61 +14,35 @@
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 		<style>.tags{padding-top:10px}.tags a{float:left;margin:5px 10px}.tagc1{color:darkolivegreen}.tagc2{color:blue}.tagc3{color:blueviolet}.tagc4{color:brown}.tagc5{color:cadetblue}.tagc6{color:green}.tagc7{color:coral}.tagc8{color:cornflowerblue}.tagc9{color:black}</style>
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								<li class="breadcrumb-item">标签页</li>
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							<li class="breadcrumb-item">标签页</li>
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
-		<main class="container mb-3">
+		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-12 list-main">
-					<div class="card ddcard-normal">
-						<div class="card-header">
-							<div class="row">
-								<div class="col-8 caption"><span>最新标签</span></div>
-							</div>
-						</div>
-						<div class="tags">
-							{dede:tag row='120' sort='new'}
-							<a href="[field:link/]" class="tagc[field:highlight/]">[field:tag/]</a>
-							{/dede:tag}
-						</div>
+				<div class="col-md-12">
+					<div class="item-tag mb-3">
+						<h2 class="mb-3">最新标签</h2>
+						<div>{dede:tag row='120' sort='new'}<a href="[field:link/]" class="btn btn-outline-success btn-sm tagc[field:highlight/]">[field:tag/]</a>{/dede:tag}</div>
 					</div>
-					<div class="card ddcard-normal mt-3">
-						<div class="card-header">
-							<div class="row">
-								<div class="col-8 caption"><span>当月热门标签</span></div>
-							</div>
-						</div>
-						<div class="tags">
-							{dede:tag row='120' sort='month'}
-							<a href="[field:link/]" class="tagc[field:highlight/]">[field:tag/]</a>
-							{/dede:tag}
-						</div>
+					<div class="item-tag mb-3">
+						<h2 class="mb-3">当月热门标签</h2>
+						<div>{dede:tag row='120' sort='month'}<a href="[field:link/]" class="btn btn-outline-warning btn-sm tagc[field:highlight/]">[field:tag/]</a>{/dede:tag}</div>
 					</div>
-					<div class="card ddcard-normal mt-3">
-						<div class="card-header">
-							<div class="row">
-								<div class="col-8 caption"><span>随机标签</span></div>
-							</div>
-						</div>
-						<div class="tags">
-							{dede:tag row='120' sort='rand'}
-							<a href="[field:link/]" class="tagc[field:highlight/]">[field:tag/]</a>
-							{/dede:tag}
-						</div>
+					<div class="item-tag">
+						<h2 class="mb-3">最新标签</h2>
+						<div>{dede:tag row='120' sort='rand'}<a href="[field:link/]" class="btn btn-outline-info btn-sm tagc[field:highlight/]">[field:tag/]</a>{/dede:tag}</div>
 					</div>
 				</div>
 			</div>

src/theme/dedebiz/taglist.htm

@@ -13,50 +13,55 @@
 		<link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/web/css/style.css">
 		<link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/web/img/favicon.ico">
 	</head>
-	<body>
+	<body class="body-bg">
 		{dede:include filename='top.htm'/}
 		{dede:include filename='head.htm'/}
 		<div class="container py-3">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="position rounded">
-						<nav aria-label="breadcrumb">
-							<ol class="breadcrumb">
-								<li class="breadcrumb-item">当前位置</li>
-								<li class="breadcrumb-item"><a href="{dede:field.position/}">标签云</a></li>
-								<li class="breadcrumb-item">{dede:field.title/}</li>
-							</ol>
-						</nav>
-					</div>
+				<div class="col-md-12">	
+					<nav aria-label="breadcrumb">
+						<ol class="breadcrumb mb-0">
+							<li class="breadcrumb-item">当前位置</li>
+							<li class="breadcrumb-item"><a href="{dede:field.position/}">标签云</a></li>
+							<li class="breadcrumb-item">{dede:field.title/}</li>
+						</ol>
+					</nav>
 				</div>
 			</div>
 		</div>
 		<main class="container py-3">
 			<div class="row">
-				<div class="col-md-9 list-main">
-					<ul class="list-unstyled items">
-						{dede:list pagesize='10'}
-						<li class="media border-bottom-dashed">
-							<div class="media-body row mt-2 py-2">
-								<div class="col-12 caption">
-									<a href="[field:arcurl/]"><h4 class="title">[field:code/] [field:title/]</h4></a>
-								</div>
-								<div class="col-12 description">
-									<a href="[field:arcurl/]">[field:description/]...</a>
-								</div>
-								<div class="col-12 source text-right">
-									<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-admin-img-xs">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
-									<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+				<div class="col-md-9 m-pb-2">
+					<div class="row">{dede:list pagesize='10'}
+						<div class="col-md-12 mb-3">
+							<div class="list-article mb-3">
+								<div class="list-article-body bg-white rounded shadow-sm p-3">
+									<h2 class="mb-3"><a href="[field:arcurl/]">[field:title/]</a></h2>
+									<div class="mb-3">
+										<span class="mr-3"><img src="[field:mid function='face(@me)'/]" class="user-img-xs mr-1">[field:mid function="GetMemberInfos('uname',@me)"/]</span>
+										<span><i class="fa fa-calendar mr-1"></i>[field:pubdate function="MyDate('Y-m-d',@me)"/]</span>
+									</div>
+									<p>[field:description function="cn_substr(@me,180)"/]...</p>
 								</div>
 							</div>
-						</li>
-						{/dede:list}
-					</ul>
-					<ul class="pagination justify-content-center py-3">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
+						</div>{/dede:list}
+					</div>
+					<ul class="pagination">{dede:pagelist listitem='info,index,end,pre,next,pageno' listsize='1'/}</ul>
 				</div>
 				<div class="col-md-3">
-					{dede:include comment='推荐文档' filename='widget_recommend.htm'/}
-					{dede:include comment='热点文档' filename='widget_hot.htm'/}
+					<div class="pb-3">
+						<div class="item-hot bg-white shadow-sm rounded p-3">
+							<form class="search" name="formsearch" action="{dede:global.cfg_cmsurl/}/apps/search.php">
+								<input type="hidden" name="kwtype" value="0">
+								<div class="input-group">
+									<input name="q" type="text" class="form-control" placeholder="请输入...">
+									<button type="submit" class="btn btn-success" style="border-radius:0 .2rem .2rem 0"><i class="fa fa-search"></i></button>
+								</div>
+							</form>
+						</div>
+					</div>
+					<div class="pb-3">{dede:include comment='热点文档' filename='widget_hot.htm'/}</div>
+					<div class="pb-3">{dede:include comment='推荐文档' filename='widget_recommend.htm'/}</div>
 				</div>
 			</div>
 		</main>

src/theme/dedebiz/top.htm

@@ -1,11 +1,11 @@
 <div class="site-nav bg-white shadow-sm rounded mb-3 py-3">
-    <div class="container">
-        <div class="row">
-            <div class="col-4 col-md-6 logo"><a href="/"><img src="/static/web/img/logo.png" alt="{dede:global.cfg_webname/}"></a></div>
-            <div class="col-8 col-md-6 text-right user-login" id="_login">
-                <a href="{dede:global.cfg_memberurl/}/login.php" class="btn btn-success btn-sm rounded-circle"><i class="fa fa-user-circle"></i></a>
-                <a href="{dede:global.cfg_memberurl/}/index_do.php?fmdo=user&dopost=regnew" class="btn btn-success btn-sm rounded-circle"><i class="fa fa-plus-circle"></i></a>
-            </div>
-        </div>
-    </div>
+	<div class="container">
+		<div class="row">
+			<div class="col-4 col-md-6 logo"><a href="/"><img src="/static/web/img/logo.png" alt="{dede:global.cfg_webname/}"></a></div>
+			<div class="col-8 col-md-6 text-right user-login" id="_login">
+				<a href="{dede:global.cfg_memberurl/}/login.php" class="btn btn-success btn-sm rounded-circle"><i class="fa fa-user-circle"></i></a>
+				<a href="{dede:global.cfg_memberurl/}/index_do.php?fmdo=user&dopost=regnew" class="btn btn-success btn-sm rounded-circle"><i class="fa fa-plus-circle"></i></a>
+			</div>
+		</div>
+	</div>
 </div>

src/theme/dedebiz/widget_article_digg.htm

@@ -1,72 +0,0 @@
-{dede:comment text='顶踩模块'/}
-<div class="row justify-content-center digg py-3">
-    <div class="comment-container mb-3" onclick="javascript:PostDigg('good',{dede:field.id/})">
-        <div class="comment-top">
-            <i class="fa fa-thumbs-o-up"></i> 
-            <p class="comment-top-text">顶一下[<span id="goodpost">{dede:field.goodpost/}</span>]</p>
-        </div>
-        <div class="progress" style="height: 10px;">
-            <div class="progress-bar" role="progressbar" id="goodper" style="width:{dede:field.goodper/}%" aria-valuenow="{dede:field.goodper/}" aria-valuemin="0" aria-valuemax="100"></div>
-        </div>
-    </div>
-    <div class="comment-container mb-3" onclick="javascript:PostDigg('bad',{dede:field.id/})">
-        <div class="comment-top">
-            <i class="fa fa-thumbs-o-down"></i> 
-            <p class="comment-top-text-danger">踩一下[<span id="badpost">{dede:field.badpost/}</span>]</p>
-        </div>
-        <div class="progress" style="height: 10px;">
-            <div class="progress-bar bg-danger" role="progressbar" id="badper" style="width:{dede:field.badper/}%" aria-valuenow="{dede:field.badper/}" aria-valuemin="0" aria-valuemax="100"></div>
-        </div>
-    </div>
-</div>
-<script>
-    //获取顶踩数据
-    function GetDigg(aid,cid) {
-        let url = `{dede:global.cfg_phpurl/}/digg_ajax.php?id=${aid}&cid=${cid}&format=json`;
-        $.get(url, function (data) {
-            let reval = JSON.parse(data);
-            if (reval.code === 200) {
-                $("#goodpost").html(reval.data.goodpost);
-                $("#badpost").html(reval.data.badpost);
-                $("#goodper").css("width", `${reval.data.goodper}%`)
-                $("#badper").css("width", `${reval.data.badper}%`)
-            }
-        })
-    }
-    function PostDigg(ftype, aid) {
-        var saveid = GetCookie('diggid');
-        if (saveid != null) {
-            var saveids = saveid.split(',');
-            var hasid = false;
-            saveid = '';
-            j = 1;
-            for (i = saveids.length - 1; i >= 0; i--) {
-                if (saveids[i] == aid && hasid) continue;
-                else {
-                    if (saveids[i] == aid && !hasid) hasid = true;
-                    saveid += (saveid == '' ? saveids[i] : ',' + saveids[i]);
-                    j++;
-                    if (j == 20 && hasid) break;
-                    if (j == 19 && !hasid) break;
-                }
-            }
-            if (hasid) { ShowMsg("您已经顶过该帖，请不要重复顶帖 "); return; }
-            else saveid += ',' + aid;
-            SetCookie('diggid', saveid, 1);
-        }
-        else {
-            SetCookie('diggid', aid, 1);
-        }
-        let url = "{dede:global.cfg_phpurl/}/digg_ajax.php?action=" + ftype + "&id=" + aid + "&format=json&cid={dede:field.channel/}";
-        $.get(url, function (data) {
-            let reval = JSON.parse(data);
-            if (reval.code === 200) {
-                $("#goodpost").html(reval.data.goodpost);
-                $("#badpost").html(reval.data.badpost);
-                $("#goodper").css("width", `${reval.data.goodper}%`)
-                $("#badper").css("width", `${reval.data.badper}%`)
-            }
-        });
-    }
-    GetDigg("{dede:field.id/}", "{dede:field.channel/}");
-</script>

src/theme/dedebiz/widget_article_feedback.htm

@@ -1,10 +1,9 @@
 {dede:comment text='文档评论模块'/}
-<style>.feedbacks .face{width:40px;height:40px;border-radius:50%;border:solid 1px #ccc}.feedbacks .media{border-bottom:solid 1px #ccc;padding-top:10px}.feedbacks .feedback_replies .media{border-top:solid 1px #ccc;border-bottom:0}.feedbacks .media-body{padding:0 1rem 1rem 1rem}.feedbacks .media-body small{color:#999}.feedbacks .feedback-action{float:right}.feedbacks ._feedback_reply .alert{margin-bottom:0}@media only screen and (max-width:576px){.feedbacks .feedback-action{float:none}}</style>
-<div class="comment py-3">
+<div class="comment pt-3">
 	<h4>发表评论</h4>
 	<div id="feedback-alert"></div>
 	<div class="content mb-3"><textarea cols="60" id="iptMsg" name="msg" rows="5" class="form-control" placeholder="请输入..." required></textarea></div>
-	<div class="post mb-3">
+	<div class="post">
 		<div class="dcmp-userinfo" id="_ajax_feedback">
 			<div class="form-group form-row">
 				<div class="col-md-6">
@@ -104,15 +103,15 @@
 				<button type="button" class="btn btn-success btnSend ml-2" onClick='SendReplyFeedback(${fid})'>评论</button>
 			</div>
 		</div>`;
-        $.get("{dede:global.cfg_cmsurl/}/user/api.php?format=json", function(result) {
-            if (result.code !== 200) {
+		$.get("{dede:global.cfg_cmsurl/}/user/api.php?format=json", function(result) {
+			if (result.code !== 200) {
 				$(`._feedback_reply`).html("");
 				ShowAlert(`._feedback_reply[for="${fid}"]`, 
 				'回复需要登录会员中心，您可以<a href="{dede:global.cfg_cmsurl/}/user/login.php">点击登录</a>后再来回复', 'warning', 5000);
-            } else {
+			} else {
 				$(`._feedback_reply`).html("");
 				$(`._feedback_reply[for="${fid}"]`).html(replyPannel);
-            }
+			}
 		});
 		$(`._feedback_reply[for="${fid}"]`).html('<i class="fa fa-spinner fa-spin"></i> ');
 	}

src/theme/dedebiz/widget_article_likes.htm

@@ -0,0 +1,72 @@
+{dede:comment text='顶踩模块'/}
+<div class="row justify-content-center digg py-3">
+	<div class="comment-container" onclick="javascript:PostDigg('good',{dede:field.id/})">
+		<div class="comment-top">
+			<i class="fa fa-thumbs-o-up"></i> 
+			<p class="comment-top-text">顶一下[<span id="goodpost">{dede:field.goodpost/}</span>]</p>
+		</div>
+		<div class="progress" style="height: 10px;">
+			<div class="progress-bar" role="progressbar" id="goodper" style="width:{dede:field.goodper/}%" aria-valuenow="{dede:field.goodper/}" aria-valuemin="0" aria-valuemax="100"></div>
+		</div>
+	</div>
+	<div class="comment-container" onclick="javascript:PostDigg('bad',{dede:field.id/})">
+		<div class="comment-top">
+			<i class="fa fa-thumbs-o-down"></i> 
+			<p class="comment-top-text-danger">踩一下[<span id="badpost">{dede:field.badpost/}</span>]</p>
+		</div>
+		<div class="progress" style="height: 10px;">
+			<div class="progress-bar bg-danger" role="progressbar" id="badper" style="width:{dede:field.badper/}%" aria-valuenow="{dede:field.badper/}" aria-valuemin="0" aria-valuemax="100"></div>
+		</div>
+	</div>
+</div>
+<script>
+	//获取顶踩数据
+	function GetDigg(aid,cid) {
+		let url = `{dede:global.cfg_phpurl/}/digg_ajax.php?id=${aid}&cid=${cid}&format=json`;
+		$.get(url, function (data) {
+			let reval = JSON.parse(data);
+			if (reval.code === 200) {
+				$("#goodpost").html(reval.data.goodpost);
+				$("#badpost").html(reval.data.badpost);
+				$("#goodper").css("width", `${reval.data.goodper}%`)
+				$("#badper").css("width", `${reval.data.badper}%`)
+			}
+		})
+	}
+	function PostDigg(ftype, aid) {
+		var saveid = GetCookie('diggid');
+		if (saveid != null) {
+			var saveids = saveid.split(',');
+			var hasid = false;
+			saveid = '';
+			j = 1;
+			for (i = saveids.length - 1; i >= 0; i--) {
+				if (saveids[i] == aid && hasid) continue;
+				else {
+					if (saveids[i] == aid && !hasid) hasid = true;
+					saveid += (saveid == '' ? saveids[i] : ',' + saveids[i]);
+					j++;
+					if (j == 20 && hasid) break;
+					if (j == 19 && !hasid) break;
+				}
+			}
+			if (hasid) { ShowMsg("您已经顶过该帖，请不要重复顶帖 "); return; }
+			else saveid += ',' + aid;
+			SetCookie('diggid', saveid, 1);
+		}
+		else {
+			SetCookie('diggid', aid, 1);
+		}
+		let url = "{dede:global.cfg_phpurl/}/digg_ajax.php?action=" + ftype + "&id=" + aid + "&format=json&cid={dede:field.channel/}";
+		$.get(url, function (data) {
+			let reval = JSON.parse(data);
+			if (reval.code === 200) {
+				$("#goodpost").html(reval.data.goodpost);
+				$("#badpost").html(reval.data.badpost);
+				$("#goodper").css("width", `${reval.data.goodper}%`)
+				$("#badper").css("width", `${reval.data.badper}%`)
+			}
+		});
+	}
+	GetDigg("{dede:field.id/}", "{dede:field.channel/}");
+</script>

src/theme/dedebiz/widget_channels.htm

@@ -1,12 +0,0 @@
-<div class="card ddcard py-3">
-    <div class="card-header">
-        <div class="row">
-            <div class="col-md-12 caption"><span>栏目列表</span></div>
-        </div>
-    </div>
-    <ul class="list-group list-group-flush">
-        {dede:channel type='son' currentstyle="<li><a href='~typelink~' class='active'>~typename~</a></li>"}
-        <li><a href="[field:typeurl/]" title="[field:typename/]">[field:typename/]</a></li>
-        {/dede:channel}
-    </ul>
-</div>

src/theme/dedebiz/widget_hot.htm

@@ -1,12 +1,6 @@
-<div class="card ddcard py-3">
-    <div class="card-header">
-        <div class="row">
-            <div class="col-md-12 caption"><span>热点文档</span></div>
-        </div>
-    </div>
-    <ul class="list-group list-group-flush">
-        {dede:arclist orderby='click' titlelen='42' row='10'}
-        <li><a href="[field:arcurl/]" title="[field:fulltitle/]">[field:title/]</a></li>
-        {/dede:arclist}
-    </ul>
+<div class="item-article bg-white shadow-sm rounded p-3">
+	<h2 class="mb-3">热门头条</h2>
+	<ul>{dede:arclist row='10' titlelen='120' orderby='rand'}
+		<li>[field:global.autoindex/].<a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a></li>{/dede:arclist}
+	</ul>
 </div>

src/theme/dedebiz/widget_hot_sg.htm

@@ -1,12 +0,0 @@
-<div class="card ddcard py-3">
-    <div class="card-header">
-        <div class="row">
-            <div class="col-md-12 caption"><span>热点文档</span></div>
-        </div>
-    </div>
-    <ul class="list-group list-group-flush">
-        {dede:arclistsg orderby='click' titlelen='42' row='10'}
-        <li><a href="[field:arcurl/]" title="[field:fulltitle/]">[field:title/]</a></li>
-        {/dede:arclistsg}
-    </ul>
-</div>

src/theme/dedebiz/widget_menu.htm

@@ -0,0 +1,6 @@
+<div class="item-article bg-white shadow-sm rounded p-3">
+	<h2 class="mb-3">推荐栏目</h2>
+	<ul>{dede:channelartlist typeid='top'}
+		<li><a href="{dede:field.typeurl/}">{dede:field.typename/}</a></li>{/dede:channelartlist}
+	</ul>
+</div>

src/theme/dedebiz/widget_recommend.htm

@@ -1,12 +1,6 @@
-<div class="card ddcard py-3">
-    <div class="card-header">
-        <div class="row">
-            <div class="col-md-12 caption"><span>推荐文档</span></div>
-        </div>
-    </div>
-    <ul class="list-group list-group-flush">
-        {dede:arclist flag='c' titlelen='42' row='10'}
-        <li><a href="[field:arcurl/]" title="[field:fulltitle/]">[field:title/]</a></li>
-        {/dede:arclist}
-    </ul>
+<div class="item-article bg-white shadow-sm rounded p-3">
+	<h2 class="mb-3">推荐文档</h2>
+	<ul>{dede:arclist row='10' titlelen='120' orderby='rand'}
+		<li>[field:global.autoindex/].<a title="[field:fulltitle/]" href="[field:arcurl/]">[field:title/]</a></li>{/dede:arclist}
+	</ul>
 </div>

src/theme/dedebiz/widget_recommend_sg.htm

@@ -1,12 +0,0 @@
-<div class="card ddcard py-3">
-    <div class="card-header">
-        <div class="row">
-            <div class="col-md-12 caption"><span>推荐文档</span></div>
-        </div>
-    </div>
-    <ul class="list-group list-group-flush">
-        {dede:arclistsg flag='c' titlelen='42' row='10'}
-        <li><a href="[field:arcurl/]" title="[field:fulltitle/]">[field:title/]</a></li>
-        {/dede:arclistsg}
-    </ul>
-</div>

src/theme/dedebiz/widget_vote.htm

@@ -1,8 +1,4 @@
-<div class="card ddcard py-3">
-    <div class="card-header">
-        <div class="row">
-            <div class="col-md-12 caption"><span>投票</span></div>
-        </div>
-    </div>
-    {dede:vote id='1' line tablewidth='100%' titlebgcolor='#EDEDE2' titlebackground='' tablebgcolor='#ffffff'}{/dede:vote}
+<div class="item-vote bg-white shadow-sm rounded p-3">
+	<h2 class="mb-3">投票</h2>
+	{dede:vote id='1' line tablewidth='100%' titlebgcolor='#EDEDE2' titlebackground='' tablebgcolor='#ffffff'}{/dede:vote}
 </div>

src/user/inc/inc_list_functions.php

@@ -39,7 +39,7 @@ function IsCommendArchives($iscommend)
 function GetCommendTitle($title, $iscommend)
 {
     if (preg_match('/c/', $iscommend)) {
-        $title = '$title <span class="btn btn-outline-success btn-sm">推荐</span>';
+        $title = '$title <span class="btn btn-success btn-sm">推荐</span>';
     }
     return '$title';
 }
@@ -83,11 +83,11 @@ function CheckPic($picname)
 function IsHtmlArchives($ismake)
 {
     if ($ismake == 1) {
-        return ' <span class="btn btn-outline-warning btn-sm">已生成</span>';
+        return ' <span class="btn btn-warning btn-sm">已生成</span>';
     } else if ($ismake == -1) {
-        return ' <span class="btn btn-outline-warning btn-sm">仅动态</span>';
+        return ' <span class="btn btn-warning btn-sm">仅动态</span>';
     } else {
-        return ' <span class="btn btn-outline-danger btn-sm">未生成</span>';
+        return ' <span class="btn btn-danger btn-sm">未生成</span>';
     }
 }
 /**
@@ -121,7 +121,7 @@ function GetRankName($arcrank)
 function IsPicArchives($flag)
 {
     if (strtolower($flag)== "p") {
-        return ' <span class="btn btn-outline-success btn-sm">图片</span>';
+        return ' <span class="btn btn-light btn-sm">图片</span>';
     } else {
         return '';
     }

src/user/templets/content_list.htm

@@ -60,8 +60,6 @@
 											<a href="javascript:editArc(<?php echo $fields['id']?>,<?php echo $fields['channel']?>);" class="btn btn-success btn-sm">修改</a>
 											<a href="javascript:delArc(<?php echo $fields['id']?>);" class="btn btn-danger btn-sm">删除</a>
 											<?php
-											} else {
-												echo "<span class='btn btn-sm'>无操作</span>";
 											}
 											?>
 										</td>

src/user/templets/edit_baseinfo.htm

@@ -41,7 +41,7 @@
 							<label class="col-sm-3 col-form-label">修改头像：</label>
 							<div class="col-sm-9">
 								<input id="iptNewface" type="file" name="iptNewface" class="d-none">
-								<img id="face" src="<?php echo empty($row['face'])? $cfg_staticurl.'/web/img/admin.png' : $row['face'];?>" class="user-edit-img mr-3">
+								<img id="face" src="<?php echo empty($row['face'])? $cfg_staticurl.'/web/img/admin.png' : $row['face'];?>" class="user-img-sm mr-3">
 								<span class="btn btn-success btn-sm" id="btnChangeFace">修改头像</span>
 							</div>
 						</div>

src/user/templets/index.htm

@@ -22,7 +22,7 @@
 						<div class="pannel-main-container shadow-sm rounded">
 							<div class="media-body row">
 								<div class="col-12 text-center">
-									<img src="<?php echo $cfg_ml->fields['face'];?>" title="<?php echo $cfg_ml->M_LoginID;?>" class="user-admin-img">
+									<img src="<?php echo $cfg_ml->fields['face'];?>" title="<?php echo $cfg_ml->M_LoginID;?>" class="user-img-md">
 									<div class="my-3">
 										<h3 class="d-inline-block mr-2" style="vertical-align:middle"><?php echo $cfg_ml->M_UserName;?></h3>
 										<span class="btn btn-outline-success btn-sm"><?php echo $cfg_ml->GetMemberTypeName();?></span>
@@ -65,17 +65,15 @@
 							</div>
 						</div>
 					</div>
-					<div class="py-3">
+					<div class="pt-3">
 						<div class="pannel-main-container shadow-sm rounded">
-							<div class="media-body">
-								<h4>最新文档</h4>
-								<div class="card ddcard">
-									<ul class="list-group list-group-flush">
-										<?php foreach ($archives as $archive) {?>
-										<li><a href="<?php echo $archive['htmlurl'];?>" title="<?php echo $archive['title'];?>"><?php echo $archive['title'];?></a></li>
-										<?php }?>
-									</ul>
-								</div>
+							<div class="media-body item-article">
+								<h4 class="mb-3">最新文档</h4>
+								<ul>
+									<?php foreach ($archives as $archive) {?>
+									<li><a href="<?php echo $archive['htmlurl'];?>" title="<?php echo $archive['title'];?>"><?php echo $archive['title'];?></a></li>
+									<?php }?>
+								</ul>
 							</div>
 						</div>
 					</div>

src/user/templets/menu.htm

@@ -2,50 +2,50 @@
 $dsql->Execute('addmod', "SELECT id,nid,typename,useraddcon,usermancon,issend,issystem,usertype,isshow FROM `#@__channeltype`");
 $channels = array();
 while ($channel = $dsql->GetArray('addmod')) {
-    $channels[$channel['id']] = $channel;
+	$channels[$channel['id']] = $channel;
 }
 ?>
 <div class="col-md-3 m-pb-2">
-    <ul class="list-group list-group-flush shadow-sm rounded">
-        <li class="list-group-item justify-content-between align-items-center rounded <?php echo (isset($_menu_home) && $_menu_home===true)? ' active' : '';?>"><a href="<?php echo $cfg_memberurl;?>/">会员面板</a></li>
-         <li class="list-group-item justify-content-between align-items-center">
-            <div data-toggle="collapse" data-target="#collapseMessage">消息管理<span class="badge badge-warning badge-pill ml-2"><?php echo $pms['nums'];?></span><span class="dropdown ml-2"></span></div>
-            <div id="collapseMessage" class="mt-3 collapse<?php echo (isset($_menu_pmex) && $_menu_pmex===true)? ' show' : '';?>">
-                <ul class="list-group list-group-flush">
-                    <li class="list-group-item justify-content-between align-items-center rounded <?php if (isset($_menu_pmstate) && $_menu_pmstate === 0) echo 'active';?>"><a href="<?php echo $cfg_memberurl;?>/pm.php?folder=inbox">全部</a></li>
-                    <li class="list-group-item justify-content-between align-items-center rounded <?php if (isset($_menu_pmstate) && $_menu_pmstate === 1) echo 'active';?>"><a href="<?php echo $cfg_memberurl;?>/pm.php?folder=inbox&state=1">已读</a></li>
-                    <li class="list-group-item justify-content-between align-items-center rounded <?php if (isset($_menu_pmstate) && $_menu_pmstate === -1) echo 'active';?>"><a href="<?php echo $cfg_memberurl;?>/pm.php?folder=inbox&state=-1">未读</a></li>
-                </ul>
-            </div>
-        </li>
-        <li class="list-group-item justify-content-between align-items-center">
-            <div data-toggle="collapse" data-target="#collapseArchives">我的文档<span class="dropdown ml-2"></span>
-            </div>
-            <div id="collapseArchives" class="collapse mt-3<?php echo (isset($_menu_conex) && $_menu_conex===true)? ' show' : '';?>">
-                <ul class="list-group list-group-flush">
-                    <?php foreach($channels as $chid => $channel) {?>
-                    <?php if(!in_array($chid,$enabledChannels)) continue;?>
-                        <?php $channel['usermancon'] = empty($channel['usermancon'])? "content_list.php" : $channel['usermancon'];?>
-                        <?php if ($channel['issend'] == 1) {?>
-                        <li class="list-group-item justify-content-between align-items-center rounded <?php if (isset($_menu_conex) && $channelid == $channel['id']) echo 'active';?>">
-                            <a href="<?php echo $cfg_memberurl;?>/<?php echo $channel['usermancon'];?>?channelid=<?php echo $channel['id'];?>"><?php echo $channel['typename'];?></a>
-                        </li>
-                        <?php }?>
-                    <?php }?>
-                </ul>
-            </div>
-        </li>
-        <li class="list-group-item justify-content-between align-items-center rounded <?php echo (isset($_menu_stow) && $_menu_stow===true)? ' active' : '';?>"><a href="<?php echo $cfg_memberurl;?>/mystow.php">我的收藏</a></li>
-        <li class="list-group-item justify-content-between align-items-center <?php echo (isset($_menu_buy) && $_menu_buy===true)? ' active' : '';?>"><a href="<?php echo $cfg_memberurl;?>/buy.php">积分钱包</a></li>
-        <li class="list-group-item justify-content-between align-items-center">
-            <div data-toggle="collapse" data-target="#collapseOrder">订单详情<span class="dropdown ml-2"></span></div>
-            <div id="collapseOrder" class="collapse mt-3<?php echo (isset($_menu_order) && $_menu_order===true)? ' show' : '';?>">
-                <ul class="list-group list-group-flush">
-                    <li class="list-group-item justify-content-between align-items-center rounded <?php if (isset($_menu_orderstate) && $_menu_orderstate === 0) echo 'active';?>"><a href="<?php echo $cfg_memberurl;?>/mypay.php">购买文档</a></li>
-                    <li class="list-group-item justify-content-between align-items-center rounded <?php if (isset($_menu_orderstate) && $_menu_orderstate === 2) echo 'active';?>"><a href="<?php echo $cfg_memberurl;?>/operation.php">金币订单</a></li>
-                </ul>
-            </div>
-        </li>
-        <li class="list-group-item justify-content-between align-items-center rounded <?php if (isset($_menu_edtitem) && $_menu_edtitem === 'base') echo 'active';?>"><a href="<?php echo $cfg_memberurl;?>/edit_baseinfo.php">资料修改</a></li>
-    </ul>
+	<ul class="list-group list-group-flush shadow-sm rounded">
+		<li class="list-group-item justify-content-between align-items-center rounded <?php echo (isset($_menu_home) && $_menu_home===true)? ' active' : '';?>"><a href="<?php echo $cfg_memberurl;?>/">会员面板</a></li>
+		 <li class="list-group-item justify-content-between align-items-center">
+			<div data-toggle="collapse" data-target="#collapseMessage">消息管理<span class="badge badge-warning badge-pill ml-2"><?php echo $pms['nums'];?></span><span class="fa fa-angle-down ml-2"></span></div>
+			<div id="collapseMessage" class="mt-3 collapse<?php echo (isset($_menu_pmex) && $_menu_pmex===true)? ' show' : '';?>">
+				<ul class="list-group list-group-flush">
+					<li class="list-group-item justify-content-between align-items-center rounded <?php if (isset($_menu_pmstate) && $_menu_pmstate === 0) echo 'active';?>"><a href="<?php echo $cfg_memberurl;?>/pm.php?folder=inbox">全部</a></li>
+					<li class="list-group-item justify-content-between align-items-center rounded <?php if (isset($_menu_pmstate) && $_menu_pmstate === 1) echo 'active';?>"><a href="<?php echo $cfg_memberurl;?>/pm.php?folder=inbox&state=1">已读</a></li>
+					<li class="list-group-item justify-content-between align-items-center rounded <?php if (isset($_menu_pmstate) && $_menu_pmstate === -1) echo 'active';?>"><a href="<?php echo $cfg_memberurl;?>/pm.php?folder=inbox&state=-1">未读</a></li>
+				</ul>
+			</div>
+		</li>
+		<li class="list-group-item justify-content-between align-items-center">
+			<div data-toggle="collapse" data-target="#collapseArchives">我的文档<span class="fa fa-angle-down ml-2"></span>
+			</div>
+			<div id="collapseArchives" class="collapse mt-3<?php echo (isset($_menu_conex) && $_menu_conex===true)? ' show' : '';?>">
+				<ul class="list-group list-group-flush">
+					<?php foreach($channels as $chid => $channel) {?>
+					<?php if(!in_array($chid,$enabledChannels)) continue;?>
+						<?php $channel['usermancon'] = empty($channel['usermancon'])? "content_list.php" : $channel['usermancon'];?>
+						<?php if ($channel['issend'] == 1) {?>
+						<li class="list-group-item justify-content-between align-items-center rounded <?php if (isset($_menu_conex) && $channelid == $channel['id']) echo 'active';?>">
+							<a href="<?php echo $cfg_memberurl;?>/<?php echo $channel['usermancon'];?>?channelid=<?php echo $channel['id'];?>"><?php echo $channel['typename'];?></a>
+						</li>
+						<?php }?>
+					<?php }?>
+				</ul>
+			</div>
+		</li>
+		<li class="list-group-item justify-content-between align-items-center rounded <?php echo (isset($_menu_stow) && $_menu_stow===true)? ' active' : '';?>"><a href="<?php echo $cfg_memberurl;?>/mystow.php">我的收藏</a></li>
+		<li class="list-group-item justify-content-between align-items-center <?php echo (isset($_menu_buy) && $_menu_buy===true)? ' active' : '';?>"><a href="<?php echo $cfg_memberurl;?>/buy.php">积分钱包</a></li>
+		<li class="list-group-item justify-content-between align-items-center">
+			<div data-toggle="collapse" data-target="#collapseOrder">订单详情<span class="fa fa-angle-down ml-2"></span></div>
+			<div id="collapseOrder" class="collapse mt-3<?php echo (isset($_menu_order) && $_menu_order===true)? ' show' : '';?>">
+				<ul class="list-group list-group-flush">
+					<li class="list-group-item justify-content-between align-items-center rounded <?php if (isset($_menu_orderstate) && $_menu_orderstate === 0) echo 'active';?>"><a href="<?php echo $cfg_memberurl;?>/mypay.php">购买文档</a></li>
+					<li class="list-group-item justify-content-between align-items-center rounded <?php if (isset($_menu_orderstate) && $_menu_orderstate === 2) echo 'active';?>"><a href="<?php echo $cfg_memberurl;?>/operation.php">金币订单</a></li>
+				</ul>
+			</div>
+		</li>
+		<li class="list-group-item justify-content-between align-items-center rounded <?php if (isset($_menu_edtitem) && $_menu_edtitem === 'base') echo 'active';?>"><a href="<?php echo $cfg_memberurl;?>/edit_baseinfo.php">资料修改</a></li>
+	</ul>
 </div>

src/user/templets/operation.htm

@@ -25,11 +25,11 @@
 								<thead>
 									<tr>
 										<th width="8%">选择</th>
-				                        <th width="16%">订单号</th>
-				                        <th>产品</th>
-				                        <th width="16%">信息</th>
-				                        <th width="12%">状态</th>
-				                        <th width="16%">时间</th>
+										<th width="16%">订单号</th>
+										<th>产品</th>
+										<th width="16%">信息</th>
+										<th width="12%">状态</th>
+										<th width="16%">时间</th>
 									</tr>
 								</thead>
 								<tbody>
@@ -38,11 +38,11 @@
 										{dede:datalist}
 										<tr>
 											<td><input type="checkbox" name="deleteid" value="{dede:field.aid/}"></td>
-						                    <td>{dede:field.buyid/}</td>
-						                    <td><?php echo $fields['pname']; ?></td>
-						                    <td><?php echo $fields['oldinfo']; ?></td>
-						                    <td>{dede:field.sta function="GetSta(@me)"/}</td>
-						                    <td>{dede:field.mtime function="GetDateMk(@me)"/}</td>
+											<td>{dede:field.buyid/}</td>
+											<td><?php echo $fields['pname']; ?></td>
+											<td><?php echo $fields['oldinfo']; ?></td>
+											<td>{dede:field.sta function="GetSta(@me)"/}</td>
+											<td>{dede:field.mtime function="GetDateMk(@me)"/}</td>
 										</tr>
 										{/dede:datalist}
 										<tr>

src/user/templets/widget_litpic.htm

@@ -1,28 +1,28 @@
 <script>
-    $(document).ready(function () {
-        $("#btnUploadLitpic").click(function(){
-            $("#iptLitpic").click();
-        })
-        $("#iptLitpic").change(function (val) {
-            var formData = new FormData();
-            var fileData = $('#iptLitpic')[0].files[0];
-            formData.append('file', fileData);
-            $.ajax({
-                url: '<?php echo $cfg_cmsurl;?>/user/api.php?action=upload&type=litpic',
-                type: 'POST',
-                data: formData,
-                processData: false,
-                contentType: false,
-                success: function (result) {
-                    if (result.code === 0) {
-                        $("#imgLitpic").attr('src', result.data);
-                        $("#litpic").val(result.data);
-                    }
-                },
-                error: function (xhr, status, error) {
-                    ShowMsg("文件上传失败");//处理上传失败后的回调
-                }
-            });
-        });
-    });
+	$(document).ready(function () {
+		$("#btnUploadLitpic").click(function(){
+			$("#iptLitpic").click();
+		})
+		$("#iptLitpic").change(function (val) {
+			var formData = new FormData();
+			var fileData = $('#iptLitpic')[0].files[0];
+			formData.append('file', fileData);
+			$.ajax({
+				url: '<?php echo $cfg_cmsurl;?>/user/api.php?action=upload&type=litpic',
+				type: 'POST',
+				data: formData,
+				processData: false,
+				contentType: false,
+				success: function (result) {
+					if (result.code === 0) {
+						$("#imgLitpic").attr('src', result.data);
+						$("#litpic").val(result.data);
+					}
+				},
+				error: function (xhr, status, error) {
+					ShowMsg("文件上传失败");//处理上传失败后的回调
+				}
+			});
+		});
+	});
 </script>