Merge branch 'test'

application/index/service/HouseService.php

@@ -1037,8 +1037,13 @@ class HouseService
 
         $result = $m_video->getHouseVideo($field, $params);
 
-        $internet_path = CURRENT_URL.'/resource/lib/Attachments/video/';
-        
+
+        if (CURRENT_URL == 'https://api.tonglianjituan.com/') {
+            $internet_path = IMAGES_URL.'/resource/lib/Attachments/video/';
+        }else {
+            $internet_path = 'http://pre2.tonglianjituan.com/resource/lib/Attachments/video/';
+        }
+
         foreach ($result as $k=>$v) {
             $result_[$k]['id'] = $v['id'];
             $result_[$k]['upload_id'] = $v['upload_id'];