Merge branch 'hcy_pcb_20181221-r' into development

app/Model/Pcb/PcbServerModel.php

@@ -37,7 +37,7 @@ class PcbServerModel
             'status'=> $status ,
             'status'=> $status ,
         ];
         ];
         $res = curlApi($this->PcbUrl.'/pcb/adminapi/confirmOrder',$param,'POST');
         $res = curlApi($this->PcbUrl.'/pcb/adminapi/confirmOrder',$param,'POST');
-        $json =  json_decode($res);
+        $json =  json_decode($res,true);
         if ($json['err_code'] == 0){
         if ($json['err_code'] == 0){
             PcbActionLogModel::log(1,'confirm_order',"采购确认","",$purchase_id,$admin_id);
             PcbActionLogModel::log(1,'confirm_order',"采购确认","",$purchase_id,$admin_id);
         }
         }