Merge branch 'zjl_iteration_20181127' into development

resources/views/erpOrder/content.blade.php

@@ -132,7 +132,7 @@
 
 
                 @if (empty($list))
                 @if (empty($list))
                     <tr>
                     <tr>
-                        <td colspan="10">没有查询到相关记录~</td>
+                        <td colspan="11" class="text-center">没有查询到相关记录~</td>
                     </tr>
                     </tr>
                 @else
                 @else
                 <tbody>
                 <tbody>

resources/views/selfOrder/content.blade.php

@@ -363,6 +363,7 @@
             </table>
             </table>
         </div>
         </div>
         <div class="row-fluid pagination">
         <div class="row-fluid pagination">
+            @if ($username != 'vpadmin@ichunt.com')
                 <span class="show-list-info">
                 <span class="show-list-info">
                     共{{$count ? $count : 0}}单，
                     共{{$count ? $count : 0}}单，
                     {{$paid_order_count}}单已付款（包含预付款），
                     {{$paid_order_count}}单已付款（包含预付款），
@@ -372,6 +373,7 @@
                     实收金额 ￥{{$pay_count['rmb_pay'] ? $pay_count['rmb_pay'] : 0}}，  
                     实收金额 ￥{{$pay_count['rmb_pay'] ? $pay_count['rmb_pay'] : 0}}，  
                     ${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}}  
                     ${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}}  
                 </span>
                 </span>
+            @endif
 
 
             <?php echo $page; ?>
             <?php echo $page; ?>
         </div>
         </div>