From 3df13f45bad6857ebef06421c6f580530fdf239c Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Thu, 29 Mar 2018 13:11:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/yfindex.html | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index aaff9b5..32836f6 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -75,7 +75,7 @@ {{regionRank}} - + {{priceRate}}% @@ -201,7 +201,7 @@ -
+
@@ -1207,6 +1207,7 @@ var scoreCount = 0; var lat = 0; var lng = 0; var address = ""; +var timestamp1 = new Date().getTime(); document.addEventListener('plusready', onPlusReady, false); //扩展API加载完毕,现在可以正常调用扩展API function onPlusReady(){ @@ -1354,6 +1355,16 @@ function initBaseInfo(city,region,address,lat,lng){ $(".loadingBg").hide(); }) .catch(function (error) { + setTimeout(function(){ + mui.init(); + mui.openWindow({ + url: 'error.html', + id:'error.html', + extras:{ + //扩展参数 + } + }); + },10000) console.log(error); }); initNearDistricts(cityParam,latParam,lngParam,regionParam,0,0,0,""); @@ -1817,6 +1828,7 @@ function addItems(number, lastIndex) { // 添加新条目 if(lastIndex2 == 0){ $('.infinite-scroll-bottom .list-container').html(html); + $("#nearDistrictContainer").show(); }else{ $('.infinite-scroll-bottom .list-container').append(html); } @@ -2069,7 +2081,7 @@ function req(cityStr){ initRegionSelect(city); $(".region a").text('不限'); $("#select_price_div a").text('不限'); - potenialIndex(city,sort); + //potenialIndex(city,sort); } function openUrl(url){ @@ -2395,6 +2407,7 @@ function getCityPriceLevel(cityParam){ } function getDistrictList(cityParam,latParam,lngParam,regionParam,order,minPrice,maxPrice,tag){ + $("#nearDistrictContainer").hide(); latParam=0; lngParam=0; axios.get(BASE_PATH+"/rest/index/districtList", { From e8fd2fb456c9f694967cce7034409369c9424c43 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 29 Mar 2018 18:14:06 +0800 Subject: [PATCH 2/4] update --- fangija-zsyf/config.js | 4 ++-- fangija-zsyf/views/news/newsDetail.html | 23 +++++++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index c084546..5c42836 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,7 +1,7 @@ /**服务端地址**/ //var BASE_PATH = "http://192.168.10.128:8084"; -var BASE_PATH = "http://192.168.10.47:8086"; -//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.53:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; /**是否显示过启动页面**/ var lauchFlag = false; \ No newline at end of file diff --git a/fangija-zsyf/views/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index cc97dab..8b785d2 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -13,6 +13,11 @@ + + + @@ -31,7 +36,7 @@

-


+


@@ -75,7 +80,7 @@ @@ -109,7 +114,7 @@ $.config = {router: false} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/house/add_noData.html b/fangija-zsyf/views/house/add_noData.html new file mode 100644 index 0000000..4bdcc9b --- /dev/null +++ b/fangija-zsyf/views/house/add_noData.html @@ -0,0 +1,54 @@ + + + + + +房产评估 + + + + + + + + + + + + + +
+
+
+ +

房产评估

+
+
+
+ +

评估房产  发现价值

+ +
+
+
+
+ + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index f8db054..0807bcb 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -101,6 +101,7 @@ $.config = {router: false} + @@ -109,7 +110,7 @@ $.config = {router: false} \ No newline at end of file diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index 32836f6..d5dd780 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -64,21 +64,28 @@
-
{{momAvgPrice}}元/㎡
+
暂无数据
+
{{momAvgPrice}}元/㎡
@@ -124,7 +131,7 @@
-
+
@@ -132,7 +139,7 @@
-
'+ '
'+dataObj[i].introduction+'
'+ '
'+ - ''+dataObj[i].recommendCommentCount+'条
'+ + '
'+ '
'+ '
'; } if(dataObj[i].type=="投票"){ var voteFavorCount = dataObj[i].voteFavorCount; var voteNoFavorCount = dataObj[i].voteNoFavorCount; - var voteFavorCountRate = Math.round((voteFavorCount*100)/(voteFavorCount+voteNoFavorCount)); - var voteNoFavorCountRate = 100-voteFavorCountRate; + var voteFavorCountRate = 50 + var voteNoFavorCountRate = 50 + if(voteFavorCount == 0 && voteNoFavorCount==0){ + + }else{ + voteFavorCountRate = Math.round((voteFavorCount*100)/(voteFavorCount+voteNoFavorCount)); + voteNoFavorCountRate = 100-voteFavorCountRate; + } + html += '