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

This commit is contained in:
gongjin
2018-05-18 18:32:48 +08:00
20 changed files with 114 additions and 77 deletions
+3 -3
View File
@@ -1,9 +1,9 @@
/**服务端地址**/
var BASE_PATH = "http://youfang.fangjia.com";
//var BASE_PATH = "http://youfang.fangjia.com";
//var BASE_PATH = "http://192.168.10.128:8084";
var BASE_PATH = "http://192.168.10.164:8084";
//var BASE_PATH = "http://192.168.10.164:8084";
//var BASE_PATH = "http://192.168.10.53:8084";
//var BASE_PATH = "http://192.168.10.47:8086";
var BASE_PATH = "http://192.168.10.47:8086";
//var BASE_PATH = "http://192.168.10.161:8084";
//var BASE_PATH = "http://192.168.10.170:8084";
//var BASE_PATH = "http://192.168.10.171:8084";
+5 -2
View File
@@ -867,8 +867,11 @@ input::-webkit-input-placeholder{
#chart01{height:270px;}
#chart01a{height:270px;}
.topic .topicTitle > div.icon01Box{overflow:hidden;float:none;display:inline-block;vertical-align:middle;margin-left:-0.5rem;}
.icon-chart01a{width:1.1rem;height:1rem;background:url(../images/icon-chart01a.png) no-repeat center center;background-size:45%;float:left;padding:0 1rem;}
.icon-chart01{width:1.1rem;height:1rem;background:url(../images/icon-chart01.png) no-repeat center center;background-size:45%;float:left;padding:0 1rem;}
.icon-chart01a{width:1.1rem;height:1rem;background:url(../images/icon-chart01a.png) no-repeat center center;background-size:55%;float:left;padding:0 0.8rem;}
.icon-chart01{width:1.1rem;height:1rem;background:url(../images/icon-chart01.png) no-repeat center center;background-size:55%;float:left;padding:0 0.8rem;}
.icon-chart01a-no{width:1.1rem;height:1rem;background:url(../images/icon-chart01a_common.png) no-repeat center center;background-size:55%;float:left;padding:0 0.8rem;}
.icon-chart01-no{width:1.1rem;height:1rem;background:url(../images/icon-chart01_common.png) no-repeat center center;background-size:55%;float:left;padding:0 0.8rem;}
.scoreBox{height:130px;position:relative;}
.score{width:250px;height:250px;margin:0 auto;margin-top:1rem;}
Binary file not shown.

After

Width:  |  Height:  |  Size: 594 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 920 B

+64 -37
View File
@@ -1,5 +1,8 @@
var colorList = ['#c23531', '#2f4554', '#61a0a8', '#d48265', '#91c7ae', '#749f83', '#ca8622', '#bda29a', '#6e7074', '#546570', '#c4ccd3'];
var labelFont = 'bold 12px Sans-serif';
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth()+1;
var dates;
var data;
@@ -114,7 +117,8 @@ function clickLineChart(type){
}
/* 图表切换 */
function lineChart() {
/*function lineChart() {
mode = "kLine"
$(".icon-chart01a").hide();
$(".icon-chart01").show();
@@ -135,7 +139,33 @@ function kLineChart() {
$("#chart01a").show();
$("#chart01").hide();
loadLineData(city, region, name, type);
};
};*/
$("body").delegate(".icon-chart01a-no", "click", function () {
$(this).addClass("icon-chart01a");
$(this).removeClass("icon-chart01a-no");
$(this).parent().find(".icon-chart01").addClass("icon-chart01-no")
$(this).parent().find("i").removeClass("icon-chart01")
mode = "line"
var type = $("#trendDiv1 a.active").attr("t-v");
$("#chart01a").show();
$("#chart01").hide();
loadLineData(city, region, name, type);
})
$("body").delegate(".icon-chart01-no", "click", function () {
$(this).addClass("icon-chart01");
$(this).removeClass("icon-chart01-no");
$(this).parent().find(".icon-chart01a").addClass("icon-chart01a-no")
$(this).parent().find("i").removeClass("icon-chart01a")
mode = "kLine"
var type = $("#trendDiv1 a.active").attr("t-v");
$("#chart01a").hide();
$("#chart01").show();
loadKLineData(city, region, name, type);
})
function showLoadRentTrends(type) {
@@ -199,7 +229,16 @@ function doLoadKLineData(city, region, name, type){
var counts = [];
var times = []
var haveCount = false;
var curMonth;
if(month<10){
curMonth = year+"-0"+month;
}else{
curMonth = year+"-"+month;
}
for(var d in datas){
if(d == curMonth){
continue;
}
times.push(d);
var prices = new Array();
@@ -268,7 +307,6 @@ function showTrends(v){
var option01 = {
animation: false,
color: colorList,
title: {
text: null,
@@ -280,9 +318,6 @@ var option01 = {
data: ['均价']
},
tooltip: {
triggerOn: 'none',
transitionDuration: 0,
confine: true,
bordeRadius: 4,
borderWidth: 1,
borderColor: '#333',
@@ -292,19 +327,21 @@ var option01 = {
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;
var res = params.seriesName + ' ' + params.name;
var vals = params.value;
if(vals == undefined){
var obj = params[0];
res = obj.seriesName + ' ' + obj.name;
vals = obj.value;
}
if(vals){
res += '<br/> 月初 : ' + vals[1]+ '元/㎡';
res += '<br/> 月末 : ' + vals[2]+ '元/㎡';
res += '<br/> 最低 : ' + vals[3]+ '元/㎡';
res += '<br/> 最高 : ' + vals[4]+ '元/㎡';
return res;
}
}
},
axisPointer: {
@@ -313,20 +350,10 @@ var option01 = {
}]
},
dataZoom: [{
type: 'slider',
xAxisIndex: [0, 1],
realtime: false,
start: 1,
end: 99,
top: 5,
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,
start: 1,
end: 99,
top: 30,
height: 20
}],
@@ -369,7 +396,7 @@ var option01 = {
triggerTooltip: true,
handle: {
show: true,
margin: -70,
margin: -90,
color: '#F18D00'
}
}
@@ -412,7 +439,7 @@ var option01 = {
grid: [{
left: 20,
right: 20,
top: 60,
top: 30,
height: 120
}, {
left: 20,
@@ -763,7 +790,7 @@ function doLoadLineData(city, region, name, type){
function showLineChart(times, datas){
var option01b = {
tooltip: {
triggerOn: 'none',
//triggerOn: 'none',
transitionDuration: 0,
confine: true,
bordeRadius: 4,
@@ -791,11 +818,11 @@ function showLineChart(times, datas){
y: 10,
x2: 20,
y2: 60,
top: 60,
top: 30,
height: 120
},
color: ['#78CDE6'],
dataZoom: [{
/*dataZoom: [{
realtime: false,
start: 1,
end: 99,
@@ -803,7 +830,7 @@ function showLineChart(times, datas){
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%'
}],
}],*/
xAxis: {
type: 'category',
boundaryGap: false,
+1 -1
View File
@@ -117,7 +117,7 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap,
html += "<div>下跌概率: <em class='down'>暂无<i class='icon'></i></em></div>";
}
html += "<div>抵押可贷额度: <em style='color:#EB5F34;'>"+tempTotalPricePercent+"</em></div></div></div></a>";
html += "</div></div></a>";
//调整最新的等级显示(其它等级不显示start)
if(result.level!=null && result.level == 1){
+2 -2
View File
@@ -7,8 +7,8 @@
"id": "H5693FF3D",/*应用的标识,创建应用时自动生成,勿手动修改*/
"name": "有房",/*应用名称,程序桌面图标名称*/
"version": {
"name": "1.1.10",/*应用版本名称*/
"code": "20110"
"name": "1.1.12",/*应用版本名称*/
"code": "20111"
},
"description": "有房,围绕房产提供全方位数据分析的房产及金融服务平台,通过个性化的智能推荐,定制专属的个人投资或购房计划,多维度管理自有房产并提供房产融资通道。",/*应用描述信息*/
"icons": {
+9 -2
View File
@@ -69,8 +69,15 @@
<div class="col-15 tac" v-if="index <= 2"><img :src="'../../images/rankingImg0' + (index+1)+'a.png'"></div>
<div class="col-25">{{info.region}}</div>
<div class="col-33">{{info.avgPrice}}元/㎡</div>
<div class="col-25" v-if="info.oneMonthUpDownRange > 0"><em class="up">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-red"></i></em></div>
<div class="col-25" v-if="info.oneMonthUpDownRange < 0"><em class="down">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-green"></i></em></div>
<div class="col-25" v-if="info.oneMonthUpDownRange>=0">
<em class="up">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-red"></i></em>
</div>
<div class="col-25" v-else-if="info.oneMonthUpDownRange<0">
<em class="down">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-green"></i></em>
</div>
<div class="col-25" v-else>
<em class="up">暂无</em>
</div>
</div>
</div>
</a>
+3 -3
View File
@@ -124,8 +124,8 @@
<div class="topicContent" style="padding:0;padding-bottom:0.75rem;">
<div class="topicTitle topicTitle01" style="position:relative;">均价&nbsp;&nbsp;
<div class="icon01Box">
<i class="icon icon-chart01a" onclick="lineChart()"></i>
<i class="icon icon-chart01 dn" onclick="kLineChart()"></i>
<i class="icon icon-chart01a" ></i>
<i class="icon icon-chart01-no"></i>
</div>
<div class="content-block" id="trendDiv1">
<div class="buttons-row theme">
@@ -285,7 +285,7 @@ $.config = {router: false}
var address;
var tags;
var baseInfo;
var rid;
var shareUrl = BASE_PATH+"/district/districtDetail?";
var sharehrefTitle = "小区名";
var sharehrefDes = "小区详情介绍!";
@@ -26,7 +26,7 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="share()">
+4 -4
View File
@@ -30,7 +30,7 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="share()">
@@ -139,7 +139,7 @@ $.config = {router: false}
var pageBean=new Vue({
data:{
pageNo:1,
pageNo:2,
pageSize:10
}
});
@@ -215,7 +215,7 @@ $(function() {
.then(function (response) {
tableList.end = response.data.data.end;
tableList.list = tableList.list.concat(response.data.data.list);
if(pageBean.pageNo==1){
if(pageNo==1){
tableList.avgPrice = response.data.data.list[0].avgPrice;
tableList.city = response.data.data.list[0].city;
tableList.markup = response.data.data.list[0].markup;
@@ -227,7 +227,7 @@ $(function() {
});
}
//预先加载10条
addItems(pageBean.pageNo, pageBean.pageSize);
addItems(1, 20);
// 上次加载的序号
var lastIndex = 10;
@@ -30,7 +30,7 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="share()">
@@ -146,7 +146,7 @@ $.config = {router: false}
var pageBean=new Vue({
data:{
pageNo:1,
pageNo:2,
pageSize:10
}
});
@@ -222,7 +222,7 @@ $(function() {
.then(function (response) {
tableList.end = response.data.data.end;
tableList.list = tableList.list.concat(response.data.data.list);
if(pageBean.pageNo==1){
if(pageNo==1){
tableList.avgPrice = response.data.data.list[0].avgPrice;
tableList.city = response.data.data.list[0].city;
tableList.markup = response.data.data.list[0].markup;
@@ -234,7 +234,7 @@ $(function() {
});
}
//预先加载10条
addItems(1, 10);
addItems(1, 20);
// 上次加载的序号
var lastIndex = 10;
@@ -31,7 +31,7 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="share()">
@@ -161,7 +161,7 @@ $.config = {router: false}
var pageBean=new Vue({
data:{
pageNo:1,
pageNo:2,
pageSize:10
}
});
@@ -237,7 +237,7 @@ $(function() {
.then(function (response) {
tableList.end = response.data.data.end;
tableList.list = tableList.list.concat(response.data.data.list);
if(pageBean.pageNo==1){
if(pageNo==1){
tableList.avgPrice = response.data.data.list[0].avgPrice;
tableList.city = response.data.data.list[0].city;
tableList.index = response.data.data.list[0].index;
@@ -249,7 +249,7 @@ $(function() {
});
}
//预先加载10条
addItems(1, 10);
addItems(1, 20);
// 上次加载的序号
var lastIndex = 10;
+1 -1
View File
@@ -27,7 +27,7 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="share()">
+2 -2
View File
@@ -234,8 +234,8 @@
<div class="topicContent" style="padding:0;padding-bottom:0.75rem;">
<div class="topicTitle topicTitle01" style="position:relative;">均价&nbsp;&nbsp;
<div class="icon01Box">
<i class="icon icon-chart01a" onclick="lineChart()"></i>
<i class="icon icon-chart01 dn" onclick="kLineChart()"></i>
<i class="icon icon-chart01a" ></i>
<i class="icon icon-chart01-no"></i>
</div>
<div class="content-block" id="trendDiv1">
<div class="buttons-row theme">
+5 -5
View File
@@ -59,11 +59,11 @@
</div>
<div class="card-content">
<div class="card-content-inner row">
<span class="col-50" onclick="window.location.href='cityUpRanking.html'">
<span class="col-50" onclick="clicked('cityUpRanking.html', true,false,{},{})">
<em class="up"><strong>{{upRate}}</strong>%</em>
<label>城市上涨</label>
</span>
<span class="col-50" onclick="window.location.href='cityDownRanking.html'">
<span class="col-50" onclick="clicked('cityDownRanking.html', true,false,{},{})">
<em class="down"><strong>{{downRate}}</strong>%</em>
<label>城市下跌</label>
</span>
@@ -89,7 +89,7 @@
<div class="cardNearbyBox cardNearbyBox01 cardRankingBox cardRankingBox01" id="countryRank" v-cloak>
<div class="cardNearbyWin">
<div class="card cardNearby cardRanking" v-for="item in datas">
<a v-if="item.type==0" href="cityRanking.html">
<a v-if="item.type==0" href="#" onclick="clicked('cityRanking.html', true,false,{},{})">
<div class="card-header" v-if="item.type==0">
城市涨幅排行
</div>
@@ -104,7 +104,7 @@
</div>
</a>
<a v-if="item.type==1" href="cityRankingPotential.html">
<a v-if="item.type==1" href="#" onclick="clicked('cityRankingPotential.html', true,false,{},{})">
<div class="card-header" v-if="item.type==1">
城市潜力排行
</div>
@@ -151,7 +151,7 @@
</div>
</a>
<a v-if="item.type==2" href="cityRankingAvgPrice.html">
<a v-if="item.type==2" href="#" onclick="clicked('cityRankingAvgPrice.html', true,false,{},{})">
<div class="card-header" v-if="item.type==2">
城市均价排行
</div>
+1 -1
View File
@@ -370,7 +370,7 @@ function addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xq
html += "<div>下跌概率: <em class='down'>暂无<i class='icon'></i></em></div>";
}
html += "<div>抵押可贷额度: <em style='color:#EB5F34;'>"+tempTotalPricePercent+"</em></div></div></div></a>";
html += "</div></div></a>";
//调整最新的等级显示(其它等级不显示start)
if(result.level!=null && result.level == 1){
@@ -61,10 +61,10 @@
</ul>
<!-- 动态封装部分 end -->
</div>
<div class="content-block" style="display: none;">
</div>
<div class="content-block bar-footer" style="display: none;">
<p><a onclick="openaddWindow()" class="button button-big button-fill theme">立即评估</a></p>
</div>
</div>
</div>
<div class="page page-current" id="noData" style="display: none;">
<header class="bar bar-nav barBorder">
@@ -79,7 +79,7 @@
<div class="noData">
<img src="../../images/noData.png">
<p>评估房产&nbsp;&nbsp;发现价值</p>
<div class="content-block">
<div class="content-block bar-footer">
<p><a onclick="openaddWindow()" class="button button-big button-fill theme">立即评估</a></p>
</div>
</div>
-1
View File
@@ -630,7 +630,6 @@ $(function() {
$('#commentInput').on('click', function () {
var target = this;
// 使用定时器是为了让输入框上滑时更加自然
setTimeout(function(){
document.body.scrollTop = document.body.scrollHeight;
target.scrollIntoView(true);
+2 -1
View File
@@ -1271,7 +1271,8 @@ function getPosition(){
oriLng = p.coords.longitude;
oriLat = p.coords.latitude;
if(region.endWith("区")){
if(region.endWith("区") || region.endWith("市") ){
region = region.substring(0, region.length-1);
}
oriRegion = region;