diff --git a/app/Http/Controllers/Admin/MemberController.php b/app/Http/Controllers/Admin/MemberController.php index d264dbf..c806afe 100644 --- a/app/Http/Controllers/Admin/MemberController.php +++ b/app/Http/Controllers/Admin/MemberController.php @@ -4,13 +4,14 @@ use App\Http\Controllers\Controller; use App\Models\Member; - +use App\Models\Promocode; class MemberController extends Controller { public function index() { $data = Member::paginate(20); - return view('admin.member.index', ['data' => $data]); + $total =Promocode::where('used_count','>',0)->count(); + return view('admin.member.index', ['data' => $data,'total'=>$total]); } } diff --git a/app/Http/Controllers/front/MemberController.php b/app/Http/Controllers/front/MemberController.php index fb68d87..ed76633 100644 --- a/app/Http/Controllers/front/MemberController.php +++ b/app/Http/Controllers/front/MemberController.php @@ -32,7 +32,9 @@ public function index() $code->save(); } - return view('front.member.index', ['code' => $code]); + + + return view('front.member.index', ['code' => $code ]); } else { Auth::guard('member')->logout(); return redirect()->route('login'); diff --git a/resources/views/admin/login.blade.php b/resources/views/admin/login.blade.php index 45532d9..b8ea779 100644 --- a/resources/views/admin/login.blade.php +++ b/resources/views/admin/login.blade.php @@ -242,7 +242,6 @@ @if (session('error')) -@endif \ No newline at end of file +@endif diff --git a/resources/views/admin/member/index.blade.php b/resources/views/admin/member/index.blade.php index cb1933b..d8bce40 100644 --- a/resources/views/admin/member/index.blade.php +++ b/resources/views/admin/member/index.blade.php @@ -3,7 +3,7 @@ @endsection @section('content')