From 8bb9af10e1a8c01248526448dedb839afe9cac2a Mon Sep 17 00:00:00 2001
From: caiyuzheng <290198252@qq.com>
Date: Thu, 29 Aug 2019 16:12:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E7=AB=A0=E5=AE=8C?=
 =?UTF-8?q?=E6=95=B4=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Controllers/Blog.php     | 18 +++++++++++++++---
 App/Models/Doc.php           |  7 +++++++
 App/Views/blog/basic.html    |  4 ++--
 App/Views/blog/css/left.css  |  3 +--
 App/Views/blog/js/scripts.js | 14 +-------------
 Core/Controller.php          |  2 --
 public/index.php             |  1 -
 7 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/App/Controllers/Blog.php b/App/Controllers/Blog.php
index 994989e..b9586cb 100644
--- a/App/Controllers/Blog.php
+++ b/App/Controllers/Blog.php
@@ -26,10 +26,22 @@ class Blog extends Controller
         View::renderTemplate("/blog/basic.html",['docs'=>$docs,'index'=>true]);
     }
     function articleAction(){
-        View::renderTemplate("/blog/basic.html",['title'=>'test','index'=>false]);
-        //print_r($this->query_string);
+        if(sizeof($this->querys) != 0){
+            echo '<pre>';
+            print_r($this->querys['title']);
+            $docModel = new Models\Doc();
+            $doc = $docModel->titleDoc($this->querys['title']);
+            $markdown = new Parsedown;
+            $content = $markdown->text($doc[0]['content']);
+            echo  '</pre>';
+            View::renderTemplate("/blog/basic.html",['title'=>$this->querys['title'],
+                'index'=>false,
+                'content'=>$content]);
+        }else{
+            View::renderTemplate("/blog/basic.html",['title'=>'test','index'=>false]);
+        }
     }
     function jsAction(){
-        print_r($_SERVER);
+        //print_r($_SERVER);
     }
 }
\ No newline at end of file
diff --git a/App/Models/Doc.php b/App/Models/Doc.php
index b9271c0..fae3a91 100644
--- a/App/Models/Doc.php
+++ b/App/Models/Doc.php
@@ -62,4 +62,11 @@ class Doc extends  Model
             return $recv;
         }
     }
+    public function titleDoc($title){
+        $db = static::getDB();
+        $stmt = $db->query('select * from doc where title = \''.$title.'\'');
+        $recv = $stmt->fetchAll();
+        return $recv;
+    }
 }
+
diff --git a/App/Views/blog/basic.html b/App/Views/blog/basic.html
index 61bb0da..6cfb34b 100644
--- a/App/Views/blog/basic.html
+++ b/App/Views/blog/basic.html
@@ -135,10 +135,10 @@
 		{%else%}
 			<div style="width: 670px; height: 100%; border-bottom: #0b58a2 solid 1px ;margin: 5px 5px 5px 5px;">
 				<p style="display: block;font-size: 16px;text-align: center;">
-					测试
+					{{ title }}
 				</p>
 				<div  style="width: 670px;height: 800px; display: block;font-size: 10px;text-align: left;">
-					发送到发的说法
+					{{ content | raw}}
 				</div>
 			</div>
 		{% endif %}
diff --git a/App/Views/blog/css/left.css b/App/Views/blog/css/left.css
index e8b1439..3c12b66 100644
--- a/App/Views/blog/css/left.css
+++ b/App/Views/blog/css/left.css
@@ -35,7 +35,7 @@ ul.navMenu{
 }
 
 .subMenu>li>a {
-    text-align: center;
+    text-align: left;
     display: block;
     line-height: 36px;
     font-size: 10px;
@@ -45,7 +45,6 @@ ul.navMenu{
 
 ul.subMenu {
     margin-top: 8px;
-    margin-left: 10px;
     padding-bottom: 5px;
     width: 130px;
 
diff --git a/App/Views/blog/js/scripts.js b/App/Views/blog/js/scripts.js
index 30bf021..fc4a708 100644
--- a/App/Views/blog/js/scripts.js
+++ b/App/Views/blog/js/scripts.js
@@ -74,20 +74,8 @@ $(document).ready(
                                             // 注册回调s
                                             // console.log("#type_id_0 li a #" + rand);
                                             $("#" + rand).on("click",(function () {
-                                                $.ajax({
-                                                    method: "GET",
-                                                    url: "http://127.0.0.1/api/public/Blog/article?title=" + rand,
-                                                    async: false,
-                                                    dataType: "json",
-                                                    beforeSend: function (xhr) {
-
-                                                    },
-                                                    success:function(data){
-                                                        console.log(data);
-                                                    }
-                                                });
                                                 console.log($("#" + rand).html());
-                                                console.log(rand);
+                                                $(location).attr('href', "http://127.0.0.1/api/public/Blog/article?title=" + $("#" + rand).html());
                                             }));
                                         })
 
diff --git a/Core/Controller.php b/Core/Controller.php
index c515351..cfe4255 100644
--- a/Core/Controller.php
+++ b/Core/Controller.php
@@ -39,9 +39,7 @@ abstract class Controller
         preg_match("/^.{0,}\?(.{0,})$/i", $_SERVER['REQUEST_URI'], $matches);
         if(sizeof($matches) > 0){
             $pieces = explode("=", $matches['1']);
-            print_r(sizeof($pieces));
             for ($i = 0;$i < sizeof($pieces) /2 ;$i++){
-                print $i;
                 $this->querys[$pieces[2*$i]] = $pieces[2*$i + 1];
             }
         }
diff --git a/public/index.php b/public/index.php
index effdfbc..bf46763 100644
--- a/public/index.php
+++ b/public/index.php
@@ -35,7 +35,6 @@ try{
         print "";
         return;
     }else{
-
         $router->dispatch($_SERVER['REQUEST_URI']);
     }
 }catch (Exception $exception){