wesley 6 年之前
父节点
当前提交
599b079626

+ 1 - 1
resources/views/admin/call/records/index.blade.php

xqd
@@ -168,7 +168,7 @@
                         layer.msg('导入成功', {
                             icon: 1,
                             time: 2000 //2秒关闭(如果不配置,默认是3秒)
-                        }, function(){
+                        }, function () {
                             window.location.href = window.location.href
                         });
 

+ 4 - 4
resources/views/admin/company/info/data.blade.php

xqd
@@ -28,10 +28,10 @@
                 <td>{{ $item->regCapital }}</td>
                 <td>
                     {{--@if(role('Company/Info/update') && !$item->isThread())--}}
-                        {{--<button class="btn btn-sm btn-success"--}}
-                                {{--onclick="window.location.href='{{ U('User/Threads/create',['company_id'=>$item->id])}}' ">--}}
-                            {{--领取线索--}}
-                        {{--</button>--}}
+                    {{--<button class="btn btn-sm btn-success"--}}
+                    {{--onclick="window.location.href='{{ U('User/Threads/create',['company_id'=>$item->id])}}' ">--}}
+                    {{--领取线索--}}
+                    {{--</button>--}}
                     {{--@endif--}}
 
                     @if(role('Company/Info/view'))

+ 3 - 1
resources/views/admin/company/info/search.blade.php

xqd
@@ -1,7 +1,9 @@
 @extends('admin.layouts.app')
 @section('header')
     <style type="text/css">
-        .chosen-choices input{width: 50px!important;}
+        .chosen-choices input {
+            width: 50px !important;
+        }
     </style>
 @endsection
 

+ 5 - 5
routes/admin.php

xqd xqd
@@ -13,7 +13,7 @@
 //
 Route::get('test', 'TestController@index');
 Route::get('login', 'Auth\LoginController@showLoginForm')->name('admin.login');
-Route::post('login','Auth\LoginController@login');
+Route::post('login', 'Auth\LoginController@login');
 Route::get('logout', 'Auth\LoginController@logout');
 Route::get('noauth', 'Auth\LoginController@noauth');
 Route::get('changePassword', 'Auth\ResetPasswordController@showChangeForm')->name('password.reset');
@@ -21,11 +21,11 @@ Route::post('changePassword', 'Auth\ResetPasswordController@changePassword');
 Route::get('logs', '\Rap2hpoutre\LaravelLogViewer\LogViewerController@index');
 
 
-Route::group(['middleware' => ['auth.admin']], function() {
+Route::group(['middleware' => ['auth.admin']], function () {
 
-    $uri =  request()->path();
-    $uri = str_replace('admin/' ,'', $uri);
-    $uri = str_replace('admin' ,'', $uri);
+    $uri = request()->path();
+    $uri = str_replace('admin/', '', $uri);
+    $uri = str_replace('admin', '', $uri);
     if ($uri == '') {
         Route::any('/', ['as' => 'admin',
             'uses' => 'Base\IndexController@index']);

+ 0 - 3
routes/api.php

xqd xqd
@@ -18,8 +18,6 @@ use Illuminate\Http\Request;
 //});
 
 
-
-
 $api = app('Dingo\Api\Routing\Router');
 
 $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($api) {
@@ -43,5 +41,4 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
     ]);
 
 
-
 });

+ 1 - 1
routes/channels.php

xqd
@@ -12,5 +12,5 @@
 */
 
 Broadcast::channel('App.User.{id}', function ($user, $id) {
-    return (int) $user->id === (int) $id;
+    return (int)$user->id === (int)$id;
 });

+ 5 - 8
routes/web.php

xqd
@@ -26,22 +26,19 @@ Route::get('image/{md5}', [
 ]);
 
 
-
- Route::get('/test',function() {
+Route::get('/test', function () {
 
 //     $password = bcrypt('admin');
 //     dd($password);
 //     dd(dict()->get('user_info','work_type'));
 //     $password = bcrypt('admin');
 //     dd($password);
-     $obj = new \App\Services\User\Info();
-     $obj = $obj->find(1);
+    $obj = new \App\Services\User\Info();
+    $obj = $obj->find(1);
 //     var_dump($obj);exit;
 //    $user = UserInfoModel::find(1);
-     dump(Auth::guard('admin')->user());
+    dump(Auth::guard('admin')->user());
     Auth::login($obj);
 
     dd(Auth::user());
- });
-
-//Route::get('/test', 'Web\AuthController@test');
+});