Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Cat.php

@@ -88,7 +88,13 @@ public function plist(){
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name('cat')->where($where)->page($page, $size)->select();
-        return app_show(0, "获取成功", ['list' =>$list, 'count' => $count]);
+        $data=[];
+        foreach ($list as $value){
+            $temp= isset($value['id']) && $value['id'] !=0 ? made($value['id']):[];
+            $value['item'] = array_column($temp,'id');
+            $data[]=$value;
+        }
+        return app_show(0, "获取成功", ['list' =>$data, 'count' => $count]);
     }
 
 public function title(){
@@ -318,7 +324,7 @@ public function edit(){
     //$level = isset($this->post['level']) && $this->post['level'] !=="" ? intval($this->post['level']) :"";
 
     $weight = isset($this->post['weight']) && $this->post['weight']!==""? intval($this->post['weight']):"0";
-    $status = isset($this->post['status']) && $this->post['status'] !==""?intval($this->post['status']) :"1";
+    $status = isset($this->post['status']) && $this->post['status'] !==""?intval($this->post['status']) :"0";
     Db::startTrans();
     try{
         $str = [
@@ -327,7 +333,7 @@ public function edit(){
             "pid"=>$pid,
             "level"=>$level,
             "weight"=>$weight,
-            "status"=>$status,
+           // "status"=>$status,
             "cat_desc"=>$cat_desc,
             "is_del"=>0,
             "updatetime"=>date("Y-m-d H:i:s"),

app/admin/controller/Unit.php

@@ -95,22 +95,22 @@ class Unit extends BaseController
         if($unit==""){
             return error_show(1002,"参数unit不能为空");
         }
-        $token = isset($this->post['token'])&&$this->post['token']!='' ? trim($this->post['token']):"";
-        if($token==''){
-            return error_show(1005,"参数token不能为空");
-        }
-        $user =GetUserInfo($token);
-        if(empty($user)||$user['code']!=0){
-            return error_show(1002,"创建人数据不存在");
-        }
-        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
-        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
+//        $token = isset($this->post['token'])&&$this->post['token']!='' ? trim($this->post['token']):"";
+//        if($token==''){
+//            return error_show(1005,"参数token不能为空");
+//        }
+//        $user =GetUserInfo($token);
+//        if(empty($user)||$user['code']!=0){
+//            return error_show(1002,"创建人数据不存在");
+//        }
+//        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+//        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $status = isset($this->post['status']) &&$this->post['status'] !==""? intval($this->post['status']):"0";
         $data=[
             "id"=>$id,
             "unit"=>$unit,
-            "creater"=>$creater,
-            "createrid"=>$createrid,
+//            "creater"=>$creater,
+//            "createrid"=>$createrid,
           // "status"=>$status,
             "is_del"=>0,
             "updatetime"=>date("Y-m-d H:i:s")