Merge branch 'test'

application/api_broker/controller/OrderLog.php

@@ -65,7 +65,12 @@ class OrderLog extends Basic
                     "march_in_area"   => "上海市虹口区中山公园", //进场地址
                 );*/
         // $params["reception_id"] = $this->agentName;
-
+        //todo 兼容2.9.9bug ios
+        if(isset($params["transfer_img"])){
+            $transfer_img = json_decode($params["transfer_img"] ,true);
+            $params["march_in_img"] = $transfer_img[0];
+            unset($params["transfer_img"]);
+        }
         $is_execute = $this->verifyService_->verifyStart(1, $params["reception_id"], $params["order_id"]);
         if (!$is_execute) {
             return $this->response("101", "请不要重复提交");

application/route.php

@@ -522,7 +522,7 @@ Route::group('broker', [
     'addFollowUp'           => ['api_broker/Report/addFollowUp', ['method' => 'get|post']],  //新增跟进
     'getFollowUpList'       => ['api_broker/Report/getFollowUpList', ['method' => 'get|post']],
     'marchIn'               => ['api_broker/OrderLog/marchIn', ['method' => 'get|post']],
-    'marchInV2'               => ['api_broker/OrderLog/marchIn', ['method' => 'get|post']],
+    'marchInV2'             => ['api_broker/OrderLog/marchIn', ['method' => 'get|post']],
     'getBeforeBillInfo'     => ['api_broker/OrderLog/getBeforeBillInfo', ['method' => 'get|post']],
     'savePosBillMessage'    => ['api_broker/OrderLog/savePosBillMessage', ['method' => 'get|post']],
     'collectingBill'        => ['api_broker/OrderLog/collectingBill', ['method' => 'get|post']],