Merge branch 'hcy_pcb_20181221-r' into development

1b0a45d6 · PRY5YKGJ82EZEPX\Administrator · 41f7d9a8 · fd6cf622 · 1b0a45d6
Commit 1b0a45d6 authored Dec 26, 2018 by $PRY5YKGJ82EZEPX\Administrator's avatar$ PRY5YKGJ82EZEPX\Administrator
Showing with 7 additions and 3 deletions
app/Http/Controllers/WebController.php
--- a/app/Http/Controllers/WebController.php
+++ b/app/Http/Controllers/WebController.php
@@ -113,10 +113,14 @@ class WebController extends Controller
        //拼接采购信息
        if ($purchase){
            $purchase= objectToArray($purchase);
-            if ( $purchase['purchase_amount'] > 0  &&  $purchase['purchase_amount'] != $purchase['order_amount']){
-                $orderBase['tiaojia'] = "是";
+            if($purchase['purchase_amount'] == 0){
+                $orderBase['tiaojia'] = "";
            }else{
-                $orderBase['tiaojia'] = "否";
+                if ( $purchase['purchase_amount'] > 0  &&  $purchase['purchase_amount'] != $purchase['order_amount']){
+                    $orderBase['tiaojia'] = "是";
+                }else{
+                    $orderBase['tiaojia'] = "否";
+                }
            }
            $purchase['shipping_time'] = $purchase['shipping_time'] > 0 ? date('Y-m-d H:i:s',$purchase['shipping_time']) : "";
            $purchase['finish_time'] = $purchase['finish_time'] > 0 ? date('Y-m-d H:i:s',$purchase['finish_time']) : "";