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

# Conflicts:
#	fangija-zsyf/views/house/houseDetail.html
This commit is contained in:
zongzhimin
2018-04-16 14:37:07 +08:00
15 changed files with 182 additions and 118 deletions
+5 -6
View File
@@ -1,6 +1,8 @@
@charset "utf-8";
/* CSS Document */
[v-cloak] {
display: none;
}
/* 公用 */
*{font-size:16px;font-family:arial,"华文细黑";}
ul li{list-style:none;}
@@ -852,9 +854,6 @@ input::-webkit-input-placeholder{
/* 图表 */
.chart{width:100%;height:250px;}
.chart tspan{font-size:0.6rem;text-shadow:none;}
#tabChart{width:100%;height:360px;}
#tabChart1{width:100%;position:absolute;z-index:1;}
#tabChart2{width:100%;display:block;position:absolute;z-index:-1;}
.scoreBox{height:130px;position:relative;}
.score{width:250px;height:250px;margin:0 auto;margin-top:1rem;}
.scoreText{width:250px;height:150px;position:absolute;top:0;left:50%;margin-left:-125px;}
@@ -874,7 +873,7 @@ input::-webkit-input-placeholder{
.priceBox div em.up i{background:url(../images/up.png) no-repeat center center;background-size:100%;}
.priceBox div em.down i{background:url(../images/down.png) no-repeat center center;background-size:100%;}
.topic .topicTitle > div.content-block{float:right;margin-top:0.6rem;padding:0;}
.topic .topicTitle > div.content-block{padding:0;margin:0;position:absolute;top:0.6rem;right:0;z-index:100;}
.topic .date{text-align:right;font-size:0.75rem;color:#ccc;padding-right:0.75rem;margin:0;}
.buttons-row .button{height:1.35rem;line-height:1.35rem;}
.buttons-row01 .button{border-radius:0.1rem;margin-left:0.5rem;padding:0;font-size:0.65rem;}
@@ -1060,7 +1059,7 @@ input::-webkit-input-placeholder{
.topBg02 p a{font-size:0.75rem;}
.collection{position:absolute;right:0.75rem;top:0.4rem;text-align:center;color:#666;font-size:0.7rem;}
.collection02{border:solid 1px #C3C0BC;color:#999;}
.icon-collection01{width:16px;height:16px;background:url(../images/icon-collection01.png) no-repeat center center;background-size:100%;display:block;margin:0 auto;margin-bottom:0.1rem;}
.icon-collection02{width:16px;height:16px;background:url(../images/icon-collection02.png) no-repeat center center;background-size:100%;display:block;margin:0 auto;margin-bottom:0.1rem;}
+1
View File
@@ -1,5 +1,6 @@
axios.defaults.baseURL = BASE_PATH;
axios.defaults.headers.post['Content-Type'] = 'application/json';
axios.defaults.timeout = 10000;
// 添加请求拦截器
axios.interceptors.request.use(function (config) {
+8 -8
View File
@@ -343,7 +343,7 @@ var option01 = {
legend: {
show: false,
top: 30,
data: ['均价', '成交量']
data: ['均价']
},
tooltip: {
triggerOn: 'none',
@@ -382,8 +382,8 @@ var option01 = {
type: 'slider',
xAxisIndex: [0, 1],
realtime: false,
start: 0,
end: 100,
start: 5,
end: 95,
top: 65,
height: 20,
handleIcon: 'M10.7,11.9H9.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4h1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
@@ -454,7 +454,7 @@ var option01 = {
formatter: '{value}\n'
}
}, {
name: '成交量(套)',
name: '',
nameRotate: 90,
nameLocation: 'center',
nameGap: 5,
@@ -514,10 +514,10 @@ var option01 = {
borderColor0: '#88D053'
},
emphasis: {
color: 'black',
color0: '#333',
borderColor: 'black',
borderColor0: '#333'
color: '#F18D00',
color0: '#666',
borderColor: '#F18D00',
borderColor0: '#666'
}
}
}]
+2
View File
@@ -517,9 +517,11 @@ function docollectCity(city){
//loadMyCollectCity();
$("a[href='#tabQuotation1']").click();
//plus.webview.getWebviewById('views/house/houseDetail.html').reload();
reloadMyFocus();
}else if(msg == "关注成功"){
cityInfoVue.$data.collecd = true;
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
reloadMyFocus();
}else{
$.toast(msg);
}
+22 -1
View File
@@ -1721,6 +1721,27 @@
}
},
"unpackage": [
"js/update.json"
"js/update.json",
"doc/cache.html",
"doc/console.html",
"doc/contacts.html",
"doc/interface-orientation.html",
"doc/key.html",
"doc/splashscreen.html",
"doc/statistic.html",
"plus/accelerometer_shake.html",
"plus/accelerometer.html",
"plus/audio.html",
"plus/barcode_scan.html",
"plus/barcode_scan2.html",
"plus/barcode.html",
"plus/camera_image.html",
"plus/camera_video.html",
"plus/camera.html",
"plus/device.html",
"plus/doc.html",
"plus/downloader.html",
"plus/webview_pullhead.html",
"plus/webview_pullrefresh.html"
]
}
@@ -27,7 +27,7 @@ Vue.component('base-info-component', {
<li>
<a class="item-content">
<div class="item-inner" style="padding-top:0;">
<div class="item-title-row">
<div class="item-title-row" style="width:100%;">
<div class="item-title row">
<div class="col-50">
<p>
+1 -1
View File
@@ -12,7 +12,7 @@ Vue.component('near-dist-component', {
<div class="card-content">
<div class="card-content-inner">{{dist.avgPrice?(dist.avgPrice+"元/㎡"):'暂无'}}</div>
</div>
<div class="card-footer">距您{{dist.distance}}m</div>
<div class="card-footer">距该小区{{dist.distance}}米</div>
</div>
</div>
+70 -52
View File
@@ -30,9 +30,6 @@
.cardNearbyBox01 .cardNearby .card-header{padding-top:0;}
.topic .topicTitle > span.star{float:none;}
.topic .topicTitle > span.star .icon{vertical-align:middle;}
.tabs{width:100%;height:350px;}
.tabChart1{z-index:1;}
.tabChart2{z-index:-1;}
.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;}
@@ -111,8 +108,29 @@
</div>
<div class="topic">
<div class="topicTitle">小区走势分析</div>
<div class="topicContent" style="padding:0;">
<div class="content-block content-block01 content-block01a">
<div class="topicContent" style="padding:0;padding-bottom:0.75rem;">
<div class="topicTitle topicTitle01" style="position:relative;">均价
<div class="content-block">
<div class="buttons-row theme" id="trendDiv1">
<a t-v="6" class="tab-link button active" onclick="showTrends(6)">半年</a>
<a t-v="12" class="tab-link button" onclick="showTrends(12)">一年</a>
<a t-v="36" class="tab-link button" onclick="showTrends(36)">三年</a>
</div>
</div>
</div>
<div class="chart" id="chart01" style="height:320px;margin-top:-2.75rem;"></div>
<div class="topicTitle topicTitle01" style="position:relative;border-top:solid 1px #e7e7e7;">租金
<div class="content-block">
<div class="buttons-row theme" id="trendDiv2">
<a t-v="2" id="trendDivTab2" class="tab-link button active" onclick="showLoadRentTrends(2)">半年</a>
<a t-v="3" id="trendDivTab3" class="tab-link button" onclick="showLoadRentTrends(3)">一年</a>
</div>
</div>
</div>
<div class="chart" id="chart02"></div>
<!--<div class="content-block content-block01 content-block01a">
<div class="buttons-row theme" id="trendTabDiv">
<a href="#tabChart1" class="tab-link button active" id="tabAvgDiv" @click="showChat(1)">均价</a>
<a href="#tabChart2" class="tab-link button" id="tabRentDiv" @click="showChat(2)">租金</a>
@@ -138,7 +156,7 @@
<div class="chart" id="chart02" style="margin-top:0.75rem;"></div>
</div>
</div>
</div>
</div>-->
</div>
</div>
<!--<div class="card cardPrice cardPrice02" style="border-bottom:solid 0.5rem #f3f3f3;">
@@ -238,8 +256,8 @@ $.config = {router: false}
<script>
var city = "上海"
var region = "嘉定"
var name = "世盟壹天地"
var region = "长宁"
var name = "新泾三村"
//var lat = 31.292437
//var lng = 121.48703
@@ -316,50 +334,50 @@ function onPlusReady() {
/*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({
// 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);
function openMapWindow(){
clicked('arround.html',true,false,{},{city:city,region:region,name:name,lat:lat,lng:lng});
@@ -195,7 +195,7 @@ $.config = {router: false}
hid:hid,
reason:i
}).then(function(response){
alert("感谢您的反馈!")
$.toast("感谢您的反馈!")
$("#price_feedback").hide();
}).catch(function(error){console.log(error)})
},
+15 -15
View File
@@ -38,7 +38,7 @@
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
<div class="card-header">
<label>{{myCityMap.city}}</label>
<a v-if="collecd" class="button collection collection02 " @click="collectCity(myCityMap.city)">取消</a>
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city)">取消关注</a>
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city)">关注</a>
</div>
@@ -162,24 +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);
// loadCityPriceInfo(city)
// loadUpOrDown(city);
// loadHotDistrict(city)
// loadCityPricesAndCounts(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)
+22 -11
View File
@@ -64,7 +64,7 @@
<div class="item-title"><label><b>{{name}}</b></label><span class="span01">{{cityRegion}}</span></div>
</div>
<div class="item-title-row">
<div class="item-title"><small><label v-if="roomCount > 0">{{roomCount}}室</label><label v-if="hallCount > 0">{{hallCount}}厅</label>&nbsp;&nbsp;{{area}}m&nbsp;&nbsp;<label v-if="floor > 0 && height">{{floor}}/{{height}}层</label></small></div>
<div class="item-title"><small>{{houseRoomNum}}&nbsp;&nbsp;{{area}}m&nbsp;&nbsp;{{floor_height}}</small></div>
</div>
</div>
</div>
@@ -78,7 +78,7 @@
<a class="add alert-text-title"><i class="icon icon-houseLevel"></i>{{estatetype}}</a>
</div>
<div class="card-content">
<div class="card-content-inner">{{Math.round(totalPrice/10000)}}<span>万</span></div>
<div class="card-content-inner">{{totalPrice}}<span>万</span></div>
</div>
<div class="card-footer">
<span>
@@ -352,11 +352,9 @@ var baseInfo = new Vue({
name : "",
address:"",
cityRegion:"",
roomCount: "",
hallCount: "",
houseRoomNum: "",
area: "",
floor: "",
height: "",
floor_height: "",
liveStatus:"",
estatetype:"",
totalPrice:"",
@@ -411,11 +409,19 @@ function init(){
baseInfo.name = houseInfo.name;
baseInfo.address = houseInfo.address;
baseInfo.cityRegion=houseInfo.city+"-"+houseInfo.region;
baseInfo.roomCount= houseInfo.roomCount;
baseInfo.hallCount= houseInfo.hallCount;
baseInfo.houseRoomNum= houseInfo.houseRoomNum;
baseInfo.area= houseInfo.area;
baseInfo.floor= houseInfo.floor;
baseInfo.height= houseInfo.height;
var floor_height = "";
if(houseInfo.floor!=0){
floor_height = houseInfo.floor;
}
if(houseInfo.height!=0){
floor_height += "/" + houseInfo.height;
}
if(floor_height!=""){
floor_height+="层";
}
baseInfo.floor_height= floor_height;
if(houseInfo.liveStatus){
baseInfo.liveStatus=houseInfo.liveStatus;
}else{
@@ -425,7 +431,7 @@ function init(){
$('.rentBox').show();
if(houseInfo.leaseStartDate){
baseInfo.rentTime = formatTime(houseInfo.leaseStartDate)+"-"+formatTime(houseInfo.leaseEndDate);
baseInfo.rentPrice = houseInfo.rent+"元("+houseInfo.rentCycle+"/"+houseInfo.rentCycleUnit+")";
baseInfo.rentPrice = houseInfo.rent+"元/"+houseInfo.rentCycleUnit;
baseInfo.nextRent = formatTime2(houseInfo.lastRentDate);
}else{
baseInfo.rentTime = "-";
@@ -435,6 +441,11 @@ function init(){
}
baseInfo.estatetype=houseInfo.estatetype;
baseInfo.totalPrice=houseInfo.totalPrice;
if(houseInfo.totalPrice==0){
baseInfo.totalPrice = "暂无";
}else{
baseInfo.totalPrice = (houseInfo.totalPrice/10000).toFixed(2)
}
baseInfo.price=houseInfo.price;
baseInfo.totalScore=houseInfo.totalScore;
baseInfo.index=response.data.data.index;
+14 -7
View File
@@ -36,8 +36,8 @@
</button>-->
<h1 class="title">房产行情</h1>
</header>
<div class="content" >
<div class="buttons-tab theme" id="tabCityDiv" >
<div class="content">
<div class="buttons-tab theme" id="tabCityDiv" v-cloak>
<a href="#tabQuotation1" class="tab-link active button">全国</a>
<div v-for="mycollectcity in citys" >
<a class="tab-link button" @click="clickCity(mycollectcity)" v-bind:vcity="mycollectcity">{{mycollectcity}}</a>
@@ -46,8 +46,8 @@
</div>
<div class="tabs">
<div id="tabQuotation1" class="tab active">
<div class="card cardPrice cardPrice01 cardCity" id="countryInfo">
<div id="tabQuotation1" class="tab active" >
<div class="card cardPrice cardPrice01 cardCity" id="countryInfo" v-cloak>
<div class="card-header">
<label>全国</label>
</div>
@@ -80,7 +80,7 @@
<div id="myFocusFirstPage">
<my_focus></my_focus>
</div>
<div class="cardNearbyBox cardNearbyBox01 cardRankingBox cardRankingBox01" id="countryRank">
<div class="cardNearbyBox cardNearbyBox01 cardRankingBox cardRankingBox01" id="countryRank" v-cloak>
<div class="cardNearbyWin">
<div class="card cardNearby cardRanking" v-for="item in datas">
<div class="card-header" v-if="item.type==0">
@@ -168,11 +168,11 @@
</div>
<div id="cityInfo" class="dn">
<div id="cityInfo" class="dn" v-cloak>
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
<div class="card-header">
<label>{{myCityMap.city}}</label>
<a v-if="collecd" class="button collection collection02 " @click="collectCity(myCityMap.city)">取消</a>
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city)">取消关注</a>
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city)">关注</a>
</div>
@@ -1576,6 +1576,13 @@ function addFocus(city){
reloadCityIncreaseRanking()
reloadCityPotentialRanking()
cityDetaiVue.$data.citys.push(city);
if(response.data.status){
reloadMyFocus()
cityDetaiVue.$data.citys.push(city);
} else {
$.toast(response.data.message);
}
}).catch(function(error){
console.log(error)
})
@@ -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+"厅&nbsp;&nbsp;"+result.area+"㎡&nbsp;&nbsp;"+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 +"&nbsp;&nbsp;"+result.area+"㎡&nbsp;&nbsp;"+result.floor+"/"+result.height+"层</small></div>"
htmlContent = htmlContent +"</div><div class='item-subtitle'>";
//对应城市地区小区30天涨跌幅
//动态构建key
+13 -13
View File
@@ -61,8 +61,8 @@
<div class="item-title"><i class="icon icon-address02"></i>{{city}}{{region}}{{address}}</div>
<div class="item-after">
<a class="button theme collection collection01">关注</a>
<a class="button collection collection02 dn">取消关注</a>
<a class="button theme collection collection01" onclick="doAddCollect()">关注</a>
<a class="button collection collection02 dn" onclick="removeCollect()">取消关注</a>
</div>
</div>
<div class="item-subtitle">
@@ -212,17 +212,17 @@ function onPlusReady() {
})
}
/*baseInfo = new Vue({
el: '#districtBaseInfo',
data: {
name : "",
city:"",
region: "",
address: "",
tags:[]
}
})*/
//baseInfo = new Vue({
// el: '#districtBaseInfo',
// data: {
// name : "",
// city:"",
// region: "",
// address: "",
// tags:[]
// }
// })
//
/* 小区租金走势 */
loadRentTrends(city, region, name);
+1 -1
View File
@@ -146,7 +146,7 @@ function onPlusReady() {
// });
// })
var houseInfo = response.data.data.houseInfo;
if(houseInfo.liveStatus=="出租"){
if(houseInfo && houseInfo.liveStatus=="出租"){
edit.liveStatus=houseInfo.liveStatus;
edit.leaseStartDate=getNowFormatDate(houseInfo.leaseStartDate);
edit.leaseEndDate = getNowFormatDate(houseInfo.leaseEndDate);