Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Ticketing/TicketManager.vue

@@ -1506,11 +1506,11 @@
                       <li>
                         <p :class="{'_num3':item.ConfigUnionCount!=item.UnionCount,'_num2':item.ConfigUnionCount==item.UnionCount}">
                           {{item.UnionCount}}</p>
-                        <el-popover popper-class="_tripDetails" width="500">
+                        <el-popover popper-class="_tripDetails" width="700">
                           <table width="100%" border="0" cellspacing="0" cellpadding="0">
                             <tr class="_color_666">
                               <th>联运城市</th>
-                              <th>订单号</th>
+                              <th width="100" style="width: 100px">订单号</th>
                               <th>联运数量</th>
                               <th>已配数量</th>
                               <th>是否住宿</th>