Merge branch 'hcy_pcb_20181221-r' into development

resources/views/Pcb/PcbPurchaseDetail.blade.php

@@ -31,10 +31,10 @@
                         <td><?= @$orderBase['status_name'] ?></td>
                         <td><?= @$orderBase['status_name'] ?></td>
                     </tr>
                     </tr>
                     <tr>
                     <tr>
-                        <th>订单类型</th>
-                        <th>下单时间</th>
-                        <th>支付时间</th>
-                        <th>支付方式</th>
+                        <th class="c2">订单类型</th>
+                        <th class="c2">下单时间</th>
+                        <th class="c2">支付时间</th>
+                        <th class="c2">支付方式</th>
                         <th></th>
                         <th></th>
                         <th></th>
                         <th></th>
                     </tr>
                     </tr>

resources/views/Pcb/PcbPurchaseList.blade.php

@@ -100,7 +100,7 @@
             <td class="show-list"><?= $v['create_time'] ?></td>
             <td class="show-list"><?= $v['create_time'] ?></td>
             <td>
             <td>
                 <div class="btn-group btn-group-xs">
                 <div class="btn-group btn-group-xs">
-                    <a href="/web/PcbPurchaseDetail?purchase_id=@{{ d.purchase_id }}&order_id={{ $v['order_id'] }}"  class="btn btn-xs btn-outline btn-success"><strong>详情</strong></a>
+                    <a href="/web/PcbPurchaseDetail?purchase_id={{ $v['purchase_id'] }}&order_id={{ $v['order_id'] }}"  class="btn btn-xs btn-outline btn-success"><strong>详情</strong></a>
                     <?php if($v['status'] == 3 ) {?>
                     <?php if($v['status'] == 3 ) {?>
                     <button class="btn btn-xs btn-outline btn-danger" lay-submit=""  order_id="{{ $v['purchase_id'] }}"  order_sn="{{ $v['purchase_sn'] }}" onclick="confirmOrder({{ $v['purchase_id'] }})">采购确认</button>
                     <button class="btn btn-xs btn-outline btn-danger" lay-submit=""  order_id="{{ $v['purchase_id'] }}"  order_sn="{{ $v['purchase_sn'] }}" onclick="confirmOrder({{ $v['purchase_id'] }})">采购确认</button>
                     <?php } ?>
                     <?php } ?>