From 7cbb1e23e76f0d65847cb355a9d36a81e6623a74 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Tue, 15 May 2018 11:22:32 +0800 Subject: [PATCH] =?UTF-8?q?YOFUANG1.0.5=20=E5=9F=8E=E5=B8=82=E6=8A=A5?= =?UTF-8?q?=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/quotations/cityDetail.js | 22 +++- fangija-zsyf/views/house/cityDetail.html | 113 -------------------- fangija-zsyf/views/house/houseDetail.html | 119 +++++++++++++++++++++- 3 files changed, 137 insertions(+), 117 deletions(-) diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js index 466160d..92b7f39 100644 --- a/fangija-zsyf/js/quotations/cityDetail.js +++ b/fangija-zsyf/js/quotations/cityDetail.js @@ -657,7 +657,27 @@ function paramCheck(param){ return true } } - +function paramFilter(param){ + if(typeof(param)=="undefined"||param==null||$.trim(param)==""){ + return "暂无" + }else{ + return param + } +} +function paramDivisionHead(param){ + if(paramCheck(param)){ + return param.substring(0,param.indexOf("(")==-1?param.indexOf("("):param.indexOf("(")); + }else{ + return "暂无" + } +} +function paramDivisionTail(param){ + if(paramCheck(param)){ + return param.substring(param.indexOf("(")==-1?param.indexOf("("):param.indexOf("(")); + }else{ + return "" + } +} diff --git a/fangija-zsyf/views/house/cityDetail.html b/fangija-zsyf/views/house/cityDetail.html index ae9fc02..250556c 100644 --- a/fangija-zsyf/views/house/cityDetail.html +++ b/fangija-zsyf/views/house/cityDetail.html @@ -100,118 +100,6 @@
-
-
城市报告
-
- -
-
-
-
    -
  • -
    -
    总人口:{{if(paramCheck(population)){population}else{"暂无"}}}(2017年常住人口)
    -
    -
  • -
  • -
    -
    面积:6340k㎡
    -
    -
  • -
  • -
    -
    发展指数:0.852(极高,2014年)
    -
    -
  • -
  • -
    -
    行政区级别:直辖市
    -
    -
  • -
-
-
-
-
-
    -
  • -
    -
    生产总值:30133.86亿元(2017年)
    -
    -
  • -
  • -
    -
    人均生产总值:124536元(2017年)
    -
    -
  • -
  • -
    -
    人均支配收入:58988元(2017年)
    -
    -
  • -
-
-
-
-
-
    -
  • -
    -
    著名景点:外滩、豫园、南京路、人民广场、静安寺、新天地、迪士尼乐园等
    -
    -
  • -
  • -
    -
    著名高校:复旦、交大、同济、华东师大等
    -
    -
  • -
-
-
-
-
-
    -
  • -
    -
    气候条件:亚热带季风气候
    -
    -
  • -
  • -
    -
    地理位置:长江入海口南岸,东海之滨
    -
    -
  • -
-
-
-
-
-
    -
  • -
    -
    机场:上海虹桥国际机场、上海浦东国际机场
    -
    -
  • -
  • -
    -
    火车站:上海站、上海虹桥站、上海南站
    -
    -
  • -
-
-
-
-
-
-
热门小区
@@ -288,7 +176,6 @@ function onPlusReady() { loadUpOrDown(city); loadHotDistrict(city) loadCityPricesAndCounts(city) - loadCityReport(city) } diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index b4cb742..a51a253 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -234,7 +234,119 @@
- + +
+
城市报告
+
+ +
+
+
+
    +
  • +
    +
    总人口:{{paramDivisionHead(cityReport.population)}}{{paramDivisionTail(cityReport.population)}}
    +
    +
  • +
  • +
    +
    面积:{{paramFilter(cityReport.area)}}
    +
    +
  • +
  • +
    +
    发展指数:{{paramDivisionHead(cityReport.humanDevelopmentIndex)}}{{paramDivisionTail(cityReport.humanDevelopmentIndex)}}
    +
    +
  • +
  • +
    +
    行政区级别:{{paramFilter(cityReport.administrativeDivision)}}
    +
    +
  • +
+
+
+
+
+
    +
  • +
    +
    生产总值:{{paramDivisionHead(cityReport.grp)}}{{paramDivisionTail(cityReport.GRP)}}
    +
    +
  • +
  • +
    +
    人均生产总值:{{paramDivisionHead(cityReport.gnpp)}}{{paramDivisionTail(cityReport.GNPP)}}
    +
    +
  • +
  • +
    +
    人均支配收入:{{paramDivisionHead(cityReport.perCapitaIncome)}}{{paramDivisionTail(cityReport.perCapitaIncome)}}
    +
    +
  • +
+
+
+
+
+
    +
  • +
    +
    著名景点:{{paramFilter(cityReport.famousScenery)}}
    +
    +
  • +
  • +
    +
    著名高校:{{paramFilter(cityReport.famousUniversities)}}
    +
    +
  • +
+
+
+
+
+
    +
  • +
    +
    气候条件:{{paramFilter(cityReport.weatherConditions)}}
    +
    +
  • +
  • +
    +
    地理位置:{{paramFilter(cityReport.geographicPosition)}}
    +
    +
  • +
+
+
+
+
+
    +
  • +
    +
    机场:{{paramFilter(cityReport.airport)}}
    +
    +
  • +
  • +
    +
    火车站:{{paramFilter(cityReport.railwayStation)}}
    +
    +
  • +
+
+
+
+
+
+
热门小区
@@ -1242,7 +1354,8 @@ $.config = {router: false} month:month, collecd:false, nears:[], - myCityMap : [] + myCityMap : [], + cityReport:{} } }); @@ -1552,7 +1665,7 @@ function clickCity(val){ loadUpOrDown(city); loadHotDistrict(city) loadCityPricesAndCounts(city) - + loadCityReport(city) $("#trendDiv a").removeClass("active") $("#trendDiv a[v='2']").addClass("active")// 默认走势显示半年