Merge branch '0723-v2.5.0' of https://gitee.com/zwyjjc/tl_estate into 0723-v2.5.0

application/model/GHouses.php

@@ -1311,19 +1311,15 @@ class GHouses extends BaseModel
             $agents->addAgents($params['exclusive_ids'], $house_id, 3);
         }
 
-        if ($params['image_file']) {
-            $m_img = new GHousesImgs();
-            $image_file = json_decode($params['image_file'], true);
-
-            $img_data = [];
-            foreach ($image_file as $k=>$v) {
-                $img_data[$k]['house_id'] = $result['house_id'];
-                $img_data[$k]['img_name'] = $v['img_name'];
-                $img_data[$k]['img_type'] = $v['img_type'];
-            }
-
-            $m_img->addHouseImgAll($img_data);
+        //1列表页封面图，2详情页轮播图，3楼层平面图，4独家合同
+        /***保存图片 hu jun 2018.1.19 start***/
+        $house_img = new GHousesImgs();
+        if ($params['id'] == '') {
+            $house_img->add($params, $house_id);
+        } else {
+            $house_img->edit($params, $house_id);
         }
+        /***保存图片 hujun 2018.1.19 end***/
 
         if ($result['house_id'] != NULL) {
             $this->commit();