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

This commit is contained in:
xuhe@fangjia.com
2018-05-30 15:13:43 +08:00
13 changed files with 51 additions and 13 deletions
+14
View File
@@ -1057,3 +1057,17 @@ document.addEventListener('DOMContentLoaded', function() {
}, false);
}());
String.prototype.startWith=function(str){
var reg=new RegExp("^"+str);
return reg.test(this);
}
function getShareDomain(path) {
if(path.startWith("https")){
return "http://youfang.fangjia.com";
} else {
return path;
}
}
+24 -3
View File
@@ -12,15 +12,15 @@ var mf_totalCount = 0;
function addEstate(number, lastIndex) {
mf_curpage = mf_lastIndex/mf_itemsPerLoad + 1;
axios.get("/rest/myCollection/loadCollections",{params:{pageSize:mf_itemsPerLoad,page:mf_curpage}}).then(function(response){
data = response.data;
//data = eval( '(' + data + ')' );
if(data['results']==null || data['results'].length==0) {
$('#loadTip2').remove();
//$('.infinite-scroll-bottom #tab1').html("<div class='noData'><img src='../images/noData.png'><p>您还没有关注小区</p></div>");
return;
}
mf_totalCount = data.totalCount;
// tab.mf_num = mf_totalCount;
$("#mf_num").html("关注("+mf_totalCount+")")
// 生成新条目的HTML
var html = '';
@@ -71,7 +71,7 @@ function addEstate(number, lastIndex) {
'</div>'+
'<div class="item-subtitle"><span class="tag">'+tagStr+'</span></div>'+
'</div>'+
'</a>'+
'</a><a class="button collection collection02" onclick="removeCollect(\''+this.city+'\',\''+this.region+'\',\''+this.name+'\',this)">取消关注</a>'+
'</li>';
});
// 添加新条目
@@ -89,4 +89,25 @@ function addEstate(number, lastIndex) {
}).catch(function(error){
console.log(error)
});
}
// 取消关注
function removeCollect(city,region,name,obj){
axios.post("/rest/districts/removeCollect",{city:city,region:region,name:name}).then(function (response) {
var msg = response.data.message
if(msg){
$.toast(msg);
} else {
$.toast("取消关注");
}
/*mf_curpage = 1;
$("#mf_ul").html("");
addEstate(mf_itemsPerLoad, 0);*/
$(obj).parent().remove();
mf_totalCount = mf_totalCount - 1;
$("#mf_num").html("关注("+mf_totalCount+")")
})
.catch(function (error) {
console.log(error);
});
}
+1 -1
View File
@@ -115,7 +115,7 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/AES_UTILS.js" ></script>
<!--加解密 end-->
<script>
var shareUrl = BASE_PATH+"/house/regionRankShare?";
var shareUrl = getShareDomain(BASE_PATH)+"/house/regionRankShare?";
var sharehrefTitle = "区域均价排名";
var sharehrefDes = "区域均价排名!";
var shareId='';
+1 -1
View File
@@ -291,7 +291,7 @@ $.config = {router: false}
var tags;
var baseInfo;
var rid;
var shareUrl = BASE_PATH+"/district/districtDetail?";
var shareUrl = getShareDomain(BASE_PATH)+"/district/districtDetail?";
var sharehrefTitle = "小区名";
var sharehrefDes = "小区详情介绍!";
var shareId='';
@@ -154,7 +154,7 @@ $.config = {router: false}
<!--加解密 end-->
<script>
var shareUrl = BASE_PATH+"/fsh/evaluateReport?";
var shareUrl = getShareDomain(BASE_PATH)+"/fsh/evaluateReport?";
var sharehrefTitle = "小区名";
var sharehrefDes = "小区详情介绍!";
var shareId='';
@@ -104,7 +104,7 @@ $.config = {router: false}
var date = new Date();
var month = date.getMonth()+1+'月';
var shareUrl = BASE_PATH+"/quotations/cityDownRanking";
var shareUrl = getShareDomain(BASE_PATH)+"/quotations/cityDownRanking";
var sharehrefTitle = "全国下跌列表";
var sharehrefDes = "全国下跌列表!";
var shareId='';
+1 -1
View File
@@ -135,7 +135,7 @@ $.config = {router: false}
var date = new Date();
var month = date.getMonth()+1+'月';
var shareUrl = BASE_PATH+"/quotations/cityRanking";
var shareUrl = getShareDomain(BASE_PATH)+"/quotations/cityRanking";
var sharehrefTitle = "城市涨幅排行";
var sharehrefDes = "城市涨幅排行!";
var shareId='';
@@ -142,7 +142,7 @@ $.config = {router: false}
var date = new Date();
var month = date.getMonth()+1+'月';
var shareUrl = BASE_PATH+"/quotations/cityRankingAvgPrice";
var shareUrl = getShareDomain(BASE_PATH)+"/quotations/cityRankingAvgPrice";
var sharehrefTitle = "城市均价排行";
var sharehrefDes = "城市均价排行!";
var shareId='';
@@ -158,7 +158,7 @@ $.config = {router: false}
var date = new Date();
var month = date.getMonth()+1+'月';
var shareUrl = BASE_PATH+"/quotations/cityRankingPotential";
var shareUrl = getShareDomain(BASE_PATH)+"/quotations/cityRankingPotential";
var sharehrefTitle = "城市潜力排行";
var sharehrefDes = "城市潜力排行!";
var shareId='';
+1 -1
View File
@@ -106,7 +106,7 @@ $.config = {router: false}
var date = new Date();
var month = date.getMonth()+1+'月';
var shareUrl = BASE_PATH+"/quotations/cityUpRanking";
var shareUrl = getShareDomain(BASE_PATH)+"/quotations/cityUpRanking";
var sharehrefTitle = "全国上涨列表";
var sharehrefDes = "全国上涨列表!";
var shareId='';
+1 -1
View File
@@ -1359,7 +1359,7 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/AES_UTILS.js" ></script>
<!--加解密 end-->
<script>
var shareUrl = BASE_PATH+"/house/cityShare?city=全国";
var shareUrl = getShareDomain(BASE_PATH)+"/house/cityShare?city=全国";
var sharehrefTitle = "房产行情,小区价格,房租信息全掌握";
var sharehrefDes = "客观里面请!";
//var shareId='全国';
+2 -1
View File
@@ -140,7 +140,8 @@ $.config = {router: false}
<script>
document.addEventListener('plusready', onPlusReady, false);
var id = "202852336950816768";
var shareUrl = BASE_PATH+"/news/newDetail?newsId=";
var shareUrl = getShareDomain(BASE_PATH)+"/news/newDetail?newsId=";
var sharehrefTitle = "停车坐爱枫林晚,霜叶红于二月花";
var sharehrefDes = "客观里面请!";
var shareType = "news";
+2
View File
@@ -30,6 +30,8 @@
.buttons-tab .button{font-size:0.75rem;color:#999;line-height:2.5rem;height:2.5rem;}
.list-block ul:before{height:0;}
.cardInfo:first-child{border-top:none;}
#tabList2 .collection02{top:inherit;bottom:0.75rem;}
</style>
</head>