Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
This commit is contained in:
@@ -14,13 +14,13 @@ function savePageLog() {
|
||||
var device = plus.device.uuid;
|
||||
var model = plus.device.model;
|
||||
plus.geolocation.getCurrentPosition(function(p){
|
||||
province = p.address.province;
|
||||
city = p.address.city;
|
||||
region = p.address.district;
|
||||
lng = p.coords.longitude;
|
||||
lat = p.coords.latitude;
|
||||
address = p.address.street;
|
||||
doSavePageLog({page:page, lng:lng, lat:lat, province:province, city:city, region:region, address:address, device:device, model:model});
|
||||
baidu_province = p.address.province;
|
||||
baidu_city = p.address.city;
|
||||
baidu_region = p.address.district;
|
||||
baidu_lng = p.coords.longitude;
|
||||
baidu_lat = p.coords.latitude;
|
||||
baidu_address = p.address.street;
|
||||
doSavePageLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model});
|
||||
}, function(e){
|
||||
doSavePageLog({page:page, device:device, model:model});
|
||||
},
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<title></title>
|
||||
<title>房产分析</title>
|
||||
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
|
||||
<link rel="shortcut icon" href="/favicon.ico">
|
||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||
@@ -83,19 +83,19 @@
|
||||
<div class="topic">
|
||||
<div class="topicContent" style="padding-left:0;padding-right:0;">
|
||||
<div class="topicContent_center home">
|
||||
<div onclick="window.location.href='01_index01_myHouse04_evaluationResult01_saleAnalysis01_index.html'">
|
||||
<!--<div onclick="window.location.href='+BASE_PATH+'/saleAnalysis/index'">
|
||||
<i class="icon icon-evaluation01"></i>
|
||||
<span>出售分析</span>
|
||||
</div>
|
||||
<div onclick="window.location.href='01_index01_myHouse04_evaluationResult02_rentManagement01_index.html'">
|
||||
</div>-->
|
||||
<div onclick="openNewView('/views/rent/rent.html')">
|
||||
<i class="icon icon-evaluation02"></i>
|
||||
<span>出租管理</span>
|
||||
</div>
|
||||
<div onclick="window.location.href='01_index01_myHouse04_evaluationResult03_exchange01_index.html'">
|
||||
<!--<div onclick="window.location.href='01_index01_myHouse04_evaluationResult03_exchange01_index.html'">
|
||||
<i class="icon icon-evaluation03"></i>
|
||||
<span>我要置换</span>
|
||||
</div>
|
||||
<div onclick="window.location.href='01_index01_myHouse04_evaluationResult04_loan01_inputInfo.html'">
|
||||
</div>-->
|
||||
<div onclick="openNewView('/views/loan/loanInfo.html')">
|
||||
<i class="icon icon-personal03"></i>
|
||||
<span>我要贷款</span>
|
||||
</div>
|
||||
@@ -296,6 +296,9 @@ var lng;
|
||||
var city;
|
||||
var region;
|
||||
var name;
|
||||
var oriCity;
|
||||
var oriRegion;
|
||||
var oriName;
|
||||
//扩展API加载完毕,现在可以正常调用扩展API
|
||||
function onPlusReady(){
|
||||
var self = plus.webview.currentWebview();
|
||||
@@ -344,9 +347,9 @@ function init(){
|
||||
var houseInfo = response.data.data.houseInfo;
|
||||
lat = houseInfo.lat;
|
||||
lng = houseInfo.lng;
|
||||
city = houseInfo.city;
|
||||
region = houseInfo.region;
|
||||
name = houseInfo.name;
|
||||
oriCity = houseInfo.city;
|
||||
oriRegion = houseInfo.region;
|
||||
oriName = houseInfo.name;
|
||||
address = houseInfo.address;
|
||||
var text = houseInfo.name;
|
||||
var length = text.length;
|
||||
@@ -359,6 +362,9 @@ function init(){
|
||||
if(response.data.data.rentRooms){
|
||||
rentRooms = response.data.data.rentRooms;
|
||||
}
|
||||
city = houseInfo.city;
|
||||
region = houseInfo.region;
|
||||
name = houseInfo.name;
|
||||
baseInfo.id=houseInfo.id;
|
||||
baseInfo.city = houseInfo.city;
|
||||
baseInfo.name = houseInfo.name;
|
||||
@@ -497,6 +503,10 @@ $("#tabRentDiv").on("click", function () {
|
||||
$("#tabChart2").css("z-index","1");
|
||||
$("#tabChart1").css("z-index","-1");
|
||||
});
|
||||
function openNewView(viewHtml) {
|
||||
alert(viewHtml)
|
||||
clicked(viewHtml,true,false,{},{city:oriCity,region:oriRegion,name:oriName})
|
||||
}
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
@@ -25,8 +25,14 @@
|
||||
.list-block .item-subtitle div.price{position:absolute;bottom:-0.3rem;right:0;}
|
||||
.list-block .item-subtitle div.price em strong{font-size:1.4rem;color:#EB5F34;font-weight:bold;margin-right:0.1rem;}
|
||||
/**添加loading加载效果**/
|
||||
.loadingBg{width:100%;height:100%;background:#fff;overflow:hidden;position:absolute;top:71px;left:0;z-index:100;}
|
||||
.loadingBg .infinite-scroll-preloader{margin-top:60%;}
|
||||
.loadingBgDiv{width:100%;height:70%;background:#fff;overflow:hidden;position:absolute;top:2.2rem;left:0;z-index:100;}
|
||||
.loadingBgDiv .infinite-scroll-preloader{margin-top:60%;}
|
||||
.list-block{margin-bottom:4rem;}
|
||||
.content-block{width:100%;background:#fff;position:fixed;bottom:0;z-index:10000;}
|
||||
@media(min-height:750px){
|
||||
.list-block{margin-bottom:4.5rem;}
|
||||
.content-block{bottom:4.5rem;}
|
||||
}
|
||||
</style>
|
||||
|
||||
</head>
|
||||
@@ -36,17 +42,13 @@
|
||||
<div class="page-group">
|
||||
<div class="page page-current" id="dataList" style="display: none;">
|
||||
<header class="bar bar-nav">
|
||||
<!--<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
|
||||
<span class="icon icon-left"></span>
|
||||
</button>-->
|
||||
<h1 class="title">房产评估</h1>
|
||||
</header>
|
||||
<!-- 加载loading页 -->
|
||||
<div class="loadingBg">
|
||||
<div class="infinite-scroll-preloader">
|
||||
<div class="preloader"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="loadingBgDiv">
|
||||
<div class="infinite-scroll-preloader">
|
||||
<div class="preloader"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content">
|
||||
<div class="list-block media-list">
|
||||
<!-- 动态封装部分 begin -->
|
||||
@@ -62,11 +64,13 @@
|
||||
</div>
|
||||
<div class="page page-current" id="noData" style="display: none;">
|
||||
<header class="bar bar-nav">
|
||||
<!--<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
|
||||
<span class="icon icon-left"></span>
|
||||
</button>-->
|
||||
<h1 class="title">房产评估</h1>
|
||||
</header>
|
||||
<div class="loadingBgDiv">
|
||||
<div class="infinite-scroll-preloader">
|
||||
<div class="preloader"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content contentSuggest">
|
||||
<div class="noData">
|
||||
<img src="../../images/noData.png">
|
||||
@@ -101,6 +105,7 @@ $.config = {router: false}
|
||||
<script type="text/javascript" src="../../js/shara/sharaMine.js" ></script>
|
||||
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
|
||||
<script>
|
||||
|
||||
//调用mui.init方法
|
||||
$.init()
|
||||
|
||||
@@ -149,7 +154,8 @@ function addManagement(id, houseStatus, liveStatus){
|
||||
var status = response.data.status;
|
||||
if(status){
|
||||
$.toast(response.data.data);
|
||||
window.location.reload();
|
||||
$('.loadingBgDiv').show();
|
||||
checkIsLogin();
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
plus.webview.getWebviewById('yfindex.html').reload();
|
||||
}else{
|
||||
@@ -172,9 +178,11 @@ function selectEvaluateList(){
|
||||
if(response.data.data==null || resultsMap.houseInfoList==null || resultsMap.houseInfoList.length==0){
|
||||
$('#dataList').hide();
|
||||
$('#noData').show();
|
||||
$('.loadingBgDiv').hide()
|
||||
}else{
|
||||
$('#dataList').show();
|
||||
$('#noData').hide();
|
||||
$('.loadingBgDiv').hide()
|
||||
var results = resultsMap.houseInfoList;
|
||||
var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap;
|
||||
var cityAvgPriceMap = resultsMap.cityAvgPriceMap;
|
||||
@@ -183,7 +191,7 @@ function selectEvaluateList(){
|
||||
//动态追加内容
|
||||
$('.list-block ul').html(htmlContent);
|
||||
//添加loading等待效果
|
||||
$(".loadingBg").hide();
|
||||
//$(".loadingBg").hide();
|
||||
$(".content-block").show();
|
||||
}
|
||||
|
||||
@@ -259,6 +267,7 @@ function checkIsLogin(){
|
||||
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
|
||||
$('#dataList').hide();
|
||||
$('#noData').show();
|
||||
$('.loadingBgDiv').hide();
|
||||
}else{
|
||||
selectEvaluateList();
|
||||
}
|
||||
|
||||
@@ -29,6 +29,15 @@
|
||||
<div class="content" id="app">
|
||||
<div class="list-block media-list">
|
||||
<ul>
|
||||
<li>
|
||||
<a onclick="clicked('/views/user/updatePass.html',true);" class="item-link item-content">
|
||||
<div class="item-inner">
|
||||
<div class="item-title-row">
|
||||
<div class="item-title">设置密码</div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a onclick="clicked('about.html',true);" class="item-link item-content">
|
||||
<div class="item-inner">
|
||||
|
||||
Reference in New Issue
Block a user