Merge remote-tracking branch 'origin/master'

new_admincp/applications/helpers/common_url_helper.php

@@ -82,7 +82,8 @@ if(!function_exists('get_rentinfo_url'))
             $rowid = intval($row) > 0 ? intval($row) : 0;
         }
         
-        $url = GB_RENT_URL."/rentinfo.php?id=".$rowid."&update=1";
+        //$url = GB_RENT_URL."/rentinfo.php?id=".$rowid."&update=1";
+        $url = GB_RENT_URL."/r_".$rowid.".html?update=1";
 
         return $url;
     }

new_admincp/applications/zsb/config/config_mas.php

@@ -609,7 +609,7 @@ $config['templateName']= 'nj';
 
 define('TEMPLATE_NAME', $config['templateName']);
 //租售宝账号注册
-define('GB_BROKER_REG' , "http://mianyang.sell.house365.com/agent_sign_up.php");
+define('GB_BROKER_REG' , "http://mas.sell.house365.com/agent_sign_up.php");
 
 /**
  * 针对经纪人付费状态，【合肥 1表示收费，0表示免费】

new_admincp/applications/zsb/controllers/sell.php

@@ -96,7 +96,7 @@ class Sell extends MY_Controller {
 		$this->load->model('broker_model');
 		$info_extra = $this->broker_model->get_broker_detail($this->user_arr['uid']);
 		
-		if(time()-strtotime($info_extra['usetime'])<0){
+		/*if(time()-strtotime($info_extra['usetime'])<0){
 			//$use_access	= true;
 			$is_permission = false;
 			//var_dump($is_permission);die;
@@ -106,7 +106,7 @@ class Sell extends MY_Controller {
         {
             $this->jump(GB_WO_URL);
             exit;
-        }
+        }*/
         //南京站身份证限制发布房源
         if(GB_CITY == 'nj'){
             //判断身份证认证

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

@@ -137,6 +137,10 @@ $phone = getPhone(4);
                                             'sh'=>array('url'=>'http://sh.zsb.house365.com/','name'=>'上 海'),
                                             'tx'=>array('url'=>'http://tx.zsb.house365.com/','name'=>'桐 乡'),
                                             'wlmq'=>array('url'=>'http://wlmq.zsb.house365.com/','name'=>'乌鲁木齐'),
+                                            'mas'=>array('url'=>'http://mas.zsb.house365.com/','name'=>'马鞍山'),
+                                            'lf'=>array('url'=>'http://lf.zsb.house365.com/','name'=>'廊坊'),
+                                            'fz'=>array('url'=>'http://fz.zsb.house365.com/','name'=>'福州'),
+                                            'taizhou'=>array('url'=>'http://taizhou.zsb.house365.com/','name'=>'台州'),
                                 'cz'=>array('url'=>'http://zsb.house365.com','name'=>'常 州'),  //特殊
 
                                         );