Merge branch '0321-v3.1.3' of https://gitee.com/zwyjjc/tl_estate into 0321-v3.1.3

application/api_broker/controller/Shop.php

@@ -1106,7 +1106,7 @@ class Shop extends Basic
         $msg  = '';
 
         $service = new HouseService();
-        $result = $service->addVideo($this->params['house_id'], $this->params['video_name'], $this->agentId, $this->agentName);
+        $result = $service->addVideo($this->params['house_id'], $this->params['video_name'], $this->params['images'], $this->agentId, $this->agentName);
         if ($result['status'] == 'fail') {
             $code = 101;
             $msg  = $result['msg'];

application/index/controller/Houses.php

@@ -881,7 +881,7 @@ class Houses extends Basic
         $m_house_video   = new GHousesVideo();
         $pageNo          = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
         $pageSize        = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
-        $field = 'a.id,a.video_name,a.house_id,a.upload_name,a.check_name,a.check_id,a.check_time,a.create_time';
+        $field = 'a.id,a.video_name,a.house_id,a.upload_name,a.check_name,a.check_id,a.check_time,a.create_time,a.video_image';
         $data = $m_house_video->getVideoAgentList($pageNo, $pageSize, 'a.id desc', $field, $where);
         $total = $m_house_video->getVideoAgentListTotal($where);
         foreach ($data as $k=>$v) {

application/index/service/HouseService.php

@@ -975,11 +975,12 @@ class HouseService
     /**
      * @param $house_id
      * @param $video_name
+     * @param $video_imgage
      * @param $upload_id
      * @param $upload_name
      * @return mixed
      */
-    public function addVideo($house_id, $video_name, $upload_id, $upload_name)
+    public function addVideo($house_id, $video_name, $video_imgage, $upload_id, $upload_name)
     {
         $result['status'] = 'fail';
 
@@ -1003,6 +1004,7 @@ class HouseService
         }
 
         $data['video_name'] = $video_name;
+        $data['video_image'] = $video_imgage;
         $data['upload_id'] = $upload_id;
         $data['upload_name'] = $upload_name;
         $data['house_id'] = $house_id;