HARUHARU 4 vuotta sitten
vanhempi
commit
7f4cdded96
1 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 3 3
      application/index/controller/Cabinet.php

+ 3 - 3
application/index/controller/Cabinet.php

@@ -227,7 +227,7 @@ class Cabinet extends Base
         $cabinet_status = ['1' => '运行中' , '2' => '已锁定'];
         // 拼装参数
         foreach($selectResult as $key=>$vo){
-            $selectResult[$key]['cabinet_status'] = $cabinet_status[$vo['cabinet_status']];
+            $selectResult[$key]['status_text'] = $cabinet_status[$vo['cabinet_status']];
         }
         $return['total'] = $CabinetModel->getAllCabinets();  //总数量
         $return['rows'] = $selectResult;
@@ -245,7 +245,7 @@ class Cabinet extends Base
         $box_status = ['1' => '空闲' , '2' => '已使用' , '3' => '锁定中'];
         // 拼装参数
         foreach($selectResult as $key=>$vo){
-            $selectResult[$key]['box_status'] = $box_status[$vo['box_status']];
+            $selectResult[$key]['status_text'] = $box_status[$vo['box_status']];
         }
         $return['total'] = $BoxModel->getAllCounts();  //总数量
         $return['rows'] = $selectResult;
@@ -267,7 +267,7 @@ class Cabinet extends Base
         $status = ['1' => '开箱' , '2' => '关箱'];
         // 拼装参数
         foreach($selectResult as $key=>$vo){
-            $selectResult[$key]['type'] = $status[$vo['type']];
+            $selectResult[$key]['status_text'] = $status[$vo['type']];
         }
         $return['total'] = $BoxActionModel->getAllCounts($where);  //总数量
         $return['rows'] = $selectResult;