From 53b4913262d7ddbe363a77c830c084cc1d8e2820 Mon Sep 17 00:00:00 2001
From: zwesy <zwesy@qq.com>
Date: Mon, 7 Dec 2020 12:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E5=92=8C=E6=96=B0=E9=97=BB=E8=AF=A6=E6=83=85=E9=A1=B5=E7=9A=84?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=E9=93=BE=E6=8E=A5=EF=BC=9A?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=9D=A5=E6=BA=90=E6=A0=8F=E7=9B=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 view/article/news_detail.html | 2 +-
 view/article/product.html     | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/view/article/news_detail.html b/view/article/news_detail.html
index 9f34760..8fe510f 100644
--- a/view/article/news_detail.html
+++ b/view/article/news_detail.html
@@ -29,7 +29,7 @@
                     <a href="{:url('article/detail', ['id' => $next.id])}">下一篇</a>
                     {/if}
                 </p>
-                <a href="javascript:history.back(-1);" class="btns">返回</a>
+                <a href="{:url('article/index', ['category_id'=>$article['category_id']])}" class="btns">返回</a>
             </div>
         </div>
     </div>
diff --git a/view/article/product.html b/view/article/product.html
index 25fb5da..2d4e54c 100644
--- a/view/article/product.html
+++ b/view/article/product.html
@@ -31,7 +31,13 @@
                     <a href="{:url('article/detail', ['id' => $next.id, 'source'=>$currentCateId])}">下一篇</a>
                     {/if}
                 </p>
-                <a href="javascript:history.back(-1);" class="btns">返回</a>
+                {php}
+                    $backUrl = url('article/index', ['category_id'=>$currentCateId]);
+                    if($currentCateId != $topCategory['id']) {
+                        $backUrl = url('products.search', ['category_id'=>$currentCateId]);
+                    }
+                {/php}
+                <a href="{$backUrl}" class="btns">返回</a>
             </div>
         </div>
     </div>