Commit 6a7526e0 authored by gxx's avatar gxx

用户存储空间

parent 0615e625
...@@ -74,8 +74,8 @@ class FileController extends Controller ...@@ -74,8 +74,8 @@ class FileController extends Controller
public function userOssSpace(Request $request) public function userOssSpace(Request $request)
{ {
$group_id = $request->user_id; $user_id = $request->user_id;
$result = $this->mFile->userOssSpace($group_id); $result = $this->mFile->userOssSpace($user_id);
$mbyte = $result/1048576; $mbyte = $result/1048576;
$space = 10-$mbyte; $space = 10-$mbyte;
$finalspace = array(["value"=>$space,"name"=>"剩余空间"],["value"=>$mbyte,"name"=>"已用空间"]); $finalspace = array(["value"=>$space,"name"=>"剩余空间"],["value"=>$mbyte,"name"=>"已用空间"]);
......
...@@ -83,7 +83,7 @@ class UserController extends Controller ...@@ -83,7 +83,7 @@ class UserController extends Controller
{ {
$result = $this->mUser->get($id); $result = $this->mUser->get($id);
if ($result){ if ($result){
return view('admin/userinformation',compact('result')); return view('admin/userinformation',compact('result','id'));
}else{ }else{
return Message::makeError('无次用户'); return Message::makeError('无次用户');
} }
......
...@@ -78,6 +78,7 @@ class FileService implements FileServiceContract ...@@ -78,6 +78,7 @@ class FileService implements FileServiceContract
public function userSpace($user_id) public function userSpace($user_id)
{ {
$files = File::where(["group_id"=>"0","creator_id"=>$user_id])->get(); $files = File::where(["group_id"=>"0","creator_id"=>$user_id])->get();
if ($files->isEmpty()){ if ($files->isEmpty()){
return null; return null;
} }
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
// 登陆页面 // 登陆页面
Route::get('/',function (){return view('login');})->name('admin.login'); Route::get('/',function (){return view('login');})->name('admin.login');
Route::group(['prefix'=>'error','middleware'=>'loginCheck'],function (){ Route::group(['prefix'=>'error','middleware'=>'loginCheck'],function (){
Route::get('500',function (){ Route::get('500',function (){
return view('admin/error/500'); return view('admin/error/500');
...@@ -30,7 +29,6 @@ Route::get('/',function (){return view('login');})->name('admin.login'); ...@@ -30,7 +29,6 @@ Route::get('/',function (){return view('login');})->name('admin.login');
Route::get('login/{email}/{password}','AdminController@login')->name('login'); Route::get('login/{email}/{password}','AdminController@login')->name('login');
Route::get('logout','AdminController@logout')->name('logout'); Route::get('logout','AdminController@logout')->name('logout');
//admin //admin
Route::group(['prefix'=>'admin','middleware'=>'loginCheck','middleware'=>'admin'],function (){ Route::group(['prefix'=>'admin','middleware'=>'loginCheck','middleware'=>'admin'],function (){
route::get('add_page','AdminController@addPage')->name('admin.addPage'); route::get('add_page','AdminController@addPage')->name('admin.addPage');
...@@ -48,6 +46,11 @@ Route::get('/',function (){return view('login');})->name('admin.login'); ...@@ -48,6 +46,11 @@ Route::get('/',function (){return view('login');})->name('admin.login');
Route::get('updatePage/{id}','UserController@updatePage')->name('user.updatePage'); Route::get('updatePage/{id}','UserController@updatePage')->name('user.updatePage');
Route::post('update','UserController@update')->name('user.update'); Route::post('update','UserController@update')->name('user.update');
Route::get('search','UserController@simpleSearch')->name('user.search'); Route::get('search','UserController@simpleSearch')->name('user.search');
Route::get('user_space','FileController@userSpace')->name('user.userSpace');
Route::get('user_oss_space','FileController@userOssSpace')->name('user.userSpaceOss');
}); });
...@@ -94,7 +97,6 @@ Route::get('/',function (){return view('login');})->name('admin.login'); ...@@ -94,7 +97,6 @@ Route::get('/',function (){return view('login');})->name('admin.login');
// 短信 // 短信
Route::get('sms','SMSController@surplus')->name('sms'); Route::get('sms','SMSController@surplus')->name('sms');
Route::get('logs','\Rap2hpoutre\LaravelLogViewer\LogViewerController@index')->name('statistics.logs'); Route::get('logs','\Rap2hpoutre\LaravelLogViewer\LogViewerController@index')->name('statistics.logs');
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment