Merge branch 'zjl_sample_20190925'

resources/views/detail/changeOrder.blade.php

@@ -498,7 +498,7 @@
 @include('detail.addGoods')
 
 <script>
-    var is_manager       = "{{ $role == 1 || $role == 2 || $role == 10 ? true : false }}"; 
+    var is_manager       = "{{ $role == 1 || $role == 2 || $role == 10 || $role == 11 ? true : false }}"; 
     
     var isNewClient      = "{{isset($isNewClient) ? $isNewClient : 0}}"; 
     // var order_amount  = "{{$order_info['order_amount']}}";