Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
This commit is contained in:
@@ -27,7 +27,6 @@ function loadMyCollectCity(){
|
||||
|
||||
function loadCurCity(city){
|
||||
plus.nativeUI.showWaiting();
|
||||
|
||||
axios.get("/rest/quotations/userCollectCitys",{}).then(function (response) {
|
||||
var curDatas = response.data.data
|
||||
if(curDatas && curDatas.length>0){
|
||||
@@ -237,10 +236,20 @@ function loadTrends(times, cityPriceMap, countMap){
|
||||
var pm = cityPriceMap;
|
||||
var cm = countMap;
|
||||
if(pm){
|
||||
prices.push(pm[time])
|
||||
if(pm[time]){
|
||||
prices.push(pm[time])
|
||||
}else{
|
||||
prices.push(null)
|
||||
}
|
||||
|
||||
}
|
||||
if(cm){
|
||||
counts.push(cm[time]);
|
||||
if(cm[time]){
|
||||
counts.push(cm[time]);
|
||||
}else{
|
||||
counts.push(null);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
showChart("price_chart", times, prices, counts)
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
<div class="item-title"><label><b>{{name}}</b></label><span class="span01">{{city_region}}</span></div>
|
||||
</div>
|
||||
<div class="item-title-row">
|
||||
<div class="item-title"><small>{{house_type}}</small></div>
|
||||
<div class="item-title"><small>{{house_room_num}}</small></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -152,7 +152,7 @@ $.config = {router: false}
|
||||
data:{
|
||||
name:"",
|
||||
city_region:"",
|
||||
house_type:""
|
||||
house_room_num:""
|
||||
}
|
||||
})
|
||||
var house_price = new Vue({
|
||||
@@ -222,7 +222,8 @@ $.config = {router: false}
|
||||
h = response.data.data
|
||||
house_info.name = h.name
|
||||
house_info.city_region = h.city+"-"+h.region
|
||||
house_info.house_type = (h.roomCount==0?"":h.roomCount+"室")+(h.hallCount==0?"":h.hallCount+"厅 ")+(h.area==0?"":h.area+"㎡ ")+((h.floor==0||h.height==0)?"":h.floor+"/"+h.height+"层")
|
||||
house_info.house_room_num = (h.houseRoomNum==null||h.houseRoomNum=="")?"暂无":h.houseRoomNum;
|
||||
// house_info.house_type = (h.roomCount==0?"":h.roomCount+"室")+(h.hallCount==0?"":h.hallCount+"厅 ")+(h.area==0?"":h.area+"㎡ ")+((h.floor==0||h.height==0)?"":h.floor+"/"+h.height+"层")
|
||||
if(h.totalPrice==0){
|
||||
house_price.total_price = "暂无";
|
||||
}else{
|
||||
@@ -243,17 +244,22 @@ $.config = {router: false}
|
||||
house_price.percentage_30="暂无"
|
||||
}
|
||||
house_price.city=h.city
|
||||
if(h.compareMoney<0){
|
||||
house_price.compare_word="低"
|
||||
house_price.words="元"
|
||||
house_price.compare_money=-h.compareMoney
|
||||
}else if(h.compareMoney>0){
|
||||
house_price.compare_word="高"
|
||||
house_price.words="元"
|
||||
house_price.compare_money=h.compareMoney
|
||||
if(h.avgPrice==0){
|
||||
house_price.words="暂无"
|
||||
}else{
|
||||
house_price.compare_money="相等"
|
||||
if(h.compareMoney<0){
|
||||
house_price.compare_word="低"
|
||||
house_price.words="元"
|
||||
house_price.compare_money=-h.compareMoney
|
||||
}else if(h.compareMoney>0){
|
||||
house_price.compare_word="高"
|
||||
house_price.words="元"
|
||||
house_price.compare_money=h.compareMoney
|
||||
}else{
|
||||
house_price.compare_money="相等"
|
||||
}
|
||||
}
|
||||
|
||||
// if(h.evaluatePercent<0){
|
||||
// evaluate_msg.evaluate_words="下跌概率"
|
||||
// evaluate_msg.arrow="icon icon-arrow-green"
|
||||
|
||||
@@ -46,7 +46,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">{{myCityMap.cityTopMonthAvgPrice}}<span>元/㎡</span></div>
|
||||
<div class="card-content-inner" v-else>暂无</div>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<span v-if="myCityMap.oneMonthUpDownRange >= 0">
|
||||
@@ -149,7 +150,7 @@ $.config = {router: false}
|
||||
var date = new Date();
|
||||
var year = date.getFullYear()+'年';
|
||||
var month = date.getMonth()+1+'月';
|
||||
var city = ""
|
||||
var city = "神农架"
|
||||
var cityInfoVue = new Vue({
|
||||
el: '#cityInfo',
|
||||
data: {
|
||||
@@ -161,18 +162,24 @@ var cityInfoVue = new Vue({
|
||||
}
|
||||
});
|
||||
|
||||
document.addEventListener('plusready', onPlusReady, false);
|
||||
function onPlusReady() {
|
||||
var self = plus.webview.currentWebview();
|
||||
var city = self.city
|
||||
cityInfoVue.$data.city = city;
|
||||
loadCurCity(city);
|
||||
//document.addEventListener('plusready', onPlusReady, false);
|
||||
//function onPlusReady() {
|
||||
// var self = plus.webview.currentWebview();
|
||||
// var city = self.city
|
||||
// cityInfoVue.$data.city = city;
|
||||
// loadCurCity(city);
|
||||
// loadCityPriceInfo(city)
|
||||
// loadUpOrDown(city);
|
||||
// loadHotDistrict(city)
|
||||
// loadCityPricesAndCounts(city)
|
||||
//
|
||||
//}
|
||||
|
||||
loadCurCity(city);
|
||||
loadCityPriceInfo(city)
|
||||
loadUpOrDown(city);
|
||||
loadHotDistrict(city)
|
||||
loadCityPricesAndCounts(city)
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1235,7 +1235,6 @@ $.config = {router: false}
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
document.addEventListener('plusready', onPlusReady, false);
|
||||
function onPlusReady(){
|
||||
var city = "";
|
||||
@@ -1249,8 +1248,6 @@ $.config = {router: false}
|
||||
//lng = p.coords.longitude;//获取到当前位置的经度
|
||||
//lat = p.coords.latitude;//获取到当前位置的纬度;
|
||||
|
||||
|
||||
loadMyCollectCity();
|
||||
}, function(e){
|
||||
},
|
||||
{
|
||||
@@ -1341,6 +1338,8 @@ $.config = {router: false}
|
||||
$(".cardNearby").on("click", function(){
|
||||
window.location.href = "01_index04_districtDetail.html";
|
||||
});
|
||||
|
||||
loadMyCollectCity();
|
||||
|
||||
}
|
||||
|
||||
@@ -1440,7 +1439,7 @@ function clickCity(val){
|
||||
|
||||
city = val;
|
||||
|
||||
|
||||
plus.nativeUI.showWaiting();
|
||||
$("#cityInfo").show()
|
||||
$("#tabCityDiv a").removeClass("active");
|
||||
// $("a[href="+val+"]").addClass("active");
|
||||
@@ -1464,7 +1463,7 @@ function clickCity(val){
|
||||
|
||||
$("#tabQuotation1").removeClass("active");
|
||||
$("#tabQuotation0").removeClass("active");
|
||||
|
||||
plus.nativeUI.closeWaiting();
|
||||
}
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -208,7 +208,12 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
|
||||
htmlContent = htmlContent +"<div class='item-inner'><div class='item-title-row'>";
|
||||
htmlContent = htmlContent +"<div class='item-title'><label>"+result.name+"</label><span class='span01'>"+result.city+"-"+result.region+"</span></div>";
|
||||
htmlContent = htmlContent +"</div><div class='item-title-row'>";
|
||||
htmlContent = htmlContent +"<div class='item-title'><small>"+result.roomCount+"室"+result.hallCount+"厅 "+result.area+"㎡ "+result.floor+"/"+result.height+"层</small></div>";
|
||||
|
||||
//htmlContent = htmlContent +"<div class='item-title'><small>"+result.roomCount+"室"+result.hallCount+"厅";
|
||||
var houseRoomNum = result.houseRoomNum==""?"暂无":result.houseRoomNum;
|
||||
htmlContent = htmlContent +"<div class='item-title'><small>"+houseRoomNum;
|
||||
|
||||
htmlContent = htmlContent +" "+result.area+"㎡ "+result.floor+"/"+result.height+"层</small></div>"
|
||||
htmlContent = htmlContent +"</div><div class='item-subtitle'>";
|
||||
//对应城市地区小区30天涨跌幅
|
||||
//动态构建key
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user