diff --git a/projects/fangjia-coresite/src/main/webapp/evaluation/reportNew.ftl b/projects/fangjia-coresite/src/main/webapp/evaluation/reportNew.ftl index 2431ea2b0..4be5992ee 100644 --- a/projects/fangjia-coresite/src/main/webapp/evaluation/reportNew.ftl +++ b/projects/fangjia-coresite/src/main/webapp/evaluation/reportNew.ftl @@ -449,9 +449,9 @@ return false; } } - if(isWeiXin()){ - document.getElementById("smobile").setAttribute("style","display:none"); - } + // if(isWeiXin()){ + // document.getElementById("smobile").setAttribute("style","display:none"); + // } /* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */ Zepto = $ diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java index f821ff62c..242aac83e 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java @@ -361,7 +361,9 @@ public class DistrictStatServiceImpl implements DistrictStatService { public DistrictStatBo findDistrictStat(DistrictKey districtKey, Date date) { List params = new ArrayList(5); params.add(new QueryParam("districtName", districtKey.getName())); - params.add(new QueryParam("region", districtKey.getRegion())); + if(StringUtils.isNotBlank(districtKey.getRegion())){ + params.add(new QueryParam("region", districtKey.getRegion())); + } params.add(new QueryParam("city", districtKey.getCity())); params.add(new QueryParam("estateType", QueryParam.IN_OPERATOR, Arrays.asList("СÇø", "±ðÊû"))); params.add(new QueryParam("weekend", date)); diff --git a/projects/fangjia-static/src/main/webapp/images/fangjia/v6/3-6-1.png b/projects/fangjia-static/src/main/webapp/images/fangjia/v6/3-6-1.png index 991173209..2a8367b19 100644 Binary files a/projects/fangjia-static/src/main/webapp/images/fangjia/v6/3-6-1.png and b/projects/fangjia-static/src/main/webapp/images/fangjia/v6/3-6-1.png differ diff --git a/projects/fangjia-static/src/main/webapp/style/fangjia/v6/about.css b/projects/fangjia-static/src/main/webapp/style/fangjia/v6/about.css index d4eeda023..50827fa7d 100644 --- a/projects/fangjia-static/src/main/webapp/style/fangjia/v6/about.css +++ b/projects/fangjia-static/src/main/webapp/style/fangjia/v6/about.css @@ -130,8 +130,14 @@ .icon08{width:55px; height:100px;background: url(../../../images/fangjia/v6/6-1-11.png);background-size: 33px 24px;background-repeat: no-repeat;background-position: center;} /* 自适应 */ @media(min-width:1300px){ - .bg01{height: 1025px;} + .bg01{height:800px;} +} + +@media(min-width:1500px){ + .bg01{height:900px;} } + +