Merge remote-tracking branch 'origin/develop' into develop

@@ -187,9 +187,10 @@ class Work extends CI_Controller
             $result2 = file_get_contents($url2);
             $result2 = file_get_contents($url2);
             $json2 = json_decode($result2);
             $json2 = json_decode($result2);
             $ret2 = $json2->data;
             $ret2 = $json2->data;
-            $credit = (object) array();
             if ($ret2) {
             if ($ret2) {
                 $credit = $ret2;
                 $credit = $ret2;
+            } else{
+                $credit = array();
             }
             }
 
 
             $url3 = $this->config->item('apiBaseUrl') . 'dueDiligence/' . $id;
             $url3 = $this->config->item('apiBaseUrl') . 'dueDiligence/' . $id;
@@ -202,11 +203,12 @@ class Work extends CI_Controller
                 'clientUnitOutputVO' => $ret->clientUnitOutputVO,
                 'clientUnitOutputVO' => $ret->clientUnitOutputVO,
                 'clientContactOutputVOS' => $ret->clientContactOutputVOS,
                 'clientContactOutputVOS' => $ret->clientContactOutputVOS,
                 'applyOrderVO' => $ret->applyOrderVO,
                 'applyOrderVO' => $ret->applyOrderVO,
-                'credit'=> $credit,
-                'id' => $id
+                'credit'=> $credit,//信用报告
+                'id' => $id,
+                'dueDiligence'=>$dueDiligence //尽调报告
+
             );
             );
 //            array_merge($data, $dueDiligence);
 //            array_merge($data, $dueDiligence);
-
         }
         }
 
 
         switch ($state) {
         switch ($state) {

+<?php
+
+var_dump($credit);
+?>
 <form action="" id="form1">
 <form action="" id="form1">
     <input type="hidden" name="orderId" value="<?=$id?>">
     <input type="hidden" name="orderId" value="<?=$id?>">
     <div class="panel panel-default mb-20">
     <div class="panel panel-default mb-20">