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

This commit is contained in:
xuhe@fangjia.com
2018-04-13 19:02:59 +08:00
16 changed files with 182 additions and 277 deletions
+2 -1
View File
@@ -14,5 +14,6 @@ axios.interceptors.request.use(function (config) {
axios.interceptors.response.use(function (response) {
return response;
}, function (error) {
return Promise.reject(error);
clicked('error.html',true,false,{},{},function(){})
return Promise.reject(error);
});
+18 -187
View File
@@ -5,6 +5,7 @@ var dates;
var data;
var volumes;
var curOption;
var mapLoadCount = 0;
/* 关注&已关注切换 */
@@ -35,6 +36,8 @@ function addCollect(){
}
alert(12)
plus.webview.getWebviewById('views/user/userInfo.html').reload();
plus.webview.getWebviewById('yfindex.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
})
.catch(function (error) {
console.log(error);
@@ -67,6 +70,8 @@ function removeCollect(){
$.toast("取消关注");
}
plus.webview.getWebviewById('views/user/userInfo.html').reload();
plus.webview.getWebviewById('yfindex.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
})
.catch(function (error) {
console.log(error);
@@ -89,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();
}
}
}
@@ -271,21 +285,15 @@ function loadKLineData(city, region, name){
counts.push(datas[d][4]);
}
// if(haveCount){
option01.xAxis[0].data = times
option01.xAxis[1].data = times
//option01.series[0].data = counts
option01.series[0].data = trends
curOption = option01;
var myChart01 = echarts.init(document.getElementById('chart01'));
myChart01.setOption(option01,true);
// }else{
// option02.xAxis[0].data = times
// option02.xAxis[1].data = times
// option02.series[0].data = trends
// curOption = option02;
// myChart01.setOption(option02,true);
// }
}
}).catch(function (error) {
alert(error)
@@ -515,183 +523,6 @@ var option01 = {
}
}]
};
/*var option02 = {
animation: false,
color: colorList,
title: {
text: null,
left: 'center'
},
legend: {
show: false,
top: 30,
data: ['均价']
},
tooltip: {
triggerOn: 'none',
transitionDuration: 0,
confine: true,
bordeRadius: 4,
borderWidth: 1,
borderColor: '#333',
backgroundColor: 'rgba(255,255,255,0.9)',
textStyle: {
fontSize: 12,
color: '#333'
},
formatter: function (params) {
var res = params[0].seriesName + ' ' + params[0].name;
res += '<br/> 月初 : ' + params[0].value[1]
res += '<br/> 月末 : ' + params[0].value[2];
res += '<br/> 最低 : ' + params[0].value[3];
res += '<br/> 最高 : ' + params[0].value[4];
return res;
},
position: function (pos, params, el, elRect, size) {
var obj = {
top: 60
};
obj[['left', 'right'][+(pos[0] < size.viewSize[0] / 2)]] = 5;
return obj;
}
},
axisPointer: {
link: [{
xAxisIndex: [0, 1]
}]
},
dataZoom: [{
type: 'slider',
xAxisIndex: [0, 1],
realtime: false,
start: 50,
end: 100,
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',
handleSize: '120%'
}, {
type: 'inside',
xAxisIndex: [0, 1],
start: 40,
end: 70,
top: 30,
height: 20
}],
xAxis: [{
type: 'category',
data: dates,
boundaryGap : false,
axisLine: { lineStyle: { color: '#999' } },
axisLabel: {
formatter: function (value) {
return echarts.format.formatTime('yy-MM', value);
}
},
min: 'dataMin',
max: 'dataMax',
axisPointer: {
show: true
}
}, {
type: 'category',
gridIndex: 1,
data: dates,
scale: true,
boundaryGap : false,
splitLine: {show: false},
axisLabel: {show: false},
axisTick: {show: false},
axisLine: { lineStyle: { color: '#fff' } },
splitNumber: 20,
min: 'dataMin',
max: 'dataMax',
axisPointer: {
type: 'shadow',
label: {show: false},
triggerTooltip: true,
handle: {
show: true,
margin: 30,
color: '#B80C00'
}
}
}],
yAxis: [{
name: '均价(元/㎡)',
nameRotate: 90,
nameLocation: 'center',
nameGap: 5,
position: 'right',
nameTextStyle: {
color: '#999'
},
scale: true,
splitNumber: 2,
axisLine: { lineStyle: { color: '#999' } },
splitLine: { show: true },
axisTick: { show: false },
axisLabel: {
inside: true,
formatter: '{value}\n'
}
}, {
name: '成交量(套)',
nameRotate: 90,
nameLocation: 'center',
nameGap: 5,
position: 'right',
nameTextStyle: {
color: '#999'
},
scale: true,
gridIndex: 1,
splitNumber: 2,
axisLabel: {show: false},
axisLine: {show: false},
axisTick: {show: false},
splitLine: {show: false}
}],
grid: [{
left: 20,
right: 20,
top: 110,
height: 120
}, {
left: 20,
right: 20,
height: 40,
top: 260
}],
graphic: [{
type: 'group',
left: 'center',
top: 70,
width: 300,
bounding: 'raw'
}],
series: [ {
type: 'candlestick',
name: '均价',
data: data,
itemStyle: {
normal: {
color: '#ff4500',
color0: '#22ac38',
borderColor: '#ff4500',
borderColor0: '#22ac38'
},
emphasis: {
color: 'black',
color0: '#444',
borderColor: 'black',
borderColor0: '#444'
}
}
}]
};
*/
$("#trendDiv2 a").click(function(){
+14 -2
View File
@@ -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;
}
}
}
}
+1 -1
View File
@@ -63,7 +63,7 @@ function addEstate(number, lastIndex) {
'</div>'+
'<div class="item-title-row">'+
'<div class="item-title"><i class="icon icon-address03"></i><small>'+(this.address?(this.city+this.region+this.address):'')+'</small></div>'+
'<div class="item-after"><span>'+(this.distance?"距您"+this.distance+"m":"暂无")+'</span></div>'+
// '<div class="item-after"><span>'+(this.distance?"距您"+this.distance+"m":"暂无")+'</span></div>'+
'</div>'+
'<div class="item-subtitle">'+
'<div>潜力指数: <span class="star">'+starStr+'</span></div>'+
+1 -1
View File
@@ -81,7 +81,7 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap,
}
html += '<li><a href="#" onclick="gotoHouseDetail(\''+result.id+'\')" class="item-content">';
html += "<div class='item-inner'><div class='item-title-row'>";
html += "<div class='item-title'>"+result.name+" <em>"+tempTotalPrice+"万</em><span class='tag'>";
html += "<div class='item-title'><label>"+result.name+"</label> <em>"+tempTotalPrice+"万</em><span class='tag'>";
if(result.liveStatus!=null && result.liveStatus.length>0){
html += "<small>"+result.liveStatus+"</small></span></div>";
}else{
+14 -3
View File
@@ -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
}
+1 -1
View File
@@ -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(){
+57 -34
View File
@@ -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">
@@ -252,7 +252,60 @@ $.config = {router: false}
var address;
var tags;
var baseInfo = new Vue({
var baseInfo;
</script>
<script type="text/javascript" src="../../js/district/districtDetail.js"></script>
<script type='text/javascript' src='../../js/district/district-map.js' charset='utf-8'></script>
<script type='text/javascript' src='../component/baseInfoComponent.js' charset='utf-8'></script>
<script type='text/javascript' src='../component/nearDist.js' charset='utf-8'></script>
<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:""
}
})
/* 小区均价分析 */
loadKLineData(city, region, name);
/* 小区租金走势 */
loadRentTrends(city, region, name);
}
/*baseInfo = new Vue({
el: '#districtBaseInfo',
data: {
name : "",
@@ -278,34 +331,7 @@ $.config = {router: false}
schoolIndex:""
}
})
var myChart01 = echarts.init(document.getElementById('chart01'));
</script>
<script type="text/javascript" src="../../js/district/districtDetail.js"></script>
<script type='text/javascript' src='../../js/district/district-map.js' charset='utf-8'></script>
<script type='text/javascript' src='../component/baseInfoComponent.js' charset='utf-8'></script>
<script type='text/javascript' src='../component/nearDist.js' charset='utf-8'></script>
<script>
//loadDistrictInfo();
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady() {
var self = plus.webview.currentWebview();
city = self.city
region = self.region
name = self.name;
// loadDistrictInfo();
// 创建根实例
new Vue({
el: '#baseInfo'
})
}
//new Vue({
// el: '#baseInfo'
// })
// })
})*/
function openMapWindow(){
clicked('arround.html',true,false,{},{city:city,region:region,name:name,lat:lat,lng:lng});
@@ -335,10 +361,7 @@ function loadMap(){
window.clearInterval(t1);
}
}
/* 小区均价分析 */
loadKLineData(city, region, name);
/* 小区租金走势 */
loadRentTrends(city, region, name);
</script>
@@ -40,7 +40,7 @@
<div class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><b>{{name}}</b><span class="span01">{{city_region}}</span></div>
<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>
@@ -104,7 +104,7 @@
</li>
</ul>
</div>
<a class="ad"><img src="../../images/adImg.png" id="img"></a>
<a class="ad"><img id="img"></a>
<div class="topic">
<div class="topicTitle" style="position:relative;">均价走势
<div class="content-block">
@@ -266,10 +266,12 @@ $.config = {router: false}
// evaluate_msg.evaluate_words="暂无"
// }
// evaluate_msg.msg=h.evaluateMsg
$("#img").attr("src",BASE_PATH+"/img/"+h.imgId);
$("#img").click(function(){
clicked('/views/loan/loanInfo.html',true,false,{},{houseId: hid, city: h.city, mobile: ""},function(){})
})
if(typeof(h.imgId)!="undefined"&&h.imgId!=null&&$.trim(h.imgId)!=""){
$("#img").attr("src",BASE_PATH+"/img/"+h.imgId);
$("#img").click(function(){
clicked('/views/loan/loanInfo.html',true,false,{},{houseId: hid, city: h.city, mobile: ""},function(){})
})
}
loadingChart(h.city,h.region,h.name,2)
//按照时间范围加载数据
$(".avgPriceTrend a").click(function(){
+1 -1
View File
@@ -61,7 +61,7 @@
<div class="item-content">
<div class="item-inner">
<div class="item-title-row">
<div class="item-title"><b>{{name}}</b><span class="span01">{{cityRegion}}</span></div>
<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>
+2 -1
View File
@@ -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">
@@ -212,7 +212,7 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
}
htmlContent = htmlContent +'<li><a onclick="openReportWindow(\''+result.id+'\')" class="item-content">';
htmlContent = htmlContent +"<div class='item-inner'><div class='item-title-row'>";
htmlContent = htmlContent +"<div class='item-title'>"+result.name+"<span class='span01'>"+result.city+"-"+result.region+"</span></div>";
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+"m&nbsp;&nbsp;"+result.floor+"/"+result.height+"层</small></div>";
htmlContent = htmlContent +"</div><div class='item-subtitle'>";
@@ -240,13 +240,13 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
var cityAvgPriceValue = cityAvgPriceMap[cityAvgPriceKey];
if(!isNaN(cityAvgPriceValue)){
if(parseInt(cityAvgPriceValue)>=parseInt(result.price)){
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='up'>高"+(parseInt(cityAvgPriceValue)-parseInt(result.price))+"元</em></div>";
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='down'>低"+(parseInt(cityAvgPriceValue)-parseInt(result.price))+"元</em></div>";
}else{
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='down'>低"+(parseInt(result.price)-parseInt(cityAvgPriceValue))+"元</em></div>";
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='up'>高"+(parseInt(result.price)-parseInt(cityAvgPriceValue))+"元</em></div>";
}
}else{
//为非数字清空放空格
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='down'>"+' '+"</em></div>";
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='down'>暂无</em></div>";
}
htmlContent = htmlContent + "<div>均价: <em class='em02'>"+result.price+"元/㎡</em></div>";
htmlContent = htmlContent + "<div class='price'><em><strong>"+tempTotalPrice+"</strong>万</em></div>";
+42 -30
View File
@@ -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>
@@ -35,6 +38,13 @@
<div class="page-group">
<div class="page page-current" id="districtBaseInfo">
<div class="loadingBg">
<div class="infinite-scroll-preloader">
<div class="preloader"></div>
</div>
</div>
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
@@ -94,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">
@@ -130,6 +140,14 @@
</div>
</div>
<div class="content contentSuggest dn" id="noDataDiv">
<div class="noData">
<img src="../../images/noData.png">
<p>您的小区数据目前仍在更新<br>敬请期待</p>
</div>
</div>
</div>
</div>
@@ -156,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 ;
@@ -190,26 +199,29 @@ function onPlusReady() {
city = self.city
region = self.region
name = self.name;
// loadDistrictInfo();
// 创建根实例
new Vue({
el: '#baseInfo'
baseInfo = new Vue({
el: '#districtBaseInfo',
data: {
name : "",
city:"",
region: "",
address: "",
tags:[]
}
})
//new Vue({
// el: '#nearDistDiv'
//})
//new Vue({
// el: '#mapDiv'
//})
}
//new Vue({
// el: '#baseInfo'
//})
/*baseInfo = new Vue({
el: '#districtBaseInfo',
data: {
name : "",
city:"",
region: "",
address: "",
tags:[]
}
})*/
/* 小区租金走势 */
+2
View File
@@ -109,6 +109,8 @@ 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();
}
+5 -1
View File
@@ -111,7 +111,11 @@ new Vue({
},
// 修改密码
updatePass: function() {
if (this.pass == '' || this.pass.length < 7) {
if (this.pass == '') {
$.toast("请输入密码");
return;
}
if (this.pass.length < 7) {
$.toast("请输入6位以上数字或字母");
return;
}
+10 -4
View File
@@ -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>
@@ -292,6 +294,8 @@ function checkIsLogin(){
//跳转登录方法, 考虑回调
function gotoLogin(){
clicked('/views/user/codeSms.html',true,false,{},{},function(){
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('yfindex.html').reload();
checkIsLogin();
})
}
@@ -305,10 +309,12 @@ function gotoUpdatePass(){
function gotoLoanApply(houseId, city){
clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: city, mobile: _mobile},function(){})
}
//跳转到小区详情
function gotoDistrictDetail(city,region,name){
clicked('/views/district/detail.html',true,false,{},{city:city,region:region,name:name},function(){})
}
//跳转房产详情
function gotoHouseDetail(id){
clicked('/views/house/detail.html',true,false,{},{houseId:id},function(){