Эх сурвалжийг харах

修改后台页面菜单权限验证

jun 5 сар өмнө
parent
commit
023cfb78cf

+ 2 - 1
app/Http/Controllers/Admin/Orders.php

@@ -76,10 +76,11 @@ class Orders extends Auth{
 		$list					= $OrdersProduct->query()
 									->join('custom','orders_product.custom_uid','=','custom.uid')
 									->join('orders_addr','orders_addr.order_id','=','orders_product.order_id')
+									->leftJoin('orders','orders.id','=','orders_product.order_id')
 									->where($map)
 									->orderByDesc('id')
 									->select([
-										'orders_product.*','custom.username as custom_name',
+										'orders_product.*','custom.username as custom_name','orders.regiment_id as regiment_id',
 										'orders_addr.contact_name','orders_addr.contact_shop','orders_addr.contact_phone','orders_addr.contact_province','orders_addr.contact_city','orders_addr.contact_area','orders_addr.contact_addr'
 									])
 									->paginate(request('limit',config('page_num',10)))->appends(request()->all());

+ 12 - 8
resources/views/admin/banner/index.blade.php

@@ -44,17 +44,21 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<td> {{$a['status']?'停用':'启用'}} </td>
 						<td> {{date('Y/m/d H:i:s',$a['update_time'])}}</td>
 						<td>
+							@if(check_auth('admin/banner/edit'))
 							<a class="btn btn-sm btn-warning" href="{{url('admin/banner/edit?'.http_build_query(['id'=>$a['id']]))}}" title="查看">
 								编辑
 							</a>
-							@if ($a['status'])
-								<a class="delete btn btn-sm btn-success" data-url="{{url('admin/banner/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
-									启用
-								</a>
-							@else
-								<a class="delete btn btn-sm btn-danger" data-url="{{url('admin/banner/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'1']))}}">
-									停用
-								</a>
+							@endif
+							@if(check_auth('admin/banner/set_status'))
+								@if ($a['status'])
+									<a class="delete btn btn-sm btn-success" data-url="{{url('admin/banner/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
+										启用
+									</a>
+								@else
+									<a class="delete btn btn-sm btn-danger" data-url="{{url('admin/banner/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'1']))}}">
+										停用
+									</a>
+								@endif
 							@endif
 						</td>
 					</tr>

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

@@ -19,9 +19,11 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 							<td>{{$a['id']}}</td>
 							<td>{{$a['info']}}</td>
 							<td>
+								@if(check_auth('admin/config/edit'))
 								<a class="btn btn-sm btn-warning" href="{{url('admin/config/edit?'.http_build_query(["id"=>$a["id"]]))}}">
 									编辑
 								</a>
+								@endif
 							</td>
 						</tr>
 					@endforeach

+ 12 - 8
resources/views/admin/orders_banner/index.blade.php

@@ -38,17 +38,21 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<td> {{$a['status']?'停用':'启用'}} </td>
 						<td> {{date('Y/m/d H:i:s',$a['update_time'])}}</td>
 						<td>
+							@if( check_auth('admin/orders_banner/edit') )
 							<a class="btn btn-sm btn-warning" href="{{url('admin/orders_banner/edit?'.http_build_query(['id'=>$a['id']]))}}" title="查看">
 								编辑
 							</a>
-							@if ($a['status'])
-								<a class="delete btn btn-sm btn-success" data-url="{{url('admin/orders_banner/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
-									启用
-								</a>
-							@else
-								<a class="delete btn btn-sm btn-danger" data-url="{{url('admin/orders_banner/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'1']))}}">
-									停用
-								</a>
+							@endif
+							@if( check_auth('admin/orders_banner/set_status') )
+								@if ($a['status'])
+									<a class="delete btn btn-sm btn-success" data-url="{{url('admin/orders_banner/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
+										启用
+									</a>
+								@else
+									<a class="delete btn btn-sm btn-danger" data-url="{{url('admin/orders_banner/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'1']))}}">
+										停用
+									</a>
+								@endif
 							@endif
 						</td>
 					</tr>

+ 12 - 8
resources/views/admin/orders_receipt/index.blade.php

@@ -38,17 +38,21 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<td> {{$a['status']?'停用':'启用'}} </td>
 						<td> {{date('Y/m/d H:i:s',$a['update_time'])}}</td>
 						<td>
+							@if( check_auth('admin/orders_banner/edit') )
 							<a class="btn btn-sm btn-warning" href="{{url('admin/orders_banner/edit?'.http_build_query(['id'=>$a['id']]))}}" title="查看">
 								编辑
 							</a>
-							@if ($a['status'])
-								<a class="delete btn btn-sm btn-success" data-url="{{url('admin/orders_banner/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
-									启用
-								</a>
-							@else
-								<a class="delete btn btn-sm btn-danger" data-url="{{url('admin/orders_banner/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'1']))}}">
-									停用
-								</a>
+							@endif
+							@if( check_auth('admin/orders_banner/set_status') )
+								@if ($a['status'])
+									<a class="delete btn btn-sm btn-success" data-url="{{url('admin/orders_banner/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
+										启用
+									</a>
+								@else
+									<a class="delete btn btn-sm btn-danger" data-url="{{url('admin/orders_banner/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'1']))}}">
+										停用
+									</a>
+								@endif
 							@endif
 						</td>
 					</tr>

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

@@ -68,10 +68,10 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 									拼团中
 								@endif
 								@if( $a['status'] == 2 )
-										拼团成功
+										拼团失败
 								@endif
 								@if( $a['status'] == 3 )
-										拼团失败
+										拼团成功
 								@endif
 							</td>
 							<td>{{date('Y/m/d H:i:s',$a['start_time'])}}</td>

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

@@ -32,9 +32,11 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<td>{{$a['coupon_name'] ? $a['coupon_name'].'('.$a['coupon_code'].')':''}}</td>
 						<td>{{date('Y-m-d H:i:s',$a['update_time'])}}</td>
 						<td>
+							@if(check_auth('admin/score_clockin/edit'))
 							<a class="btn btn-sm btn-warning" href="{{url('admin/score_clockin/edit?'.http_build_query(['id'=>$a['id']]))}}">
 								编辑
 							</a>
+							@endif
 							<!-- @if ($a['status'])
 								<a class="delete btn btn-sm btn-success" data-url="{{url('admin/score_clockin/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
 									启用

+ 12 - 8
resources/views/admin/score_product/index.blade.php

@@ -55,17 +55,21 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<td> {{$a['admin_name']}}</td>
 						<td> {{date('Y/m/d H:i:s',$a['insert_time'])}}</td>
 						<td>
+							@if(check_auth('admin/score_product/edit'))
 							<a class="btn btn-sm btn-warning" href="{{url('admin/score_product/edit?'.http_build_query(['id'=>$a['id']]))}}" title="查看">
 								编辑
 							</a>
-							@if ($a['status'])
-								<a class="delete btn btn-sm btn-success" data-url="{{url('admin/score_product/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
-									上架
-								</a>
-							@else
-								<a class="delete btn btn-sm btn-danger" data-url="{{url('admin/score_product/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'1']))}}">
-									下架
-								</a>
+							@endif
+							@if(check_auth('admin/score_product/set_status'))
+								@if ($a['status'])
+									<a class="delete btn btn-sm btn-success" data-url="{{url('admin/score_product/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
+										上架
+									</a>
+								@else
+									<a class="delete btn btn-sm btn-danger" data-url="{{url('admin/score_product/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'1']))}}">
+										下架
+									</a>
+								@endif
 							@endif
 						</td>
 					</tr>

+ 12 - 8
resources/views/admin/weiban_qrcode/index.blade.php

@@ -36,17 +36,21 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<td> {{$a['status']?'停用':'启用'}} </td>
 						<td> {{date('Y/m/d H:i:s',$a['update_time'])}}</td>
 						<td>
+							@if(check_auth('admin/weiban_qrcode/edit'))
 							<a class="btn btn-sm btn-warning" href="{{url('admin/weiban_qrcode/edit?'.http_build_query(['id'=>$a['id']]))}}" title="查看">
 								编辑
 							</a>
-							@if ($a['status'])
-								<a class="delete btn btn-sm btn-success" data-url="{{url('admin/weiban_qrcode/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
-									启用
-								</a>
-							@else
-								<a class="delete btn btn-sm btn-danger" data-url="{{url('admin/weiban_qrcode/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'1']))}}">
-									停用
-								</a>
+							@endif
+							@if(check_auth('admin/weiban_qrcode/set_status'))
+								@if ($a['status'])
+									<a class="delete btn btn-sm btn-success" data-url="{{url('admin/weiban_qrcode/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
+										启用
+									</a>
+								@else
+									<a class="delete btn btn-sm btn-danger" data-url="{{url('admin/weiban_qrcode/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'1']))}}">
+										停用
+									</a>
+								@endif
 							@endif
 						</td>
 					</tr>