From ed9ddd2d67c79dfff924e3169088868f08e4f679 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Wed, 8 Jan 2020 17:28:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A3=80=E7=B4=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ArticleController.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/ArticleController.class.php b/Application/Admin/Controller/ArticleController.class.php
index 037e1d643..1a148ef3f 100644
--- a/Application/Admin/Controller/ArticleController.class.php
+++ b/Application/Admin/Controller/ArticleController.class.php
@@ -863,7 +863,7 @@ class ArticleController extends AdminController {
 			}
 		}
     
-    public function pop_rules($row = 10, $type = '', $tag = '', $p = 1)
+    public function pop_rules($row = 10, $p = 1)
     {
         $map = [];
         $map['_string'] = " 1=1 ";
@@ -873,8 +873,8 @@ class ArticleController extends AdminController {
         if (isset($_GET['time-end'])) {
             $map['_string']  .= " and operate_time < " . (strtotime($_GET['time-end']) + 86400);
         }
-        if (isset($type)) {
-            $map['type'] = $type;
+        if (isset($_GET['type'])) {
+            $map['type'] = $_GET['type'];
         }
         if (!empty($_GET['title'])) {
             $map['title'] = ['like', "%{$_GET['title']}%"];
@@ -890,7 +890,7 @@ class ArticleController extends AdminController {
                         $item['time_desc'] = date("Y-m-d", $item['pop_time']);
                         break;
                     case '2':
-                        $item['time_desc'] = "每周".$weekDes[$item['pop_time']];
+                        $item['time_desc'] = "每周".$weekDes[$item['pop_time']-1];
                         break;
                 }
             }