Skip to content

F
fenzhan_zsb
Commit 6df916f3 authored by liuqiao's avatar liuqiao
Browse files
Options

Merge branch 'release_0415' into release_preview

parents cf742070 027bcd65
Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 9 deletions
new_admincp/applications/models/zsb_api_model.php
View file @ 6df916f3
...@@ -59,6 +59,9 @@ class zsb_api_model extends MY_Model{ ...@@ -59,6 +59,9 @@ class zsb_api_model extends MY_Model{
$param['source'] = $this->apiSource; $param['source'] = $this->apiSource;
$param['version'] = $this->apiVersion; $param['version'] = $this->apiVersion;
$param['city'] = GB_CITY; $param['city'] = GB_CITY;
if ($key == 'user_by_qr_code' || $key == 'login_qr_code') {
$this->host = 'http://newrent.house365.com';
}
$url = $this->host.''.$this->getZsbApiUrl($key). '?' . http_build_query($param); $url = $this->host.''.$this->getZsbApiUrl($key). '?' . http_build_query($param);
return $url; return $url;
} }
......
new_admincp/applications/zsb/controllers/rent.php
View file @ 6df916f3
...@@ -1726,7 +1726,7 @@ class Rent extends MY_Controller { ...@@ -1726,7 +1726,7 @@ class Rent extends MY_Controller {
} }
} }
// 发布天数 // 发布天数
$diffTimeStamp = $nowTime - $data_info[$i]['lucupdatetime']; $diffTimeStamp = $nowTime - $data_info[$i]['creattime'];
$publishDays = ceil($diffTimeStamp / 86400); $publishDays = ceil($diffTimeStamp / 86400);
$data_info[$i]['publish_days'] = $publishDays; $data_info[$i]['publish_days'] = $publishDays;
$publishDays = $publishDays < 1 ? 1 : $publishDays; $publishDays = $publishDays < 1 ? 1 : $publishDays;
......
new_admincp/applications/zsb/controllers/sell.php
View file @ 6df916f3
...@@ -4442,7 +4442,7 @@ class Sell extends MY_Controller { ...@@ -4442,7 +4442,7 @@ class Sell extends MY_Controller {
$data_info[$i]['pic1'] = $housePics ? $housePics[0]['filename'] : STATIC_SOURCE_URL.'/zsb/images/v1.0/default.jpg'; $data_info[$i]['pic1'] = $housePics ? $housePics[0]['filename'] : STATIC_SOURCE_URL.'/zsb/images/v1.0/default.jpg';
} }
// 发布天数 // 发布天数
$diffTimeStamp = $nowTime - $data_info[$i]['lucupdatetime']; $diffTimeStamp = $nowTime - $data_info[$i]['creattime'];
$publishDays = ceil($diffTimeStamp / 86400); $publishDays = ceil($diffTimeStamp / 86400);
$data_info[$i]['publish_days'] = $publishDays; $data_info[$i]['publish_days'] = $publishDays;
$publishDays = $publishDays < 1 ? 1 : $publishDays; $publishDays = $publishDays < 1 ? 1 : $publishDays;
......
new_admincp/applications/zsb/views/nj/login.php
View file @ 6df916f3
...@@ -40,6 +40,85 @@ $phone = getPhone(4); ...@@ -40,6 +40,85 @@ $phone = getPhone(4);
#demo{height: 270px;position: relative;overflow:hidden;} #demo{height: 270px;position: relative;overflow:hidden;}
#demo1,#demo2{ height: auto;} #demo1,#demo2{ height: auto;}
.notice-close{ position: absolute; border: 1px solid #666; bottom: 0px; padding:2px; cursor:pointer;left:0} .notice-close{ position: absolute; border: 1px solid #666; bottom: 0px; padding:2px; cursor:pointer;left:0}
.qrcode_login {
}
.box {
}
.box::after {
content:"";
clear:both;/*清除浮动*/
display:block;/*确保该元素是一个块级元素*/
}
.qrcode_left {
float: left;
width: 50%
}
.qrcode_left::after {
content:"";
clear:both;/*清除浮动*/
display:block;/*确保该元素是一个块级元素*/
}
.qrcode_right {
float: left;
width: 46%
}
.qrcode_right .account-btn {
font-size: 14px;
color: #fff;
height: 35px;
padding: 0 15px;
background-color: #07c160;
border: 1px solid #07c160;
line-height: 2;
text-align: center;
border-radius: 2px;
cursor: pointer;
transition: opacity 0.2s;
outline: none;
position: relative;
}
.qrcode_login .qrcode_text {
font-size: 16px;
margin-top: 20px;
text-align: center
}
.qrcode_text_color {
color: #fe8b41
}
.qr-code-btn {
font-size: 14px;
color: #fff;
padding: 0 15px;
background-color: #07c160;
border: 1px solid #07c160;
line-height: 2;
text-align: center;
border-radius: 3px;
cursor: pointer;
transition: opacity 0.2s;
outline: none;
width: 110px;
position: relative;
margin-right: 10px;
}
.qrcode-item {
margin-top: 30px;
}
.qrcode-item .findPow {
color: #808080;
line-height: 30px;
}
.qrcode-item .register {
color: #0096ff;
font-weight: bold;
line-height: 30px;
}
</style> </style>
<div class="notice"> <div class="notice">
<div class="noticewap"> <div class="noticewap">
...@@ -117,8 +196,26 @@ $phone = getPhone(4); ...@@ -117,8 +196,26 @@ $phone = getPhone(4);
<div id="errorBlock"><span class="ico">&nbsp;</span><span id="errorInner"></span></div> <div id="errorBlock"><span class="ico">&nbsp;</span><span id="errorInner"></span></div>
<div class="qrcode_login">
<div class="forms"> <div class="box">
<div class="qrcode_left">
<img id="qrcode_img" src="<?php echo $default_login_qr_code; ?>" alt=""
style="width: 150px;height: 150px">
</div>
<div class="qrcode_right">
<div class="qrcode_text">打开<span class="qrcode_text_color">租售宝APP</span></div>
<div class="qrcode_text">扫描二维码安全登录</div>
<div class="qrcode_text account-btn">账户登录</div>
</div>
</div>
<div class="qrcode-item clearfix">
<div class=" clearfix" style="width: 110px;margin: 0 auto">
<a class="findPow" href="/login/findpw/" target="_blank">找回密码</a><span class="fg">|</span><a
class="register" href="<?= GB_BROKER_REG ?>" target="_blank">立即注册</a>
</div>
</div>
</div>
<div class="forms" style="display: none">
<div class="item clearfix"> <div class="item clearfix">
<?php <?php
$login_citys = array( $login_citys = array(
...@@ -178,11 +275,16 @@ $phone = getPhone(4); ...@@ -178,11 +275,16 @@ $phone = getPhone(4);
</div> </div>
<div class="item clearfix"> <div class="item clearfix">
<div class="item_relative clearfix"> <div class="item_relative clearfix">
<div class="qrcode_text qr-code-btn" style="float: left">扫码登录</div>
<button type="button" class="submit" id="login_submit">登录</button> <button type="button" class="submit" id="login_submit">登录</button>
<div id="new_login_btn_none">正在登录</div> <div id="new_login_btn_none">正在登录</div>
<a class="findPow" href="/login/findpw/" target="_blank">找回密码</a><span class="fg">|</span><a class="register" href="<?=GB_BROKER_REG?>" target="_blank">立即注册</a>
</div> </div>
</div> </div>
<div class="item clearfix"
style="width:280px;margin:15px auto 10px auto;border-top:1px solid #d9d9d9;">
<div class="item_relative clearfix" style="width: 130px;margin: 0 auto">
<a class="findPow" href="/login/findpw/" target="_blank">找回密码</a><span class="fg">|</span><a
class="register" href="<?= GB_BROKER_REG ?>" target="_blank">立即注册</a>
</div> </div>
</div> </div>
...@@ -240,6 +342,9 @@ $phone = getPhone(4); ...@@ -240,6 +342,9 @@ $phone = getPhone(4);
<!--<script type='text/javascript'>var isa_website = '2,16,43';var isa_city = 'nj';var isa_addones = '';var isa_context_id = '';var _analyze365 = (('https:' == document.location.protocol) ? ' https://': ' http://');document.write(unescape('%3Cscript src="'+ _analyze365 + 'isa.house365.com/js/analyze.js?v=2.1" type="text/javascript"%3E%3C/script%3E'));</script>--> <!--<script type='text/javascript'>var isa_website = '2,16,43';var isa_city = 'nj';var isa_addones = '';var isa_context_id = '';var _analyze365 = (('https:' == document.location.protocol) ? ' https://': ' http://');document.write(unescape('%3Cscript src="'+ _analyze365 + 'isa.house365.com/js/analyze.js?v=2.1" type="text/javascript"%3E%3C/script%3E'));</script>-->
<script src="/source/zsb/js/layer-v3.1.1/layer/layer.js"></script>
<link href="/source/zsb/layui/css/mylayui.css" rel="stylesheet" type="text/css">
<script src="/source/zsb/layui/layui.js"></script>
<?php //if($google_analytics != '' ){ echo $google_analytics ;}?> <?php //if($google_analytics != '' ){ echo $google_analytics ;}?>
<script type="text/javascript"> <script type="text/javascript">
...@@ -353,6 +458,78 @@ var _hmt = _hmt || []; ...@@ -353,6 +458,78 @@ var _hmt = _hmt || [];
$(this).find(".select_list").hide(); $(this).find(".select_list").hide();
}); });
$('.account-btn').click(function (){
$('.qrcode_login').hide();
$('.forms').show();
})
$('.qr-code-btn').click(function () {
$('.qrcode_login').show();
$('.forms').hide();
})
$.ajax({
url: '/login/qrCode',
type: 'get',
dataType: 'json',
sync: true,
success: function (response) {
console.log(response);
if (response.result === '0') {
layer.msg(response.msg);
}
$("#qrcode_img").attr('src',response.login_img);
var uuid = response.key;
var qrcodeLogin = setInterval(function (){
$.ajax({
url: '/login/qrCodeLogin',
type: 'post',
dataType: 'json',
data: {uuid:uuid},
sync: true,
success: function (response) {
console.log(response);
var msg = response.msg;
if (msg === 'expired') {
clearInterval(qrcodeLogin);
layer.msg('登录失败,请刷新二维码重新登录');
return;
}
if (msg === 'wait') {
return;
}
if (msg === 'success' || msg === 'has_login') {
clearInterval(qrcodeLogin);
layer.msg('登录成功',{
icon: 1,
time: 2000
},function (){
location.href = "/";
})
} else {
var errorMsg = '';
switch(msg) {
case 'u_p_error':
errorMsg = '账号不正确,请刷新二维码重新扫描';
break;
case 'vad_error':
case 'exp_error':
errorMsg = '该账号已到期，请联系网站工作人员！';
break;
default:
errorMsg = '登陆失败，请稍后再试！';
break;
}
clearInterval(qrcodeLogin);
layer.msg(errorMsg);
}
}
})
},1000 * 10)
}
})
}) })
</script> </script>
......
new_admincp/applications/zsb/views/nj/rent_manage_invalid.php
View file @ 6df916f3
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
<!-- <p>房源：<span class="color">--><?php //echo $value['exipire_days'];?><!--</span></p>--> <!-- <p>房源：<span class="color">--><?php //echo $value['exipire_days'];?><!--</span></p>-->
<!-- </td>--> <!-- </td>-->
<td class="td w130"> <td class="td w130">
<p>昨日：<span class="color"><?php echo $value['click_num_y'];?></span>次</p> <p>昨日：<span class="color"><?php echo $value['click_num_y'] ? $value['click_num_y'] : 0 ;?></span>次</p>
<p><a class="link" href="/statistics_analysis/click/" target="_blank">详细</a></p> <p><a class="link" href="/statistics_analysis/click/" target="_blank">详细</a></p>
</td> </td>
<td class="td"> <td class="td">
......
new_admincp/applications/zsb/views/nj/ucenter/edit_password.php
View file @ 6df916f3
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="fields"> <div class="fields">
<div class="fgInput jsFgInput"> <div class="fgInput jsFgInput">
<input id="oldpassword" type="password" class="input_text w205" name="oldpassword" value="" <input id="oldpassword" type="password" class="input_text w205" name="oldpassword" value=""
placeholder="请输入当前正在使用的租售宝密码"/> placeholder="请输入当前正在使用的租售宝密码" autocomplete="off"/>
<label class="error" style="display:none;" >请填写当前正在使用的密码。</label> <label class="error" style="display:none;" >请填写当前正在使用的密码。</label>
</div> </div>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<div class="fields"> <div class="fields">
<div class="fgInput jsFgInput"> <div class="fgInput jsFgInput">
<input id="newpassword" type="password" class="input_text w205" name="newpassword" <input id="newpassword" type="password" class="input_text w205" name="newpassword"
placeholder="密码中必须要包含数字和字母"/> placeholder="密码中必须要包含数字和字母" autocomplete="off"/>
<label class="error" id="newpassworderr" style="display:none;" ></label> <label class="error" id="newpassworderr" style="display:none;" ></label>
</div> </div>
</div> </div>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<div class="fields nameInput"> <div class="fields nameInput">
<div class="fgInput jsNameInput jsFgInput"> <div class="fgInput jsNameInput jsFgInput">
<input id="newpassword2" type="password" class="input_text w205" name="newpassword2" <input id="newpassword2" type="password" class="input_text w205" name="newpassword2"
id="newpassword2" placeholder="密码中必须要包含数字和字母"/> id="newpassword2" placeholder="密码中必须要包含数字和字母" autocomplete="off"/>
<label class="error" style="display:none;" >两次输入的密码不一致。</label> <label class="error" style="display:none;" >两次输入的密码不一致。</label>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment