sunhao 5 years ago
parent
commit
c834a1109a

+ 2 - 0
app/Http/Controllers/Admin/OrderController.php

@@ -205,6 +205,7 @@ class OrderController extends Controller
205 205
         })->where('id','>', 1)->where('is_use', 1)->get();
206 206
         $adminList = json_decode(json_encode($adminList), true);
207 207
 
208
+        $is_fx = env('IS_FX');
208 209
         return view('order/orderlist', ['result' =>$result,
209 210
             'page'              =>$page,
210 211
             'count'             =>$count,
@@ -223,6 +224,7 @@ class OrderController extends Controller
223 224
             'last_url'      => 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],
224 225
             'overtime'      => $overtime,
225 226
             'warehouse'      => $warehouse,
227
+            'is_fx'      => $is_fx,
226 228
             'thisTime'      => date('Y-m-d H:i:s'),
227 229
             ]);
228 230
     }

+ 1 - 1
resources/views/order/orderlist.blade.php

@@ -277,7 +277,7 @@
277 277
                                 <a style="text-decoration:none" onClick='order_edit("编辑","{{$a['id']}}")' href="javascript:;" title="编辑"><span class="btn btn-primary radius">编辑</span></a> 
278 278
                                 @endif
279 279
 
280
-                                @if($self_role !='销售')
280
+                                @if($self_role =='管理员' && $is_fx>0)
281 281
                                 <a style="text-decoration:none" onClick='order_goods_info("查看商品","{{$a['id']}}")' href="javascript:;" title="查看商品"><span class="btn btn-primary radius">查看商品</span></a>
282 282
                                 @endif
283 283