Merge branch 'test'

application/api_broker/controller/Shop.php

@@ -703,7 +703,7 @@ class Shop extends Basic
 
         $upload_id = $s_house->getHouseVideoNum($params['id']);
         $result['is_upload_video'] = 0;  //不能上传视频
-        if (count($upload_id) < 3) {
+        if (!empty($upload_id) && count($upload_id) < 3) {
             $result['is_upload_video'] = 1;
 
             if (in_array($this->agentId, $upload_id)) {

application/index/service/HouseService.php

@@ -1029,7 +1029,7 @@ class HouseService
     public function getHouseVideoList($house_id)
     {
         $m_video = new GHousesVideo();
-
+        $result_ = [];
         $field = 'id,video_name,video_image,upload_id,upload_name,upload_phone,check_name,create_time,check_time';
         $params['house_id'] = $house_id;
         $params['is_del'] = 0;
@@ -1050,8 +1050,8 @@ class HouseService
             $result_[$k]['check_name'] = $v['check_name'];
             $result_[$k]['upload_name'] = $v['upload_name'];
             $result_[$k]['upload_phone'] = $v['upload_phone'];
-            $result_[$k]['video_image'] = $v['video_image'] ? $internet_path.$v['video_image'] : 'http://n.sinaimg.cn/ent/transform/20170921/FVGl-fymesmp0851702.jpg';
-            $result_[$k]['video_path'] = $internet_path.$v['video_name'];
+            $result_[$k]['video_image'] = $v['video_image'] ? $internet_path . $v['video_image'] : '';
+            $result_[$k]['video_path'] = $v['video_path'] ? $internet_path . $v['video_path'] : '';
             $result_[$k]['create_time'] = $v['create_time'];
             $result_[$k]['check_time'] = $v['check_time'];
         }