From d0f5e136ee03c683fbfe61c7e29788e54c861ee8 Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Wed, 16 Nov 2022 10:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=87=E7=AB=A0=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/admin/edit_password.html |  2 +-
 app/admin/view/article/read.html        | 92 ++++++++++++++++---------
 2 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/app/admin/view/admin/edit_password.html b/app/admin/view/admin/edit_password.html
index fc8aa77..d4b4642 100644
--- a/app/admin/view/admin/edit_password.html
+++ b/app/admin/view/admin/edit_password.html
@@ -48,7 +48,7 @@
         if (e.code == 0) {
 			setTimeout(function(){
 				tool.tabClose();
-			},2000);			
+			},2000);
         }
       }
       tool.post("/admin/api/password_submit", data.field, callback);
diff --git a/app/admin/view/article/read.html b/app/admin/view/article/read.html
index a08dd47..e9f74c0 100644
--- a/app/admin/view/article/read.html
+++ b/app/admin/view/article/read.html
@@ -1,48 +1,74 @@
 {extend name="common/base"/}
+{block name="style"}
+<style>
+.content-article img{max-width:88%!important; height:auto!important; margin:6px 0!important; border-radius:4px;}
+</style>
+{/block}
 <!-- 主体 -->
 {block name="body"}
 <div class="layui-form p-4">
-	<h3 class="pb-3">文章表详情</h3>
+	<h3 class="pb-3">文章详情</h3>
 	<table class="layui-table layui-table-form">
-		<tr><td class="layui-td-gray-2">所属分类</td>
+		<tr>
+			<td class="layui-td-gray">文章标题</td>
+			<td colspan="3">{$detail.title}</td>
+			<td class="layui-td-gray">所属分类</td>
 			<td>
-			{eq name="$detail.cate_id" value="1"}选项一{/eq}
-			{eq name="$detail.cate_id" value="2"}选项二{/eq}
-			</td><td class="layui-td-gray-2">文章标题</td>
-			<td>{$detail.title}</td><td class="layui-td-gray-2">关键字</td>
-			<td>{$detail.keywords}</td>
-		</tr><tr><td class="layui-td-gray-2">是否原创</td>
+			{volist name=":set_recursion(get_article_cate())" id="v"}
+				{eq name="$detail.cate_id" value="$v.id" }{$v.title}{/eq}
+			{/volist}
+			</td>
+		</tr>
+		<tr>
+			<td class="layui-td-gray">关键字</td>
+			<td colspan="3">{$detail.keyword_names}</td>
+			<td class="layui-td-gray">文章属性</td>
 			<td>
-				{eq name="$detail.original" value="1"}选项一{/eq}
-				{eq name="$detail.original" value="2"}选项二{/eq}
-			</td><td class="layui-td-gray-2">来源或作者</td>
-			<td>{$detail.origin}</td><td class="layui-td-gray-2">来源地址</td>
+			{eq name="$detail.type" value="1"}精华{/eq}
+			{eq name="$detail.type" value="2"}热门{/eq}
+			{eq name="$detail.type" value="3"}推荐{/eq}
+			</td>
+		</tr>
+		<tr>
+			<td class="layui-td-gray">是否原创</td>
+			<td>
+				{eq name="$detail.original" value="1"}是{/eq}
+				{eq name="$detail.original" value="0"}否{/eq}
+			</td>
+			<td class="layui-td-gray-2">来源或作者</td>
+			<td>{$detail.origin}</td>
+			<td class="layui-td-gray">来源地址</td>
 			<td>{$detail.origin_url}</td>
-		</tr><tr><td class="layui-td-gray-2">阅读量</td>
-			<td>{$detail.read}</td><td class="layui-td-gray-2">文章属性</td>
+		</tr>
+		<tr>			
+			<td class="layui-td-gray">排序</td>
+			<td>{$detail.sort}</td>
+			<td class="layui-td-gray-2">是否首页显示</td>
 			<td>
-			{eq name="$detail.type" value="1"}选项一{/eq}
-			{eq name="$detail.type" value="2"}选项二{/eq}
-			</td><td class="layui-td-gray-2">是否首页显示</td>
-			<td>
-				{eq name="$detail.is_home" value="1"}选项一{/eq}
-				{eq name="$detail.is_home" value="2"}选项二{/eq}
+				{eq name="$detail.is_home" value="1"}是{/eq}
+				{eq name="$detail.is_home" value="0"}否{/eq}
 			</td>
-		</tr><tr><td class="layui-td-gray-2">排序</td>
-			<td>{$detail.sort}</td><td class="layui-td-gray-2">状态</td>
-			<td>
-				{eq name="$detail.status" value="1"}选项一{/eq}
-				{eq name="$detail.status" value="2"}选项二{/eq}
-			</td><td class="layui-td-gray-2">创建时间</td>
+			<td rowspan="3" class="layui-td-gray-2">缩略图</td>
+			<td rowspan="3">
+				<img src="{$detail.thumb}" onerror="javascript:this.src='{__GOUGU__}/gougu/images/nonepic600x360.jpg';this.onerror=null;" style="width:200px; max-width:200px" />
+			</td>
+		</tr>
+		<tr>
+			<td class="layui-td-gray">创建时间</td>
 			<td>{$detail.create_time}</td>
-		</tr><tr><td class="layui-td-gray-2">文章摘要</td>
-			<td colspan="5">{$detail.desc}</td>
-		</tr><tr><td class="layui-td-gray-2">缩略图</td>
-			<td colspan="5">
-				<img src="{$detail.thumb}" onerror="javascript:this.src='{__GOUGU__}/gougu/images/nonepic600x360.jpg';this.onerror=null;" width="100" style="width:200px; max-width:200px" />
+			<td class="layui-td-gray">状态</td>
+			<td>
+				{eq name="$detail.status" value="1"}正常{/eq}
+				{eq name="$detail.status" value="0"}下架{/eq}
 			</td>
-		</tr><tr><td class="layui-td-gray-2">文章内容</td>
-			<td colspan="5">
+		</tr>
+		<tr>
+			<td class="layui-td-gray">文章摘要</td>
+			<td colspan="3">{$detail.desc}</td>
+		</tr>
+		<tr>
+			<td class="layui-td-gray">文章内容</td>
+			<td colspan="5" class="content-article">
 				{$detail.content|raw}
 			</td>
 		</tr>