Merge remote-tracking branch 'origin/master'

application/admin/controller/CfRoomInfo.php

@@ -178,11 +178,10 @@ class CfRoomInfo extends Backend
     }
 
     public function getRoomList(){
-        $hotelId=$this->request->post('hotelId');
+        $hotelId=$this->request->get('hotelId');
         $result=  $this->model
-            ->field("id,room_name as name")
+            ->field("id,room_name as name,room_memo")
             ->where("hotel_id","=",$hotelId)->select();
-
         return json(['list' => $result]);
     }
 

application/admin/controller/CfRoomPlan.php

@@ -51,12 +51,16 @@ class CfRoomPlan extends Backend
     public function getList(){
         $name=$this->request->post('name');
         $keyValue=$this->request->post('keyValue');
-        $this->model->field('id,plan_name as name,purchase_user_id');
+        $this->model->field('id,plan_name as name,purchase_user_id,plan_memo');
         if($keyValue){
             $this->model->where(['id'=>$keyValue]);
         }elseif($name){
             $this->model->where(['plan_name'=>['like','%'.$name.'%']]);
         }
+        $roomId =$this->request->get('room_id');
+        if ($roomId){
+            $this->model->where("room_id","=",$roomId);
+        }
         $result= $this->model->select();
         if($keyValue){
             return json(['list' => $result]);

application/admin/service/AdminDao.php

@@ -27,7 +27,7 @@ class AdminDao
             if ($info == null) {
                 return Util::returnArrEr("获取管理员信息失败:".$id);
             }
-            return Util::returnArrSu($info);
+            return Util::returnArrSu("",$info);
         }catch (Exception $e){
             return Util::returnArrEr("获取管理员信息失败:".$e->getMessage());
         }

application/admin/service/CfChannelInfoDao.php

@@ -27,7 +27,7 @@ class CfChannelInfoDao
             if ($info == null) {
                 return Util::returnArrEr("获取渠道信息失败:".$id);
             }
-            return Util::returnArrSu($info);
+            return Util::returnArrSu("",$info);
         }catch (Exception $e){
             return Util::returnArrEr("获取渠道信息失败:".$e->getMessage());
         }

application/admin/service/CfSuplierInfoDao.php

@@ -27,7 +27,7 @@ class CfSuplierInfoDao
             if ($info == null) {
                 return Util::returnArrEr("获取供应商信息失败:".$id);
             }
-            return Util::returnArrSu($info);
+            return Util::returnArrSu("",$info);
         }catch (Exception $e){
             return Util::returnArrEr("获取供应商信息失败:".$e->getMessage());
         }