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

# Conflicts:
#	fangija-zsyf/yfindex.html
This commit is contained in:
xuhe@fangjia.com
2018-05-18 16:45:59 +08:00
16 changed files with 73 additions and 68 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
/**服务端地址**/
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.161:8084";
+7 -13
View File
@@ -516,7 +516,7 @@ input::-webkit-input-placeholder{
.cardInfo02 .item-content{padding:0;}
.cardInfo02 .item-title{font-size:0.85rem;white-space:normal;-webkit-line-clamp:2;-webkit-box-orient:vertical;display:-webkit-box;}
.cardInfo02 .item-title span{text-align:right;}
.cardInfo02 .item-subtitle font{font-size:0.7rem;white-space:normal;-webkit-line-clamp:2;-webkit-box-orient:vertical;display:-webkit-box;margin:0.3rem 0;}
.cardInfo02 .item-subtitle font{font-size:0.7rem;white-space:normal;-webkit-line-clamp:2;-webkit-box-orient:vertical;display:-webkit-box;margin:0.2rem 0;}
.cardInfo02 .item-subtitle span{font-size:0.6rem;color:#666;max-width:100%;}
.cardInfo02 .item-subtitle small{font-size:0.7rem;color:#999;}
.cardInfo02 .item-subtitle em{font-size:0.7rem;color:#EB5F34;}
@@ -868,19 +868,13 @@ input::-webkit-input-placeholder{
/* 图表 */
.chart{width:100%;height:250px;}
.chart tspan{font-size:0.6rem;text-shadow:none;}
.chart01Box{height:270px;position:relative;}
#chart01a{height:270px;position:absolute;z-index:1;}
#chart01{height:270px;position:absolute;z-index:-1;}
.topic .topicTitle > div.icon01Box{overflow:hidden;float:none;display:inline-block;vertical-align:middle;}
.icon-chart01a{width:0.9rem;height:0.8rem;background:url(../images/icon-chart01a.png) no-repeat center center;background-size:100%;float:left;}
.icon-chart01{width:0.9rem;height:0.8rem;background:url(../images/icon-chart01.png) no-repeat center center;background-size:100%;float:left;}
.chart01Box{height:270px;}
#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;}
/*
#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;}
+8 -4
View File
@@ -118,18 +118,22 @@ function lineChart() {
mode = "kLine"
$(".icon-chart01a").hide();
$(".icon-chart01").show();
$("#chart01a").css("z-index","-1");
$("#chart01").css("z-index","1");
//$("#chart01a").css("z-index","-1");
//$("#chart01").css("z-index","1");
var type = $("#trendDiv1 a.active").attr("t-v");
$("#chart01a").hide();
$("#chart01").show();
loadKLineData(city, region, name, type);
}
function kLineChart() {
mode = "line"
$(".icon-chart01").hide();
$(".icon-chart01a").show();
$("#chart01").css("z-index","-1");
$("#chart01a").css("z-index","1");
//$("#chart01").css("z-index","-1");
//$("#chart01a").css("z-index","1");
var type = $("#trendDiv1 a.active").attr("t-v");
$("#chart01a").show();
$("#chart01").hide();
loadLineData(city, region, name, type);
};
+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.9",/*应用版本名称*/
"code": "20109"
"name": "1.1.12",/*应用版本名称*/
"code": "20111"
},
"description": "有房,围绕房产提供全方位数据分析的房产及金融服务平台,通过个性化的智能推荐,定制专属的个人投资或购房计划,多维度管理自有房产并提供房产融资通道。",/*应用描述信息*/
"icons": {
+1
View File
@@ -291,6 +291,7 @@ $.config = {router: false}
var sharehrefDes = "小区详情介绍!";
var shareId='';
var picUrl = '_www/images/default_share.png';
// baseInfo = new Vue({
// el: '#districtBaseInfo',
@@ -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()">
+7 -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>
@@ -1810,6 +1810,8 @@ function share(){
shareHref();
}
</script>
+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>
+10 -11
View File
@@ -133,8 +133,8 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/city.js" ></script>
<script>
document.addEventListener('plusready', onPlusReady, false);
var id; //= "186182250936643584";
//document.addEventListener('plusready', onPlusReady, false);
var id = "202852336950816768";
var shareUrl = BASE_PATH+"/news/newDetail?newsId=";
var sharehrefTitle = "停车坐爱枫林晚,霜叶红于二月花";
var sharehrefDes = "客观里面请!";
@@ -175,11 +175,11 @@ var vm = new Vue({
})
function onPlusReady() {
var self = plus.webview.currentWebview();
id = self.newsId;
shareId = id
shareUrl = shareUrl+id
//function onPlusReady() {
// var self = plus.webview.currentWebview();
// id = self.newsId;
// shareId = id
// shareUrl = shareUrl+id
axios.get("/rest/news/detail",{params:{newsId:id}}).then(function(response){
if(response.data.code==200){
@@ -211,7 +211,7 @@ function onPlusReady() {
});
getPosition();
updateSerivces();
}
//}
//数量进行转换
function numberConver(thumbsUpCount){
@@ -358,7 +358,7 @@ function addItems(number, lastIndex) {
// 添加新条目
$('.commentList ul').append(html);
if($('.commentList li').length== totalCount+1){
if(curPageSize!=itemsPerLoad){
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
@@ -565,7 +565,7 @@ function collect(){
}
/* 发布评论 */
$(".commentInputBox input").focus(function () {
$(".commentInputBox input").click(function () {
$(".commentInputBox").hide();
$(".commentReleaseBox").show();
$(".commentReleaseBox input").focus();
@@ -630,7 +630,6 @@ $(function() {
$('#commentInput').on('click', function () {
var target = this;
// 使用定时器是为了让输入框上滑时更加自然
setTimeout(function(){
document.body.scrollTop = document.body.scrollHeight;
target.scrollIntoView(true);
+18 -13
View File
@@ -51,7 +51,7 @@
<!--<div class="pull-to-refresh-arrow"></div>-->
</div>
<div class="card cardPrice" id="baseInfo" v-cloak>
<div class="card cardPrice" id="baseInfo" v-cloak onclick="openRegionRank()">
<div class="card-header">
<span>{{topMonth}}月份均价</span>
<span>
@@ -77,7 +77,7 @@
<span>
<em id="regionRankId_noData">暂无数据
</em>
<em id="regionRankId" onclick="openRegionRank()"><strong>{{regionRank}}</strong></em>
<em id="regionRankId"><strong>{{regionRank}}</strong></em>
<label>区域均价排名</label>
</span>
<span>
@@ -118,7 +118,7 @@
<div class="content-block-title cardNearbyName" id="nearAddress"><i class="icon icon-address02"></i><span id="nearDistrictSpan"></span><i class="icon arrow-up"></i></div>
<div class="cardNearbyBox" id="nearDistricts">
</div>
<div class="content-block-title recommend" id="todayNews">热门推荐</div>
<div class="content-block-title recommend dn" id="todayNews">今日推荐</div>
<div id="newsList">
</div>
@@ -1270,7 +1270,8 @@ function getPosition(){
oriLng = p.coords.longitude;
oriLat = p.coords.latitude;
if(region.endWith("区") || region.endWith("市")){
if(region.endWith("区") || region.endWith("市") ){
region = region.substring(0, region.length-1);
}
oriRegion = region;
@@ -1604,13 +1605,17 @@ function initNews(page){
$('.infinite-scroll-preloader').hide();
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
if(page==1){
$("#todayNews").hide();
}
}
if(page==1){
todayDeployFlag = true;
$("#todayNews").hide();
}
for(var i in response.data.data.list){
dataObj.push(response.data.data.list[i])
if(dataObj[i].todayDeploy && todayDeployFlag){
todayDeployFlag = false;
$("#todayNews").show();
}
}
lastIndex = $('.cardInfo').length;
itemsPerLoad = response.data.data.list.length;
@@ -1827,7 +1832,7 @@ var itemsPerLoad2 = 5;
var dataObj = [];
var dataObj2 = [];
var page = 1;
//var yesterDayDeployFlag = true;
var yesterDayDeployFlag = true;
function addItems(number, lastIndex) {
// 生成新条目的HTML
@@ -1841,16 +1846,16 @@ function addItems(number, lastIndex) {
return;
}
var html = '';
/*if(lastIndex == 0){
if(lastIndex == 0){
yesterDayDeployFlag = true;
}*/
}
for(var i in dataObj){
if(i>=lastIndex){
if((dataObj.length<lastIndex + number) || (i < lastIndex + number)){
/*if(dataObj[i].yesterDayDeploy && yesterDayDeployFlag){
if(dataObj[i].yesterDayDeploy && yesterDayDeployFlag){
yesterDayDeployFlag = false;
html += '<div class="content-block-title recommend" style="border-top:solid 0.5rem #f3f3f3;">历史推荐</div>';
}*/
}
if(dataObj[i].type=="专题"){
html += '<div class="card cardInfo cardInfo01" onclick="openNewsView(\''+dataObj[i].id+'\',\''+dataObj[i].type+'\')">'+
'<div class="card-header">'+dataObj[i].title+'</div>'+