调整返回信息

app/Http/Controllers/ApiController.php

@@ -385,7 +385,7 @@ class ApiController extends Controller
 
 
         $res = curlApi($url);
         $res = curlApi($url);
 
 
-        $this->Export(0, '成功');
+        $this->Export(0, '成功', $res);
     }
     }
 
 
 }
 }

resources/views/selfOrder/content.blade.php

@@ -389,10 +389,8 @@
                                         <a class="btn btn-default download-contract" data-id="{{$v['order_id']}}" href="javascript:;">下载合同</a>
                                         <a class="btn btn-default download-contract" data-id="{{$v['order_id']}}" href="javascript:;">下载合同</a>
                                     @endif
                                     @endif
 
 
-                                    @if ($v['status'] >= 4 && $v['status'] <= 7)
+                                    @if (in_array($v['status'], [4, 7]))
                                         <a class="btn btn-warning push-wms" data-sn="{{$v['order_sn']}}" href="javascript:;">推送WMS</a>
                                         <a class="btn btn-warning push-wms" data-sn="{{$v['order_sn']}}" href="javascript:;">推送WMS</a>
-
-                                        <!-- <a class="btn btn-warning" href="{{ Config('website.pur_url') }}/server/wms2?order_sn={{$v['order_sn']}}" target="_blank">推送WMS</a> -->
                                     @endif
                                     @endif
 
 
                                     @if ($v['status'] == -1 && !$v['cancel_reason']) 
                                     @if ($v['status'] == -1 && !$v['cancel_reason'])