Merge branch 'master' into development

resources/views/selfOrder/content.blade.php

@@ -220,7 +220,7 @@
         </div>
 
         <div class="row-fluid table-responsive">
-            <table class="table table-hover">
+            <table class="table table-hover text-nowrap">
                 <thead>
                 <tr>                  
                     <th class="pl30">会员账号</th>
@@ -333,7 +333,7 @@
                             
                             <td class="show-list">{{$username != 'vpadmin@ichunt.com' ? date('Y-m-d H:i:s', $v['create_time']) : date('Y-m-d', $v['create_time'])}}</td>
                             <td>
-                                <div class="btn-group btn-group-xs">
+                                <div class="btn-group btn-group-xs" style="width: 240px;">
 	                                <a class="btn btn-primary" href="/details/{{$v['order_id']}}?tags=self" target="_blank">详情</a>
 
                                     @if (in_array('self_check_order', $userPerms) && in_array($v['status'], [1, 2]))