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')
@@ -138,7 +137,9 @@
- + @php + $pageTotal = 0; + @endphp
@@ -209,12 +210,16 @@ class="rounded-circle"> {{ $item->getPromoCode[0]->code }} @endif + @php + $pageTotal += count($item->getPromoCode) ; + @endphp @if (count($item->getPromoCode) > 1) @endif @@ -273,13 +278,16 @@ class="d-grid d-sm-flex p-4 border justify-content-center table-responsive text- - @php $i = 1 ; @endphp - @foreach ($item->getPromoCode as $key => $val) + @php + $i=1; + $promoCodes = $item->getPromoCode()->paginate(30); // 每頁30筆優惠碼 + @endphp + @foreach ($promoCodes as $val) @if ($i == 1) @endif - {{ $i }} {{ $val->code }} - {{ $val->give_to }} + {{ $val->code }} + {{ $val->give_to }} @if ($i == 5) @php $i = 0 @endphp @@ -287,6 +295,13 @@ class="d-grid d-sm-flex p-4 border justify-content-center table-responsive text- @php $i++; @endphp @endforeach + + + @if($promoCodes->count()>30) + {{ $promoCodes->links() }} + @endif + + {{-- @foreach ($item->getPromoCode as $key => $val) @@ -303,6 +318,16 @@ class="d-grid d-sm-flex p-4 border justify-content-center table-responsive text- @endforeach + + + 本頁兌換碼計數 + 總兌換碼計數 + + +

{{ $pageTotal }}

+

{{ $total}}

+ +
@@ -362,20 +387,25 @@ function changeLevel(id, lv) { console.log(lv); // lv = response.level; name = response.name; - var view =''; + var view = ''; if (lv == 0) { - view = '' + name; + view = '' + + name; } if (lv == 1) { - view = ''+ name; + view = '' + + name; } if (lv == 2) { - view = ' '+ name; + view = ' ' + + name; } if (lv == 9) { - view = ' '+ name; + view = + ' ' + + name; } - $("#user-"+id).html(view); + $("#user-" + id).html(view); }