0825

osramywj · Aug 25, 2017 · 81d6673 · 81d6673
1 parent a4c609e
commit 81d6673
Show file tree

Hide file tree

Showing 19 changed files with 317 additions and 18 deletions.
diff --git a/app/Admin/Controllers/LoginController.php b/app/Admin/Controllers/LoginController.php
@@ -14,12 +14,14 @@ public function index()
     //登录操作
     public function login(Request $request)
     {
+        //验证
         $this->validate($request,[
             'email' =>'required|email',
             'password' =>'required|min:3|max:10',
             'is_remember' =>'integer',
         ]);
 
+
         return ;
     }
 

diff --git a/app/Admin/Controllers/PostController.php b/app/Admin/Controllers/PostController.php
@@ -18,9 +18,27 @@ public function index()
 
     public function check(Post $post)
     {
-        $post->status = request('status');
-        dd($post);
-        return ;
+        $status = request('status');
+        if ($status=='1') {
+            $affected = $post->update(['status'=>'1']);
+        }else{
+            $affected = $post->update(['status'=>'-1']);
+        }
+
+        if ($affected>0) {
+            $success = [
+                'error'=>'0',
+                'msg'=>'success'
+            ];
+            echo  json_encode($success);
+        } else {
+            $error = [
+                'error'=>'1',
+                'msg'=>'error'
+            ];
+            echo  json_encode($error);
+        }
+
     }
 
 

diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php
@@ -2,6 +2,7 @@
 namespace App\Admin\Controllers;
 
 use App\AdminUser;
+use App\Category;
 use Illuminate\Http\Request;
 
 class UserController extends Controller
@@ -31,5 +32,12 @@ public function store(Request $request)
         return redirect('admin/users');
     }
 
+    public function test()
+    {
+        $res = Category::with('allChildrenCategorys')->where('parent_id',0)->get();
+
+        dd($res->toArray());
+    }
+
 
 }
diff --git a/app/AdminUser.php b/app/AdminUser.php
@@ -3,8 +3,23 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Foundation\Auth\User as Authenticatable;
 
-class AdminUser extends Model
+class AdminUser extends Authenticatable
 {
+    protected $tables = 'admin_users';
     protected $guarded = ['_token'];
+    //管理员有哪些角色
+    public function role()
+    {
+        return $this->belongsToMany('\App\Role','admin_roles','user_id','role_id')
+            ->withPivot('user_id','role_id');
+    }
+
+    //是否有某个/些角色,返回的是布尔值
+
+    public function isInRoles($roles)
+    {
+        return !!$roles->intersect($this->role)->count();
+    }
 }
diff --git a/app/Category.php b/app/Category.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Category extends Model
+{
+    public function childCategory() {
+        return $this->hasMany('App\Category', 'parent_id', 'id');
+    }
+
+    public function allChildrenCategorys()
+    {
+        return $this->childCategory()->with('allChildrenCategorys');//with预加载
+    }
+}
diff --git a/app/Permission.php b/app/Permission.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Permission extends Model
+{
+    protected $guarded = ['_token'];
+}
diff --git a/app/Role.php b/app/Role.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Role extends Model
+{
+    protected $guarded = ['_token'];
+
+    public function permission()
+    {
+        return $this->belongsToMany('\App\Permission','permission_roles','role_id','permission_id')
+            ->withPivot('role_id','permission_id');
+    }
+
+
+}
diff --git a/database/migrations/2017_08_24_091004_create_categories_table.php b/database/migrations/2017_08_24_091004_create_categories_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCategoriesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('categories', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('parent_id');
+            $table->string('code');
+            $table->string('name');
+            $table->string('path');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('categories');
+    }
+}
diff --git a/database/migrations/2017_08_25_155608_create_roles_table.php b/database/migrations/2017_08_25_155608_create_roles_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateRolesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('roles', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('description');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('roles');
+    }
+}
diff --git a/database/migrations/2017_08_25_155640_create_permissions_table.php b/database/migrations/2017_08_25_155640_create_permissions_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePermissionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('permissions', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('description');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('permissions');
+    }
+}
diff --git a/database/migrations/2017_08_25_160709_create_admin_roles_table.php b/database/migrations/2017_08_25_160709_create_admin_roles_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateAdminRolesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('admin_roles', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('admin_id');
+            $table->integer('role_id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('admin_roles');
+    }
+}
diff --git a/database/migrations/2017_08_25_160910_create_permission_roles_table.php b/database/migrations/2017_08_25_160910_create_permission_roles_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePermissionRolesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('permission_roles', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('role_id');
+            $table->integer('perm_id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('permission_roles');
+    }
+}
diff --git a/public/js/admin.js b/public/js/admin.js
@@ -1,13 +1,41 @@
 
+$.ajaxSetup({
+    headers: {
+        'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+    }
+});
 
-function check(button) {
-     var post_id=$(button).attr('post-id');
-    var status = $(button).attr('post-action-status');
-    $.post('posts/'+post_id+'/check',{'status':status},function (res) {
-        if(res.status==1) {
-            alert('成功');
-        }else if (res.status==0) {
-            alert('失败');
+
+$(".post-audit").click(function (event) {
+    target = $(event.target);
+    var post_id= target.attr('post-id');
+    var status = target.attr('post-action-status');
+    console.log(post_id);
+    $.ajax({
+        url:'/admin/posts/'+post_id+'/check',
+        method:'POST',
+        data:{'status':status},
+        dataType:'json',
+        success: function (res) {
+            if(res.error!= 0){
+                alert(res.msg);
+                return;
+            }
+            target.parent().parent().remove();
         }
-    },'json');
-}
+    });
+});
+
+
+// function check(button) {
+//      var post_id=$(button).attr('post-id');
+//     var status = $(button).attr('post-action-status');
+//     $.post('posts/'+post_id+'/check',{'status':status},function (res) {
+//         alert(res.status);
+//         if(res.status==1) {
+//             alert('成功');
+//         }else if (res.status==0) {
+//             alert('失败');
+//         }
+//     },'json');
+// }
diff --git a/resources/views/admin/login/index.blade.php b/resources/views/admin/login/index.blade.php
@@ -49,6 +49,9 @@
                 <div class="col-xs-4">
                     <button type="submit" class="btn btn-primary btn-block btn-flat">登陆</button>
                 </div>
+                <a href="https://open.weixin.qq.com/connect/qrconnect?appid=your appid &redirect_uri=http://www.sunmil.cn/passport-linshi.html&response_type=code&scope=snsapi_login&state=STATE#wechat_redirect" rel="external nofollow" >微信登录</a>
+                <br><br>
+
                 <!-- /.col -->
             </div>
         </form>

diff --git a/resources/views/admin/post/index.blade.php b/resources/views/admin/post/index.blade.php
@@ -24,8 +24,8 @@
                                     <td>{{$key+1}}</td>
                                     <td><a href="{{url('posts/'.$post->id.'')}}">{{$post->title}}</a> </td>
                                     <td>
-                                        <button type="button" class="btn btn-block btn-default post-audit" post-id="{{$post->id}}" onclick="check(this)" post-action-status="1" >通过</button>
-                                        <button type="button" class="btn btn-block btn-default post-audit" post-id="{{$post->id}}" onclick="check(this)" post-action-status="-1" >拒绝</button>
+                                        <button type="button" class="btn btn-block btn-default post-audit" post-id="{{$post->id}}"  post-action-status="1" >通过</button>
+                                        <button type="button" class="btn btn-block btn-default post-audit" post-id="{{$post->id}}"  post-action-status="-1" >拒绝</button>
                                     </td>
                                 </tr>
                                 @endforeach

diff --git a/routes/admin.php b/routes/admin.php
@@ -17,6 +17,6 @@
     //审核页面
     Route::get('posts','\App\Admin\Controllers\PostController@index');
     //审核动作
-    Route::post('posts/{$post}/check','\App\Admin\Controllers\PostController@check');
+    Route::post('posts/{post}/check','\App\Admin\Controllers\PostController@check');
 
 });