dyjh 6 vuotta sitten
vanhempi
commit
756b11a828

+ 1 - 1
resources/views/admin/album/news/view.blade.php

xqd
@@ -35,7 +35,7 @@
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">排序:越大越靠前</h3>
+                   <h3 class="list-group-item-heading">排序</h3>
                                                    
                    <p class="list-group-item-text"> {{ $data['sort'] or ''}}</p>
                                                  

+ 23 - 9
resources/views/admin/album/order/index.blade.php

xqd xqd
@@ -84,9 +84,14 @@
                                 @foreach($list as $key => $item)
                                     <tr>
                                         <td>{{ $item->sno }}</td>
-                                        <td><span style="cursor: pointer"
+                                        <td>
+                                            @if(role('Album/Order/getpic')))<span style="cursor: pointer"
                                                   onclick="layer.open({type: 2,area: ['80%', '90%'],title:'图片',content: '{{ U('Album/Order/picture',['id'=>$item->id])}}'});"
-                                                  class="label label-default">查看图片</span></td>
+                                                  class="label label-default">查看图片</span>
+                                            @else
+                                                <span style="cursor: pointer">暂无权限</span>
+                                            @endif
+                                        </td>
                                         <td>
                                             产品分类:{{ $item->category }}<br/>
                                             型 号:{{ $item->type }}<br/>
@@ -96,19 +101,28 @@
                                         <td>{{ $item->status() }}</td>
                                         @if(Request::get('expected'))
                                             <td>@if($item->expected_comment){{$item->expected_comment}}@else
+                                                    @if(role('Album/Order/addecomment'))
                                                     <button class="btn btn-warning myModal1" data-toggle="modal"
                                                             data-id="{{ $item->id }}" data-target="#myModal">添加备注
-                                                    </button>@endif</td>@endif
+                                                    </button>
+                                                    @endif
+                                                @endif
+                                            </td>
+                                        @endif
                                         <td>
                                             <div class="btn-group">
                                                 @if($item->status == 0)
-                                                    <button class="btn btn-success myModal" data-toggle="modal"
-                                                            data-id="{{ $item->id }}" data-target="#myModal2">通过审核
-                                                    </button>
+                                                    @if(role('Album/Order/status'))
+                                                        <button class="btn btn-success myModal" data-toggle="modal"
+                                                                data-id="{{ $item->id }}" data-target="#myModal2">通过审核
+                                                        </button>
+                                                    @endif
                                                 @else
-                                                    <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Album/Order/check',['id'=>$item->id])}}'});"
-                                                            class="btn btn-success ">打印
-                                                    </button>
+                                                    @if(role('Album/Order/check'))
+                                                        <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Album/Order/check',['id'=>$item->id])}}'});"
+                                                                class="btn btn-success ">打印
+                                                        </button>
+                                                    @endif
                                                 @endif
                                             </div>
                                             @if(role('Album/Order/view'))

+ 7 - 1
resources/views/admin/album/review/index.blade.php

xqd
@@ -31,7 +31,13 @@
                                     <tr>
 
                                         <td>{{ $item->id }}</td>
-                                        <td><span style="cursor: pointer" onclick="layer.open({type: 2,area: ['80%', '90%'],title:'图片',content: '{{ U('Album/Review/picture',['id'=>$item->id])}}'});" class="label label-default">查看图片</span></td>
+                                        <td>
+                                            @if(role('Album/Review/picture'))
+                                            <span style="cursor: pointer" onclick="layer.open({type: 2,area: ['80%', '90%'],title:'图片',content: '{{ U('Album/Review/picture',['id'=>$item->id])}}'});" class="label label-default">查看图片</span>
+                                            @else
+                                                <span style="cursor: pointer">暂无权限</span>
+                                            @endif
+                                        </td>
                                         <td>
                                             客户:{{ $item->order->customer_name }}<br/>
                                             订单号:{{ $item->order->sno }}<br/>

+ 1 - 6
resources/views/admin/furniture/goods/index.blade.php

xqd xqd
@@ -40,7 +40,7 @@
                                 <th class="sorting" data-sort="goods_id">商城小程序中产品ID</th>
                                 <th class="sorting" data-sort="name"> 产品名称</th>
                                 <th class="sorting" data-sort="img"> 产品图片</th>
-                                <th class="sorting" data-sort="sort"> 排序,越大越靠前</th>
+                                <th class="sorting" data-sort="sort"> 排序</th>
                                 <th class="sorting" data-sort="status"> 状态 </th>
                                 <th class="sorting" data-sort="created_at">创建时间</th>
                                 <th width="22%">相关操作</th>
@@ -65,11 +65,6 @@
                                                     <a href="{{ U('Furniture/Goods/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作?');" class="btn btn-sm btn-danger pull-right">删除</a>
                                                 @endif
                                             </div>
-                                            @if(role('Furniture/Goods/view'))
-                                                <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Furniture/Goods/view',['id'=>$item->id])}}'});"
-                                                        class="btn btn-primary ">查看
-                                                </button>
-                                            @endif
                                         </td>
                                     </tr>
                                 @endforeach

+ 1 - 1
resources/views/admin/furniture/goods/view.blade.php

xqd
@@ -29,7 +29,7 @@
 
                 <div class="list-group-item">
 
-                    <h3 class="list-group-item-heading">排序,越大越靠前</h3>
+                    <h3 class="list-group-item-heading">排序</h3>
 
                     <p class="list-group-item-text"> {{ $data['sort'] or ''}}</p>