Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
This commit is contained in:
@@ -5,6 +5,7 @@ var dates;
|
||||
var data;
|
||||
var volumes;
|
||||
var curOption;
|
||||
var mapLoadCount = 0;
|
||||
|
||||
|
||||
/* 关注&已关注切换 */
|
||||
@@ -93,11 +94,20 @@ $("#tabRentDiv").on("click", function () {
|
||||
$("#tabChart1").css("z-index","-1");
|
||||
});
|
||||
|
||||
var t1 = window.setTimeout(loadMap,1000);
|
||||
var t1 = window.setInterval(loadMap,1000);
|
||||
function loadMap(){
|
||||
mapLoadCount++;
|
||||
if(lng && lat){
|
||||
loadMapPoi();
|
||||
window.clearTimeout(t1);
|
||||
$("#mapDiv").show();
|
||||
window.clearInterval(t1);
|
||||
}else{
|
||||
if(mapLoadCount == 10){
|
||||
$("#mapDiv").hide();
|
||||
window.clearInterval(t1);
|
||||
}else{
|
||||
$("#mapDiv").hide();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -530,7 +530,11 @@ function showRegionInfo(city){
|
||||
function collectCity(city, index){
|
||||
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
|
||||
clicked('../user/codeSms.html',true,false,{},{},function(){
|
||||
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
|
||||
collectCity(city)
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
|
||||
})
|
||||
return;
|
||||
} else {
|
||||
@@ -571,12 +575,20 @@ function docollectCity(city){
|
||||
}
|
||||
}
|
||||
if(isLast){
|
||||
window.location.reload();
|
||||
//window.location.reload();
|
||||
$("a[href='#tabQuotation0']").click();
|
||||
}
|
||||
myDatasVue.$data.cityDatas = newRet1;
|
||||
citysVue.$data.citys = newRet2
|
||||
}else{
|
||||
alert(msg);
|
||||
var datas = myDatasVue.$data.cityDatas
|
||||
for(var i in datas){
|
||||
var obj = datas[i]
|
||||
if(obj.city == city){
|
||||
obj.colled = true;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1568,7 +1568,9 @@
|
||||
"resources": [
|
||||
"/views/user/bindingMobile.html"
|
||||
],
|
||||
"refer": [],
|
||||
"refer": [
|
||||
"views/user/passLogin.html"
|
||||
],
|
||||
"priority": 0
|
||||
},
|
||||
"views/district/detail.html": {
|
||||
@@ -1617,7 +1619,8 @@
|
||||
"refer": [
|
||||
"views/user/passLogin.html",
|
||||
"views/district/detail.html",
|
||||
"views/setting/setting.html"
|
||||
"views/setting/setting.html",
|
||||
"views/user/codeSms.html"
|
||||
],
|
||||
"priority": 0
|
||||
},
|
||||
@@ -1670,7 +1673,15 @@
|
||||
"views/house/regions.html",
|
||||
"views/district/detail.html",
|
||||
"views/user/codeSms.html",
|
||||
"views/house/cityDetail.html"
|
||||
"views/house/cityDetail.html",
|
||||
"views/user/passLogin.html"
|
||||
],
|
||||
"priority": 0
|
||||
},
|
||||
"views/house/houseManageList.html": {
|
||||
"resources": [],
|
||||
"refer": [
|
||||
"views/house/add.html"
|
||||
],
|
||||
"priority": 0
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ Vue.component('near-dist-component', {
|
||||
});
|
||||
},
|
||||
showDistrict:function(index){
|
||||
clicked('../district/detail.html',true,false,{},{city:distDatas.nearDists[index].city,region:distDatas.nearDists[index].region,name:distDatas.nearDists[index].name});
|
||||
clicked('../district/detail.html',true,false,{},{city:distDatas.nearDists[index].city,region:distDatas.nearDists[index].district,name:distDatas.nearDists[index].name});
|
||||
}
|
||||
},
|
||||
mounted:function(){
|
||||
|
||||
@@ -165,7 +165,7 @@
|
||||
</div>
|
||||
|
||||
|
||||
<div class="topic">
|
||||
<div class="topic" id="mapDiv">
|
||||
<div class="topicTitle">位置及周边</div>
|
||||
<div class="topicContent" style="padding:0;">
|
||||
<div class="content-block content-block01 content-block01a" id="aroundLink">
|
||||
|
||||
@@ -335,7 +335,6 @@ function addManagement(id, houseStatus, liveStatus){
|
||||
$.toast(response.data.data);
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
plus.webview.getWebviewById('views/house/houseList.html').reload();
|
||||
}else{
|
||||
$.toast(response.data.message);
|
||||
}
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
<i class="icon icon-evaluation01"></i>
|
||||
<span>出售分析</span>
|
||||
</div>-->
|
||||
<div onclick="openNewView('/views/rent/rent.html')">
|
||||
<div onclick="gotoRentManager()">
|
||||
<i class="icon icon-evaluation02"></i>
|
||||
<span>出租管理</span>
|
||||
</div>
|
||||
@@ -109,6 +109,38 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="topic rentBox dn">
|
||||
<div class="topicContent" style="padding:0.5rem 0;">
|
||||
<div class="list-block dataList">
|
||||
<ul>
|
||||
<li class="item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title" style="color:#666;">目前状态</div>
|
||||
<div class="item-after">出租</div>
|
||||
</div>
|
||||
</li>
|
||||
<li class="item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title" style="color:#666;">出租日期</div>
|
||||
<div class="item-after">2018/02/01 - 2018/07/31</div>
|
||||
</div>
|
||||
</li>
|
||||
<li class="item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title" style="color:#666;">每期租金</div>
|
||||
<div class="item-after">5,000元 (1月/次)</div>
|
||||
</div>
|
||||
</li>
|
||||
<li class="item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title" style="color:#666;">下次收租</div>
|
||||
<div class="item-after">3月1日</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="topic">
|
||||
<div class="topicContent" style="padding:0.5rem 0;">
|
||||
<div class="list-block">
|
||||
@@ -297,7 +329,7 @@ $.config = {router: false}
|
||||
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
|
||||
<script>
|
||||
document.addEventListener('plusready', onPlusReady, false);
|
||||
var houseId="190763130039566336"; //= "186182250936643584";
|
||||
var houseId="191190409534242816"; //= "186182250936643584";
|
||||
var lat;
|
||||
var lng;
|
||||
var city;
|
||||
@@ -313,7 +345,6 @@ function onPlusReady(){
|
||||
//houseId="106777351102136320";
|
||||
init();
|
||||
}
|
||||
|
||||
var baseInfo = new Vue({
|
||||
el: '#baseInfo',
|
||||
data: {
|
||||
@@ -339,7 +370,10 @@ var baseInfo = new Vue({
|
||||
rate:"",
|
||||
minSellPrice:"",
|
||||
maxSellPrice:"",
|
||||
rentRooms:""
|
||||
rentRooms:"",
|
||||
rentTime : "-";
|
||||
rentPrice : "-";
|
||||
nextRent : "-";
|
||||
}
|
||||
})
|
||||
|
||||
@@ -388,7 +422,18 @@ function init(){
|
||||
}else{
|
||||
baseInfo.liveStatus='其它';
|
||||
}
|
||||
|
||||
if(houseInfo.liveStatus=="出租"){
|
||||
$('.rentBox').show();
|
||||
if(houseInfo.leaseStartDate){
|
||||
baseInfo.rentTime = formatTime(houseInfo.leaseStartDate)+"-"+formatTime(houseInfo.leaseEndDate);
|
||||
baseInfo.rentPrice = houseInfo.rent+"元("+houseInfo.rentCycle+"/"+houseInfo.rentCycleUnit+")";
|
||||
baseInfo.nextRent = formatTime2(houseInfo.lastRentDate);
|
||||
}else{
|
||||
baseInfo.rentTime = "-";
|
||||
baseInfo.rentPrice = "-";
|
||||
baseInfo.nextRent = "-";
|
||||
}
|
||||
}
|
||||
baseInfo.estatetype=houseInfo.estatetype;
|
||||
baseInfo.totalPrice=houseInfo.totalPrice;
|
||||
baseInfo.price=houseInfo.price;
|
||||
@@ -407,6 +452,23 @@ function init(){
|
||||
console.log(error);
|
||||
});
|
||||
}
|
||||
|
||||
function formatTime(time){
|
||||
var now = new Date(time);
|
||||
var year=now.getFullYear();
|
||||
var month=now.getMonth()+1;
|
||||
var date=now.getDate();
|
||||
return year+"/"+month+"/"+date;
|
||||
|
||||
}
|
||||
function formatTime2(time){
|
||||
var now = new Date(time);
|
||||
var year=now.getFullYear();
|
||||
var month=now.getMonth()+1;
|
||||
var date=now.getDate();
|
||||
return month+"月"+date+"日";
|
||||
|
||||
}
|
||||
function openMapWindow(){
|
||||
clicked('/views/district/arround.html',true,false,{},{city:city,region:region,name:name,lat:lat,lng:lng});
|
||||
}
|
||||
@@ -425,6 +487,7 @@ $(document).on('click','.open-vertical-modal', function () {
|
||||
onClick: function() {
|
||||
$('.open-vertical-modal').text('自住');
|
||||
addManagement(id, houseStatus, "自住");
|
||||
$('.rentBox').hide();
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -432,6 +495,7 @@ $(document).on('click','.open-vertical-modal', function () {
|
||||
onClick: function() {
|
||||
$('.open-vertical-modal').text('出租');
|
||||
addManagement(id, houseStatus, "出租");
|
||||
$('.rentBox').show();
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -439,6 +503,7 @@ $(document).on('click','.open-vertical-modal', function () {
|
||||
onClick: function() {
|
||||
$('.open-vertical-modal').text('空置');
|
||||
addManagement(id, houseStatus, "空置");
|
||||
$('.rentBox').hide();
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -514,6 +579,9 @@ function openNewView(viewHtml) {
|
||||
function gotoLoanApply(){
|
||||
clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: oriCity, mobile: ""},function(){})
|
||||
}
|
||||
function gotoRentManager(){
|
||||
clicked('/views/rent/rentManager.html',true,false,{},{houseId: houseId},function(){})
|
||||
}
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
@@ -180,7 +180,8 @@
|
||||
<span>当前参考均价</span>
|
||||
</div>
|
||||
<div class="card-content">
|
||||
<div class="card-content-inner">{{myCityMap.cityTopMonthAvgPrice}}<span>元/㎡</span></div>
|
||||
<div class="card-content-inner" v-if="myCityMap.cityTopMonthAvgPrice > 0">{{myCityMap.cityTopMonthAvgPrice}}<span>元/㎡</span></div>
|
||||
<div class="card-content-inner" v-else>暂无</div>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<span v-if="myCityMap.oneMonthUpDownRange >= 0">
|
||||
|
||||
@@ -27,6 +27,9 @@
|
||||
|
||||
.mark-icon-box {width:24px;height:30px;position:absolute;z-index:98;}
|
||||
.mark-icon-box .mark-icon {width: 20px;height: 30px;display: block;cursor: pointer;font-size: 14px; color: #fff;font-weight: bold;text-align: center;line-height: 24px;background: url(../../images/dw.png) no-repeat;}
|
||||
|
||||
.loadingBg{width:100%;height:100%;background:#fff;overflow:hidden;position:absolute;top:11px;left:0;z-index:100;}
|
||||
.loadingBg .infinite-scroll-preloader{margin-top:30%;}
|
||||
</style>
|
||||
|
||||
</head>
|
||||
@@ -101,7 +104,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="topic">
|
||||
<div class="topic" id="mapDiv">
|
||||
<div class="topicTitle">位置及周边</div>
|
||||
<div class="topicContent" style="padding:0;">
|
||||
<div class="content-block content-block01 content-block01a" id="aroundLink">
|
||||
@@ -171,24 +174,15 @@ $.config = {router: false}
|
||||
<script type='text/javascript' src='../../js/common.js' charset='utf-8'></script>
|
||||
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
|
||||
<script>
|
||||
var city = "北京"
|
||||
var region = "顺义"
|
||||
var name = "龙湾别墅五期"
|
||||
var city = "上海"
|
||||
var region = "闵行"
|
||||
var name = "卓越维港别墅"
|
||||
|
||||
var lat;
|
||||
var lng;
|
||||
var address;
|
||||
var tags;
|
||||
var baseInfo = new Vue({
|
||||
el: '#districtBaseInfo',
|
||||
data: {
|
||||
name : "",
|
||||
city:"",
|
||||
region: "",
|
||||
address: "",
|
||||
tags:[]
|
||||
}
|
||||
})
|
||||
var baseInfo ;
|
||||
|
||||
|
||||
|
||||
@@ -206,15 +200,28 @@ function onPlusReady() {
|
||||
region = self.region
|
||||
name = self.name;
|
||||
// 创建根实例
|
||||
new Vue({
|
||||
el: '#baseInfo'
|
||||
baseInfo = new Vue({
|
||||
el: '#districtBaseInfo',
|
||||
data: {
|
||||
name : "",
|
||||
city:"",
|
||||
region: "",
|
||||
address: "",
|
||||
tags:[]
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
//new Vue({
|
||||
// el: '#baseInfo'
|
||||
//})
|
||||
|
||||
/*baseInfo = new Vue({
|
||||
el: '#districtBaseInfo',
|
||||
data: {
|
||||
name : "",
|
||||
city:"",
|
||||
region: "",
|
||||
address: "",
|
||||
tags:[]
|
||||
}
|
||||
})*/
|
||||
|
||||
|
||||
/* 小区租金走势 */
|
||||
|
||||
@@ -126,7 +126,7 @@ $.config = {router: false}
|
||||
document.addEventListener('plusready', onPlusReady, false);
|
||||
function onPlusReady() {
|
||||
var self = plus.webview.currentWebview();
|
||||
id = self.id
|
||||
id = self.houseId
|
||||
axios.get('/rest/rent/queryHouseRent',{params:{id:id}}).then(function(response){
|
||||
// var data = response.data.data.houses;
|
||||
// $.each(data,function(i){
|
||||
@@ -284,6 +284,7 @@ function onPlusReady() {
|
||||
}
|
||||
|
||||
axios.post("/rest/rent/changeStatus",d).then(function(response){
|
||||
plus.webview.getWebviewById('views/house/detail.html').reload();
|
||||
back(),plus.nativeUI.closeWaiting();
|
||||
}).catch(function(error){
|
||||
console.log(error)
|
||||
|
||||
@@ -109,6 +109,7 @@ function logout() {
|
||||
//退出登录之前loading下个人中心
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
|
||||
plus.webview.getWebviewById('yfindex.html').reload();
|
||||
timer.start();
|
||||
}
|
||||
|
||||
@@ -119,6 +119,18 @@ $(".check").on("click", function () {
|
||||
function openView() {
|
||||
clicked(BASE_PATH + '/user/agreement',true)
|
||||
}
|
||||
|
||||
var originalHeight=document.documentElement.clientHeight || document.body.clientHeight;
|
||||
window.onresize=function(){
|
||||
//软键盘弹起与隐藏 都会引起窗口的高度发生变化
|
||||
var resizeHeight=document.documentElement.clientHeight || document.body.clientHeight;
|
||||
if(resizeHeight*1<originalHeight*1){ //resizeHeight<originalHeight证明窗口被挤压了
|
||||
plus.webview.currentWebview().setStyle({
|
||||
height:originalHeight
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
@@ -167,6 +167,7 @@
|
||||
<div id="tabList2" class="tab">
|
||||
<div class="list-block media-list">
|
||||
<ul class="list-container" id="mf_ul">
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
<!-- 分页加载效果, 默认不显示, 和 加载loading页区分开-->
|
||||
@@ -176,11 +177,12 @@
|
||||
</div>
|
||||
<!-- 我的收藏 -->
|
||||
<div id="tabList3" class="tab">
|
||||
<div class="list-block" >
|
||||
<ul class="list-container" id="myColect">
|
||||
<!-- 动态拼接内容 -->
|
||||
</ul>
|
||||
<div class="list-block media-list" id="myColect">
|
||||
<!-- <ul class="list-container" >
|
||||
|
||||
</ul>-->
|
||||
</div>
|
||||
|
||||
<!-- 分页加载效果, 默认不显示, 和 加载loading页区分开-->
|
||||
<div id="loadTip3" class="infinite-scroll-preloader">
|
||||
<div class="preloader"></div>
|
||||
|
||||
Reference in New Issue
Block a user