Merge branch 'master' of http://git.house365.com/zhangkuanguang/fenzhan_agent

.idea/webServers.xml

@@ -11,7 +11,7 @@
         </fileTransfer>
       </webServer>
       <webServer id="67fb6ca5-037a-4b69-abe5-05e315a02402" name="192.168.105.106" url="http://192.168.105.106">
-        <fileTransfer host="192.168.105.106" port="21" rootFolder="/preview_release/fenzhan_agent">
+        <fileTransfer host="192.168.105.106" port="21" rootFolder="/webroot/fenzhan_agent">
           <advancedOptions>
             <advancedOptions dataProtectionLevel="Private" passiveMode="true" shareSSLContext="true" />
           </advancedOptions>

new_admincp/applications/models/zsb_api_model.php

@@ -75,12 +75,14 @@ class zsb_api_model extends MY_Model{
 
 	public function getToken(){
 
-		$token = $this->mc->get($this->token);
+		$uid = $this->user_arr['uid'];
+		$key = $this->token.'_'.$uid;
+		$token = $this->mc->get($key);
 		if($token){
 			return $token;
 		}
 		$url = $this->getApiFullUrl('getToken');
-		$param['uid'] = $this->user_arr['uid'];
+		$param['uid'] =  $uid;
 		$param['city'] = GB_CITY;
 		$data = $this->httpRequest($url,array(),$param);
 		if(!$data){
@@ -92,7 +94,7 @@ class zsb_api_model extends MY_Model{
 			return array('result'=>0,'msg'=>$msg);
 		}
 		$token = $data['data']['token'];
-		$this->mc->set($this->token,$token,12*3600);
+		$this->mc->set($key,$token,12*3600);
 		return $token;
 	}
 

new_admincp/applications/zsb/controllers/sell.php

@@ -4043,7 +4043,7 @@ class Sell extends MY_Controller {
      */
     public function manage( $house_esta = 'active' , $page = 1)
     {
-        $realHouse = $this->config->item('realHouse');
+        $realHouse = $this->config->item('is_open_real_house');
 
         //post参数
         $post_param = $this->input->post( NULL , TRUE );
@@ -4694,16 +4694,6 @@ class Sell extends MY_Controller {
         $data['balance']    =$balance; //经纪人账户余额
         $data['realHouse']  =$realHouse; //是否开启真房源功能
 
-        //2018-07-24 放心看功能 重写规则
-        $data['realHouse'] = 0;
-        if(array_key_exists('real_status',$broker_info_1[0])){
-            if($broker_info_1[0]['real_status']){
-                $data['realHouse'] = 1;
-                $statistic_data['realHouseRemainCount'] = 0;
-            }
-        }
-
-
         $data['realHouseMoney'] = $this->config->item('realHouseMoney'); //真房源默认价格
         //var_dump($data);die;
 
@@ -4834,7 +4824,6 @@ class Sell extends MY_Controller {
 			}
 		}
 
-
 		//中秋节期间提示语
 
         $data['tishi'] = $this->guojie();

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

@@ -33,7 +33,7 @@
                             <?php } ?>
                         </div>
                     </div>
-                    <?php if ($real_money == 0 && $real_status != 1) {?>
+                    <?php if ($real_money > 0 && $real_status != 1) {?>
                         <div class="mt10 pb10">
                             缴纳 <span class="orange"><?=$real_money?></span> 元保证金即可参与真房源计划。<a class="blue" target="_blank" href="http://zsb.house365.com/help/nj/?p=1373">查看详细介绍</a>
                         </div>

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

@@ -460,12 +460,8 @@
                                     <?php } ?>
                                     <?php }?>
 
-                                    <?php
-
-                                    if(($realHouse==1) && ($value['infotype']==1 || $value['infotype']==2) && GB_CITY=='nj') {
+                                    <?php if(($realHouse==1) && ($value['infotype']==1 || $value['infotype']==2)) { ?>
 
-                    /* if(($realHouse==1) && ($balance==$realHouseMoney) && ($value['infotype']==1)) {*/ ?>
-                                        <?php if(in_array($value['district'],array('建邺区','雨花台区','秦淮区','栖霞区','玄武区','鼓楼区','江宁区','浦口区'))){?>
                                             <?php if($value['is_real_house']==1){?>
                                                 <div class="pic" onClick="change_real(<?php echo $value['id']; ?>, '<?php echo md5("HOUSE365_REAL_SET_".$value["id"]);?>')">
                                                     <img alt="取消放心看设置"  src="<?=STATIC_SOURCE_URL?>/zsb/images/v1.0/look.png" />
@@ -491,8 +487,8 @@
                                             </div>
 
                                             <?php } ?>
-                                        <?php }?>
-                                    <?php } ?>
+
+                                    <?php }?>
                                     <?php
                                     $vrs = 0;
                                     if($svrshow){

new_admincp/source/zsb/js/v1.0/real/index.js

@@ -68,7 +68,13 @@ var avaVm = avalon.define({
     remit:function () {
         var _this = this;
 
-        layer.confirm('您的账户中仍有'+real_count+'条"放心房"在线展示，提现后"放心房"标签将被去除哦！', {
+        var msg = '';
+        if(real_count > 0){
+            msg = '您的账户中仍有'+real_count+'条"放心房"在线展示，提现后"放心房"标签将被去除哦！';
+        }else{
+            msg = '申请提现后在保证金到账前，您将无法参与放心看计划，是否继续提现？';
+        }
+        layer.confirm(msg, {
             btn: ['继续提现','取消'] //按钮
         }, function(){
             var index = layer.load(2, {shade: false});