更新pcb后台

app/Http/Controllers/WebController.php

@@ -205,7 +205,6 @@ class WebController extends Controller
         if (!$purchase){
         if (!$purchase){
             $orderBase['tiaojia'] = $purchase['purchase_amount'] != $purchase['order_amount'] ? "是" :"否"; //是否调价、
             $orderBase['tiaojia'] = $purchase['purchase_amount'] != $purchase['order_amount'] ? "是" :"否"; //是否调价、
         }
         }
-        $orderBase['order_pay_type'] = PcbOrderMap::$order_pay_type[$orderBase['order_pay_type']];
         $orderBase['order_type'] = PcbOrderMap::$order_type[$orderBase['order_type']];
         $orderBase['order_type'] = PcbOrderMap::$order_type[$orderBase['order_type']];
         $orderBase['status_name'] = PcbOrderMap::$status[$orderBase['status']];
         $orderBase['status_name'] = PcbOrderMap::$status[$orderBase['status']];
         $orderBase['create_time'] = $orderBase['create_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['create_time']) : "";
         $orderBase['create_time'] = $orderBase['create_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['create_time']) : "";
@@ -218,6 +217,7 @@ class WebController extends Controller
         if ($purchase){
         if ($purchase){
             $purchase =  objectToArray($purchase);
             $purchase =  objectToArray($purchase);
             $purchase['shipping_time'] = $purchase['shipping_time'] > 0 ? date('Y-m-d H:i:s',$purchase['shipping_time']) : "";
             $purchase['shipping_time'] = $purchase['shipping_time'] > 0 ? date('Y-m-d H:i:s',$purchase['shipping_time']) : "";
+            $purchase['order_pay_type'] = PcbOrderMap::$order_pay_type[$purchase['order_pay_type']];
         }
         }
         //拼接订单详细信息
         //拼接订单详细信息
         $orderInfo = objectToArray($orderInfo);
         $orderInfo = objectToArray($orderInfo);

resources/views/Pcb/PcbOrderDetail.blade.php

@@ -204,7 +204,7 @@
                                     <td><?= @$orderInfo['surface'] ?></td>
                                     <td><?= @$orderInfo['surface'] ?></td>
                                     <td><?= $orderInfo['via_process'] ?></td>
                                     <td><?= $orderInfo['via_process'] ?></td>
                                     <td><?= $orderInfo['copper_thickness'] ?></td>
                                     <td><?= $orderInfo['copper_thickness'] ?></td>
-                                    <td><?= @$orderInfo['days'].'天' ?></td>
+                                    <td><?= @$orderAuditDetail['text'] ?></td>
                                     <td><?= $purchase['finish_time'] ?></td>
                                     <td><?= $purchase['finish_time'] ?></td>
                                     <td></td>
                                     <td></td>
                                 </tr>
                                 </tr>

resources/views/Pcb/PcbPurchaseDetail.blade.php

@@ -38,7 +38,7 @@
                         <td><?= @$orderBase['order_type'] ?></td>
                         <td><?= @$orderBase['order_type'] ?></td>
                         <td><?= @$orderBase['create_time'] ?></td>
                         <td><?= @$orderBase['create_time'] ?></td>
                         <td><?= @$orderBase['pay_time'] ?></td>
                         <td><?= @$orderBase['pay_time'] ?></td>
-                        <td><?= @$orderBase['order_pay_type'] ?></td>
+                        <td><?= @$purchase['order_pay_type'] ?></td>
                         <td></td>
                         <td></td>
                     </tr>
                     </tr>
                     </tbody>
                     </tbody>
@@ -171,7 +171,7 @@
                                     <td><?= @$orderInfo['surface'] ?></td>
                                     <td><?= @$orderInfo['surface'] ?></td>
                                     <td><?= $orderInfo['via_process'] ?></td>
                                     <td><?= $orderInfo['via_process'] ?></td>
                                     <td><?= $orderInfo['copper_thickness'] ?></td>
                                     <td><?= $orderInfo['copper_thickness'] ?></td>
-                                    <td><?= @$orderInfo['finish_time'] ?></td>
+                                    <td><?= @$orderAuditDetail['text'] ?></td>
                                     <td><?= $purchase['finish_time'] ?></td>
                                     <td><?= $purchase['finish_time'] ?></td>
                                     <td></td>
                                     <td></td>
                                 </tr>
                                 </tr>