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

This commit is contained in:
2018-04-14 17:43:26 +08:00
3 changed files with 16 additions and 16 deletions
+1 -1
View File
@@ -1513,10 +1513,10 @@ function addFocus(city){
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
reloadMyFocus()
createData(city, myDatasVue.$data.cityDatas.length);
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
createData(city, myDatasVue.$data.cityDatas.length);
}).catch(function(error){
console.log(error)
})
+9 -14
View File
@@ -73,28 +73,28 @@
</div>
</div>
<div class="buttons-tab fixed-tab theme" data-offset="44">
<a href="#" class="tab-link button active">房产(0)</a>
<a href="#" class="tab-link button">关注(0)</a>
<a href="#" class="tab-link button">收藏(0)</a>
<a href="#" class="tab-link button" style="display: none;">消息(0)</a>
<a href="#tab_house" class="tab-link button active">房产(0)</a>
<a href="#tab_focus" class="tab-link button">关注(0)</a>
<a href="#tab_collect" class="tab-link button">收藏(0)</a>
<a href="#tab_message" class="tab-link button" style="display: none;">消息(0)</a>
</div>
<div class="tabs">
<div id="" class="tab active">
<div id="tab_house" class="tab active">
<div class="noData">
<img src="../../images/noData.png">
</div>
</div>
<div id="" class="tab">
<div id="tab_focus" class="tab">
<div class="noData">
<img src="../../images/noData.png">
</div>
</div>
<div id="" class="tab">
<div id="tab_collect" class="tab">
<div class="noData">
<img src="../../images/noData.png">
</div>
</div>
<div id="" class="tab">
<div id="tab_message" class="tab">
<div class="noData">
<img src="../../images/noData.png">
</div>
@@ -149,7 +149,7 @@
<a href="#tabList4" class="tab-link button" style="display: none;">消息(2)</a>
</div>
<div class="contentBox">
<div class="content infinite-scroll infinite-scroll-bottom pstion" data-distance="100">
<div class="content infinite-scroll infinite-scroll-bottom pstion" data-distance="50">
<div class="tabs">
<!-- 我的房产 -->
<div id="tabList1" class="tab active">
@@ -251,11 +251,6 @@ $(document).on('click','.alert-text-title', function () {
$.alert('房产等级是房屋在城市中的综合评级,由高至低分别为 豪宅、公寓、平房、草屋、山洞共5个级别。', '房产等级');
});
/* 点击资讯跳转到资讯详情页 */
$(".cardInfo01,.cardInfo02").on("click", function(){
window.location.href = "#";
});
//初始化init
$.init();
+6 -1
View File
@@ -1193,6 +1193,11 @@ $.config = {router: false}
<script type='text/javascript' src='js/jquery.cookie.js?version=${version!}' charset='utf-8'></script>
<script type="text/javascript" src="js/updateVersion/updateVersion.js" charset='utf-8'></script>
<script>
function openHangQing(city){
clicked('views/house/cityDetail.html',true,false,{},{city:city},function(){
})
}
String.prototype.endWith = function(str) {
var reg = new RegExp(str + "$");
return reg.test(this);
@@ -1768,7 +1773,7 @@ function addItems(number, lastIndex) {
'<div class="card-footer"><span>'+dataObj[i].introduction+'</span></div></div>';
}
if(dataObj[i].type=="推荐城市"){
html += '<div class="card cardInfo cardInfo01 cardInfo01a" onclick="openUrl(\''+BASE_PATH+'/quotations/building?cityName='+dataObj[i].recommendCity+'\')">'+
html += '<div class="card cardInfo cardInfo01 cardInfo01a" onclick="openHangQing(\''+dataObj[i].recommendCity+'\')">'+
'<div class="card-header">推荐城市——'+dataObj[i].recommendCity+'</div>';
if(dataObj[i].recommendCityTags != "" && dataObj[i].recommendCityTags != null){
var arry = dataObj[i].recommendCityTags.split("_");