commit

app/api/controller/water/WaterQueryController.php

@@ -162,7 +162,7 @@ class WaterQueryController
                 $floor1 = $floor / $m2;
                 $zj +=  $item['unit_price'] * $floor1;
                 $zzl += $item['weight'] * $floor1;
-                $table[] = ['title' => '底板', 'name' => $item['name'], 'specifications' =>  $item['long'].'m*'.$item['wide'].'m', 'number' => $floor1, 'unit_price' => $item['unit_price'], 'company' => $item['company'], 'ot_price' => $item['unit_price'] * $floor1, 'weights' => $item['weight'] * $floor1,'weight' => $details['weight'],'code' => $details['number'], 'type' => 4];
+                $table[] = ['title' => '底板', 'name' => $item['name'], 'specifications' =>  $item['long'].'m*'.$item['wide'].'m', 'number' => $floor1, 'unit_price' => $item['unit_price'], 'company' => $item['company'], 'ot_price' => $item['unit_price'] * $floor1, 'weights' => $item['weight'] * $floor1,'weight' => $item['weight'],'code' => $item['number'], 'type' => 4];
             }
         }else {
             $floor = $calculation['floor_number'];
@@ -180,7 +180,7 @@ class WaterQueryController
 //                        }
                         $zj +=  $item['unit_price'] * $floor1;
                         $zzl += $item['weight'] * $floor1;
-                        $table[] = ['title' => '底板', 'name' => $item['name'], 'specifications' =>  $item['long'].'m*'.$item['wide'].'m', 'number' => $floor1, 'unit_price' => $item['unit_price'], 'company' => $item['company'], 'ot_price' => $item['unit_price'] * $floor1, 'weights' => $item['weight'] * $floor1,'weight' => $details['weight'],'code' => $details['number'], 'type' => 4];
+                        $table[] = ['title' => '底板', 'name' => $item['name'], 'specifications' =>  $item['long'].'m*'.$item['wide'].'m', 'number' => $floor1, 'unit_price' => $item['unit_price'], 'company' => $item['company'], 'ot_price' => $item['unit_price'] * $floor1, 'weights' => $item['weight'] * $floor1,'weight' => $item['weight'],'code' => $item['number'], 'type' => 4];
                     }
                 }
             }

app/http/middleware/AuthTokenMiddleware.php

@@ -33,6 +33,9 @@ class AuthTokenMiddleware implements MiddlewareInterface
             if ($force)
                 return app('json')->make($e->getCode(), $e->getMessage());
         }
+        if ($authInfo['user']['status'] == 0){
+            return app('json')->fail('用户已被禁用');
+        }
 
         if (!is_null($authInfo)) {
             Request::macro('user', function () use (&$authInfo) {