diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php index a24ed990d131d986091ddc923d1277e967901b22..d891da941d4cf4587b761a87c1dd9983632992b2 100644 --- a/app/Http/Controllers/ArticleController.php +++ b/app/Http/Controllers/ArticleController.php @@ -17,7 +17,7 @@ class ArticleController extends Controller { if ($id == 'new'){ $article = DB::table('articles')->orderBy('aid', 'desc')->first(); - // $article = DB::table('articles')->where('aid', $new->aid)->get(); + // $articles = DB::table('articles')->where('aid', $new->aid)->get(); $title = '最新文章'; $id = $article->aid; }else{ @@ -25,7 +25,8 @@ class ArticleController extends Controller } $article->content = str_replace("`", "\`", $article->content); - return view('article', ['title'=>$id, 'articles'=>$articles, 'classify'=>$classify, 'id'=>$id]); + $classify = DB::table('classify')->get(); + return view('article', ['title'=>$id, 'article'=>$article, 'classify'=>$classify, 'id'=>$id]); } // 文章列表页(主页) public function articleList() @@ -45,8 +46,8 @@ class ArticleController extends Controller return response('你还没有登录')->header('refresh', env('USER_WAIT', '5').';url='.env('APP_URL')); } - $articleList = DB::table('articles')->get(); - return view('admin.article', ['title'=>'文章管理', 'list'=>$articleList]); + $articlesList = DB::table('articles')->get(); + return view('admin.article', ['title'=>'文章管理', 'list'=>$articlesList]); } // 文章删除 @@ -86,7 +87,7 @@ class ArticleController extends Controller return response('你还没有登录')->header('refresh', env('USER_WAIT', '5').';url='.env('APP_URL')); } - // $article = DB::table('articles')->where('aid', $id)->first(); + // $articles = DB::table('articles')->where('aid', $id)->first(); return view('insert', ['title'=>'文章发布'.$id]); } // 文章发布处理 @@ -147,7 +148,7 @@ class ArticleController extends Controller } $article = DB::table('articles')->where('aid', $id)->first(); $classify = DB::table('classify')->get(); - return view('update', ['title'=>'文章编辑'.$id, 'articles'=>$articles, 'classify'=>$classify]); + return view('update', ['title'=>'文章编辑'.$id, 'article'=>$article, 'classify'=>$classify]); } // 文章修改处理 public function updateCheck($id = null) @@ -255,15 +256,15 @@ class ArticleController extends Controller public function articleAPI($id = 'new') { if ($id == 'new'){ - $article = DB::table('articles')->orderBy('aid', 'desc')->first(); - // $article = DB::table('articles')->where('aid', $new->aid)->get(); + $articles = DB::table('articles')->orderBy('aid', 'desc')->first(); + // $articles = DB::table('articles')->where('aid', $new->aid)->get(); $title = '最新文章'; - $id = $article->aid; + $id = $articles->aid; }else{ - $article = DB::table('articles')->where('aid', $id)->first(); + $articles = DB::table('articles')->where('aid', $id)->first(); } $classify = DB::table('classify')->get(); - return view('api.article', ['title'=>$id, 'article'=>$article, 'classify'=>$classify, 'id'=>$id]); + return view('api.article', ['title'=>$id, 'article'=>$articles, 'classify'=>$classify, 'id'=>$id]); } } \ No newline at end of file diff --git a/resources/views/admin/updatapwd.blade.php b/resources/views/admin/updatapwd.blade.php index 6a0e653d826b9cb5c83d7c8f2775fbc8850b43a0..542464d2ac8df6814cd02425c01e7407894a2495 100644 --- a/resources/views/admin/updatapwd.blade.php +++ b/resources/views/admin/updatapwd.blade.php @@ -25,7 +25,6 @@