Merge branch 'master' into feature/alarm_order_vue

app/Http/Controllers/AlarmOrderController.php

@@ -236,8 +236,8 @@ class AlarmOrderController extends Controller
 
     //获取当前订单为第几步
     public function orderin(Request $request){
-        $orderid = $request->input('oid');
-        $status = AlarmOrder::where('id','=',$orderid)->value('isorderone');
+        $orderid = $request->input('id');
+        $status = AlarmOrder::where('id','=',$orderid)->select('isorderone','id')->first();
         return $this->jsonSuccessData($status);
     }
 }

app/Http/Controllers/Auth/ZehongTcpController.php

@@ -33,6 +33,7 @@ class  ZehongTcpController extends Controller
             $devicezijian = substr($data, 21, 1);
             $devicecrc = substr($data, 22, 4);
             $isdata = substr($data, 0, 22);
+//            return $this->jsonSuccessData([$this->getPrc($isdata),$devicecrc]);
             if($this->getPrc($isdata) == $devicecrc){
                 $data = ['id'=>$deviceId,'status'=>$status,'np'=>$devicenp,'famen'=>$devicefamen,'chongqi'=>$devicechongqi,'zijian'=>$devicezijian];
                 $totcp = json_decode($this->mysqldb($data),true);