Merge branch 'master' into release_preview

new_admincp/applications/models/zsb_api_model.php

@@ -3,7 +3,7 @@
 class zsb_api_model extends MY_Model{
 
 
-	private $host = 'http://newrent.house365.com';
+	private $host = 'http://localnewrent.house365.com';
 	private $apiSource = 'PC';// 访问API使用的公用source
 	private $apiVersion = '1.0.1';// 访问API使用的公用版本号
 	private $token = 'ZSB_API';
@@ -32,6 +32,7 @@ class zsb_api_model extends MY_Model{
         'uc_login' => '/zsbapi/broker/uc-login', // 登录
         'uc_update' => '/zsbapi/broker/uc-update', // 更新经纪人信息
         'change_uc_phone' => '/zsbapi/broker/change-uc-phone', // 更改经纪人手机号码
+        'add_change_price_log' => '/api/tf-app/add-house-price-log', // 添加房源修改价格日志
 	);
 
 

new_admincp/applications/zsb/controllers/rent.php

@@ -1028,7 +1028,7 @@ class Rent extends MY_Controller {
         $house_id = $this->input->post('id', true);
         $url_manage = $this->rent_model->find_func_url();
         //查询房源没修改之前的信息
-        $this->rent_model->set_select_fields(array('isstar', 'esta'));
+        $this->rent_model->set_select_fields(array('isstar', 'esta','price','priceunit'));
         $before_info = $this->rent_model->find_by_id($house_id);
          //防止模拟提交房源数据 xue 2015-06-16
         //提交验证随机码
@@ -1422,6 +1422,19 @@ class Rent extends MY_Controller {
             }
             //$page_text = '房源修改成功!' . $growthMessage;
             $page_text = '房源修改成功!' ;
+            //房价修改日志记录
+            if((isset($fields_values['price']) && floatval($fields_values['price']) != floatval($before_info['price']))
+            || (isset($fields_values['priceunit']) && intval($fields_values['priceunit']) != intval($before_info['priceunit'])))
+            {
+                $this->load->model('zsb_api_model');
+                $change_params = array(
+                    'tbl' => 'rent',
+                    'house_id' => $house_id,
+                    'price' => $before_info['price'],
+                    'unit' => $before_info['priceunit'],
+                );
+                $this->zsb_api_model->getRequrstData('add_change_price_log', $change_params);
+            }
         }
         else 
         {

new_admincp/applications/zsb/controllers/sell.php

@@ -3028,6 +3028,16 @@ class Sell extends MY_Controller {
             'stand_remark' => $standRemark,
             'service_remark' => $serviceRemark,
         ));
+        //添加价格变更记录
+        if(isset($fields_values['price']) && floatval($fields_values['price']) != floatval($before_info['price'])) {
+            $this->load->model('zsb_api_model');
+            $change_params = array(
+                'tbl' => 'sell',
+                'house_id' => $house_id,
+                'price' => $before_info['price'],
+            );
+            $this->zsb_api_model->getRequrstData('add_change_price_log', $change_params);
+        }
 		//添加房源发布价格日志信息
         $this->load->model('house_publish_rule_log_model');
         $housePublishRuleLogData = $this->house_publish_rule_log_model->getRow($house_id,1,3,$uid);

new_admincp/applications/zsb/views/nj/rent_modify.php

@@ -837,7 +837,7 @@ if (isset($publish_block) && !empty($publish_block)) {
                 if(renttype == '整租'){
                     $(".areaName").html('总面积：');
                 }else{
-                    $(".areaName").html('房屋面积：');
+                    $(".areaName").html('房间面积：');
                 }
             }else{
                 $(".areaName").html('面积：');
@@ -984,7 +984,7 @@ if (isset($publish_block) && !empty($publish_block)) {
             if(renttype == '整租'){
                 $(".areaName").html('总面积：');
             }else{
-                $(".areaName").html('房屋面积：');
+                $(".areaName").html('房间面积：');
             }
         }else{
             $(".areaName").html('面积：');