GGican 8 vuotta sitten
vanhempi
commit
e4135ac4f2

+ 1 - 1
app/Http/Controllers/Admin/CommonController.php

xqd
@@ -1 +1 @@
-<?php
 namespace App\Http\Controllers\Admin;

 use App\Http\Controllers\Controller;
 use App\Model\Job;
 use App\Model\Project;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Session;
 class CommonController extends Controller{


  public function upload()
  {
   $file = Input::file('Filedata');
   if($file){
     $realPath = $file->getRealPath();
     $entension = $file->getClientOriginalExtension();
     $newName = date('YmdHis').mt_rand(100,999).'.'.$entension;
     $path = $file->move(base_path().'/uploads',$newName);
     $filepath = 'uploads/'.$newName;
    return $filepath;
   }

  }

  public function __construct()
  {

   $user = session('user');
   $project = Project::where('display',1)->get();
//   $role = Job::where('role',$user->role)->first();

    View::share('user',$user);
    View::share('project',$project);
//    View::share('role',$role);
  }

 }
+<?php
 namespace App\Http\Controllers\Admin;

 use App\Http\Controllers\Controller;
 use App\Model\Job;
 use App\Model\Project;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Session;
 class CommonController extends Controller{


  public function upload()
  {
   $file = Input::file('Filedata');
   if($file){
     $realPath = $file->getRealPath();
     $entension = $file->getClientOriginalExtension();
     $newName = date('YmdHis').mt_rand(100,999).'.'.$entension;
     $path = $file->move(base_path().'/public/img',$newName);
     $filepath = 'img/'.$newName;
    return $filepath;
   }

  }

  public function __construct()
  {

   $user = session('user');
   $project = Project::where('display',1)->get();
//   $role = Job::where('role',$user->role)->first();

//   dd($user);
    View::share('user',$user);
    View::share('project',$project);
//    View::share('role',$role);
  }

 }

+ 2 - 2
resources/views/admin/index.blade.php

xqd
@@ -7,10 +7,10 @@
             <!-- Sidebar user panel -->
             <div class="user-panel">
                 <div class="pull-left image">
-                    <img src="{{asset('img/arr.jpg')}}" class="img-circle" alt="User Image">
+                    <img src="{{asset($user->thumb)}}" class="img-circle" alt="User Image">
                 </div>
                 <div class="pull-left info">
-                    <p>GT.Young</p>
+                    <p>{{ $user->surname }}</p>
                     <a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
                 </div>
             </div>

+ 6 - 6
resources/views/admin/user/add_user.blade.php

xqd xqd
@@ -140,7 +140,7 @@
                         </tr>
                         <tr>
                             <td>密码</td>
-                            <td><input name="pswd" class="form-control"  value="" ></td>
+                            <td><input type="password" name="pswd" class="form-control"  value="" ></td>
                         </tr>
                         <tr>
                             <td>姓名</td>
@@ -166,17 +166,17 @@
                                             'uploader' : "{{url('/upload')}}",
                                             'onUploadSuccess' : function(file,data,response){
                                                 $('input[name=thumb]').val(data);
-                                                $('#art_thumb_img').attr('src','/'+data);
+//                                                $('#art_thumb_img').attr('src','/'+data);
                                             }
                                         });
                                     });
                                 </script>
                             </td>
                         </tr>
-                        <tr>
-                            <td>预览</td>
-                            <td><img src="" alt="" id="art_thumb_img"  style="max-width: 350px;max-height: 100px;"></td>
-                        </tr>
+                        {{--<tr>--}}
+                            {{--<td>预览</td>--}}
+                            {{--<td><img src="" alt="" id="art_thumb_img"  style="max-width: 350px;max-height: 100px;"></td>--}}
+                        {{--</tr>--}}
                         <tr>
                             <td>职位</td>
                             <td>

+ 1 - 1
resources/views/admin/user/edit.blade.php

xqd
@@ -151,7 +151,7 @@
                             <td>
                                 <select class="form-control" name="role">
                                     @foreach($user_job as $value)
-                                        <option value="{{$value->role}}" @if($data->role == $value->id) selected @endif>{{$value->display_name}}</option>
+                                        <option value="{{$value->role}}" @if($data->role == $value->role) selected @endif>{{$value->display_name}}</option>
                                     @endforeach
                                 </select>
                             </td>

+ 6 - 5
resources/views/layouts/admin.blade.php

xqd
@@ -77,17 +77,18 @@
                     <!-- User Account: style can be found in dropdown.less -->
                     <li class="dropdown user user-menu">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                            <img src="{{asset('img/arr.jpg')}}" class="user-image" alt="User Image">
+                            @if($user->thumb == '' || $user->thumb==null)
+                                <img src="{{asset('/img/arr.jpg')}}" class="user-image" alt="User Image">
+                                @else
+                                <img src="{{asset($user->thumb)}}" class="user-image" alt="User Image">
+                            @endif
                             <span class="hidden-xs">{{ $user->name }}</span>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- User image -->
                             <li class="user-header">
-                                <img src="{{$user->thumb}}" class="img-circle" alt="User Image">
-                                <img src="ass" class="img-circle" alt="User Image">
-
+                                <img src="{{asset($user->thumb)}}" class="img-circle" alt="User Image">
                                 <p>
-                                    {{ $user->thumb }}
                                     {{--{{ $role->display_name }}--}}
                                     {{--<small>{{ $role->description }}</small>--}}
                                     {{--<small>权限级别: {{ $role->role }}</small>--}}