Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1

This commit is contained in:
zongzhimin
2018-04-14 16:42:03 +08:00
6 changed files with 73 additions and 69 deletions
@@ -33,56 +33,56 @@ Vue.component('base-info-component', {
<p>
<label>竣工年代:</label>
<span v-if="finishBuildingDate">{{finishBuildingDate}}</span>
<span v-else>暂无数据</span>
<span v-else>暂无</span>
</p>
<p>
<label>容<small class="spacing01a">&nbsp;</small>积<small class="spacing01a">&nbsp;</small>率:</label>
<span v-if="cubagePercent">{{cubagePercent}}</span>
<span v-else>暂无数据</span>
<span v-else>暂无</span>
</p>
<p>
<label>绿<small class="spacing01a">&nbsp;</small>化<small class="spacing01a">&nbsp;</small>率:</label>
<span v-if="virescencePercent">{{virescencePercent}}</span>
<span v-else>暂无数据</span>
<span v-else>暂无</span>
</p>
<p>
<label>主力面积:</label>
<span v-if="moreArea">{{moreArea}}</span>
<span v-else>暂无数据</span>
<span v-else>暂无</span>
</p>
<p>
<label>开<small class="spacing01a">&nbsp;</small>发<small class="spacing01a">&nbsp;</small>商:</label>
<span class="span01" v-if="developer">{{developer}}</span>
<span v-else>暂无数据</span>
<span v-else>暂无</span>
</p>
<p>
<label>物业公司:</label>
<span class="span01" v-if="estateCompany">{{estateCompany}}</span>
<span v-else>暂无数据</span>
<span v-else>暂无</span>
</p>
</div>
<div class="col-50">
<p>
<label>总<small class="spacing01a">&nbsp;</small>户<small class="spacing01a">&nbsp;</small>数:</label>
<span>{{householdCount}}</span>
<span v-else>暂无数据</span>
<span v-else>暂无</span>
</p>
<p>
<label>停<small class="spacing01a">&nbsp;</small>车<small class="spacing01a">&nbsp;</small>位:</label>
<span v-if="carSiteCount">{{carSiteCount}}</span>
<span v-else>暂无数据</span>
<span v-else>暂无</span>
</p>
<p>
<label>物<small class="spacing01a">&nbsp;</small>业<small class="spacing01a">&nbsp;</small>费:</label>
<span v-if="estateCharge">{{estateCharge}}元/㎡/月</span>
<span v-else>暂无数据</span>
<span v-else>暂无</span>
</p>
</div>
</div>
+1 -1
View File
@@ -10,7 +10,7 @@ Vue.component('near-dist-component', {
<div class="card cardNearby" v-for="(dist,index) in nearDists" @click="showDistrict(index)">
<div class="card-header">{{dist.sname}}</div>
<div class="card-content">
<div class="card-content-inner">{{dist.avgPrice}}元/㎡</div>
<div class="card-content-inner">{{dist.avgPrice?(dist.avgPrice+"元/㎡"):'暂无'}}</div>
</div>
<div class="card-footer">距您{{dist.distance}}m</div>
</div>
+58 -56
View File
@@ -165,7 +165,7 @@
</div>
<div class="topic" id="mapDiv">
<div class="topic dn" id="mapDiv">
<div class="topicTitle">位置及周边</div>
<div class="topicContent" style="padding:0;">
<div class="content-block content-block01 content-block01a" id="aroundLink">
@@ -262,61 +262,61 @@ $.config = {router: false}
<script>
//loadDistrictInfo();
//document.addEventListener('plusready', onPlusReady, false);
//function onPlusReady() {
// var self = plus.webview.currentWebview();
// city = self.city
// region = self.region
// name = self.name;
// // 创建根实例
// baseInfo = new Vue({
// el: '#districtBaseInfo',
// data: {
// name : "",
// city:"",
// region: "",
// address: "",
// avgPrice:"",
// oneMonthUpDownRange:"",
// priceRate:"",
// cityPrice:"",
// finishBuildingDate:"",
// householdCount:"",
// cubagePercent:"",
// carSiteCount:"",
// virescencePercent:"",
// estateCharge:"",
// moreArea:"",
// developer:"",
// estateCompany:"",
// tags:[],
// nearDists:[],
// regionIndex:"",
// schoolIndex:""
// },
// methods:{
// showChat: function(type){
// if(type == 2) {
// document.getElementById("tabChart2").style = "z-index:1";
// document.getElementById("tabChart1").style = "z-index:-1";
// } else {
// document.getElementById("tabChart2").style = "z-index:-1";
// document.getElementById("tabChart1").style = "z-index:1";
// }
//
// }
// }
// })
//
// /* 小区均价分析 */
// loadKLineData(city, region, name);
// /* 小区租金走势 */
// loadRentTrends(city, region, name,2);
//}
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady() {
var self = plus.webview.currentWebview();
city = self.city
region = self.region
name = self.name;
// 创建根实例
baseInfo = new Vue({
el: '#districtBaseInfo',
data: {
name : "",
city:"",
region: "",
address: "",
avgPrice:"",
oneMonthUpDownRange:"",
priceRate:"",
cityPrice:"",
finishBuildingDate:"",
householdCount:"",
cubagePercent:"",
carSiteCount:"",
virescencePercent:"",
estateCharge:"",
moreArea:"",
developer:"",
estateCompany:"",
tags:[],
nearDists:[],
regionIndex:"",
schoolIndex:""
},
methods:{
showChat: function(type){
if(type == 2) {
document.getElementById("tabChart2").style = "z-index:1";
document.getElementById("tabChart1").style = "z-index:-1";
} else {
document.getElementById("tabChart2").style = "z-index:-1";
document.getElementById("tabChart1").style = "z-index:1";
}
}
}
})
/* 小区均价分析 */
loadKLineData(city, region, name);
/* 小区租金走势 */
loadRentTrends(city, region, name,2);
}
baseInfo = new Vue({
/*baseInfo = new Vue({
el: '#districtBaseInfo',
data: {
name : "",
@@ -354,12 +354,12 @@ baseInfo = new Vue({
}
}
})
})*/
/* 小区均价分析 */
loadKLineData(city, region, name);
//loadKLineData(city, region, name);
/* 小区租金走势 */
loadRentTrends(city, region, name,2);
//loadRentTrends(city, region, name,2);
function openMapWindow(){
clicked('arround.html',true,false,{},{city:city,region:region,name:name,lat:lat,lng:lng});
@@ -386,7 +386,9 @@ var t1 = window.setInterval(loadMap,1000);
function loadMap(){
if(lng && lat){
loadMapPoi();
$("#mapDiv").show();
window.clearInterval(t1);
}
}
+2 -1
View File
@@ -273,7 +273,7 @@
</div>
</div>
</div>
<div class="topic">
<div class="topic dn" id="mapDiv">
<div class="topicTitle">位置及周边</div>
<div class="topicContent" style="padding:0;">
<div class="content-block content-block01 content-block01a" id="aroundLink">
@@ -545,6 +545,7 @@ var t2 = window.setInterval(loadChart,1000);
function loadMap(){
if(lng && lat){
loadMapPoi();
$("#mapDiv").show();
window.clearInterval(t1);
}
}
+2 -2
View File
@@ -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">
@@ -104,7 +104,7 @@
</div>
</div>
<div class="topic" id="mapDiv">
<div class="topic dn" id="mapDiv">
<div class="topicTitle">位置及周边</div>
<div class="topicContent" style="padding:0;">
<div class="content-block content-block01 content-block01a" id="aroundLink">
+1
View File
@@ -296,6 +296,7 @@ function gotoLogin(){
clicked('/views/user/codeSms.html',true,false,{},{},function(){
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('yfindex.html').reload();
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
checkIsLogin();
})
}