From 418f4c2aefc16bf1b9af1a04c7c52ddcc2ca8e92 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Sat, 14 Apr 2018 14:21:22 +0800 Subject: [PATCH 1/4] aa --- fangija-zsyf/views/house/detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index 756a6ae..3c42d20 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -523,7 +523,7 @@ function addManagement(id, houseStatus, liveStatus){ }).then(function (response) { var status = response.data.status; if(status){ - $.toast(response.data.data); + $.toast("修改状态成功!"); //window.location.reload(); }else{ $.toast(response.data.message); From 36070379707e8302cf6d7cbf0d36262b86086880 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Sat, 14 Apr 2018 14:26:24 +0800 Subject: [PATCH 2/4] update --- fangija-zsyf/js/district/districtDetail.js | 16 +- fangija-zsyf/js/quotations/cityDetail.js | 29 +- fangija-zsyf/manifest.json | 23 +- fangija-zsyf/views/district/detail.html | 4 +- fangija-zsyf/views/house/cityDetail.html | 5 +- fangija-zsyf/views/house/houseDetail.html | 257 ++-- fangija-zsyf/views/house/houseDetail1.html | 1504 ++++++++++++++++++++ 7 files changed, 1714 insertions(+), 124 deletions(-) create mode 100644 fangija-zsyf/views/house/houseDetail1.html diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index 00f2244..b7ffa0c 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -78,21 +78,6 @@ function removeCollect(){ }); } -/* button状态切换 */ -$("#trendTabDiv .button").on("click", function () { - $(this).parent().children().removeClass("active"); - $(this).addClass("active"); -}); - -/* 图表切换 */ -$("#tabAvgDiv").on("click", function () { - $("#tabChart1").css("z-index","1"); - $("#tabChart2").css("z-index","-1"); -}); -$("#tabRentDiv").on("click", function () { - $("#tabChart2").css("z-index","1"); - $("#tabChart1").css("z-index","-1"); -}); var t1 = window.setInterval(loadMap,1000); function loadMap(){ @@ -303,6 +288,7 @@ function loadKLineData(city, region, name){ $("#trendDiv1 a").click(function(){ //showTrends(); + alert("trend"); var v = $(this).attr("t-v"); showTrends(v) }); diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js index 8c27744..b5f458b 100644 --- a/fangija-zsyf/js/quotations/cityDetail.js +++ b/fangija-zsyf/js/quotations/cityDetail.js @@ -1,9 +1,9 @@ var ret = [] -function loadMyCollectCity(){ +function loadCurCity(city){ axios.get("/rest/quotations/userCollectCitys",{}).then(function (response) { var curDatas = response.data.data - if(curDatas){ + if(curDatas && curDatas.length>0){ if(IsInArray(curDatas, city)){ cityInfoVue.$data.collecd = true; }else{ @@ -183,6 +183,7 @@ function loadUpOrDownChart(downRate, upRate){ dataUp = [cityObj1, cityObj2] addUpChart(dataUp) + $("#up_chart").parent().parent().show(); }else{ $("#up_chart").parent().parent().hide() } @@ -198,6 +199,7 @@ function loadUpOrDownChart(downRate, upRate){ dataDown = [cityObj3, cityObj4] addDownChart(dataDown) + $("#down_chart").parent().parent().show(); }else{ $("#down_chart").parent().parent().hide() } @@ -464,9 +466,29 @@ function docollectCity(city){ var msg = response.data.message; if(msg){ if(msg == "取消关注成功"){ - cityInfoVue.$data.collecd = false; + try{ + cityInfoVue.$data.collecd = false; + + var da = cityDetaiVue.$data.citys + if(da && da.length>0){ + var index = da.indexOf(city) + if(index>0){ + da.splice(index, 1) + cityDetaiVue.$data.citys = da; + if(da.length>0){ + $("a[href='#tabQuotation0']").click(); + } + } + } + }catch(e){ + + } + + + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); }else if(msg == "关注成功"){ cityInfoVue.$data.collecd = true; + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); }else{ $.toast(msg); } @@ -478,3 +500,4 @@ function docollectCity(city){ }); } + diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index 6bbd6c7..10a872c 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -1620,7 +1620,8 @@ "views/user/passLogin.html", "views/district/detail.html", "views/setting/setting.html", - "views/user/codeSms.html" + "views/user/codeSms.html", + "views/house/detail.html" ], "priority": 0 }, @@ -1668,7 +1669,25 @@ "priority": 0 }, "views/house/houseDetail.html": { - "resources": [], + "resources": [ + "views/component/cityIncreaseRankingComponent.js", + "js/echarts.js", + "css/main.css", + "js/axiosPlugin.js", + "js/quotations/cityDetail.js", + "js/light7.js", + "views/component/cityPotentialRankingComponent.js", + "js/cn.js", + "views/component/myFocusComponent.js", + "js/zepto.js", + "css/city.css", + "js/log/log_stat.js", + "js/common.js", + "js/axios.min.js", + "js/vue.js", + "views/component/cityChooseComponent.js", + "js/highcharts-4.2.3.js" + ], "refer": [ "views/house/regions.html", "views/district/detail.html", diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 562d89e..2b2629a 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -238,8 +238,8 @@ $.config = {router: false} - + diff --git a/fangija-zsyf/views/house/houseDetail1.html b/fangija-zsyf/views/house/houseDetail1.html new file mode 100644 index 0000000..3beeede --- /dev/null +++ b/fangija-zsyf/views/house/houseDetail1.html @@ -0,0 +1,1504 @@ + + + + + +房产行情 + + + + + + + + + + + + + + + + +
+
+
+ +

房产行情

+
+
+
+ 全国 + + 添加 +
+ +
+
+
+
+ +
+
+ {{nowYear}}年{{nowMonth}}月全国{{cityCount}}个城市房价 +
+
+
+ + {{upRate}}% + + + + {{downRate}}% + + +
+
+ +
+
+ +
+
+
+
+
+ 城市涨幅排行 +
+
+ 城市潜力排行 +
+
+ 城市均价排行 +
+
①{{item.city}}
+
+
+ {{item.oneMonthUpDownRange*100}}% +
+
+ 潜力指数 +
+
+ {{Math.abs(item.oneMonthUpDownRange*100)}}% + + + +
+
+ + +
+
+
+
+
房产热点城市
+
+
+ +

北京

+
+
+ +

上海

+
+
+ +

深圳

+
+
+
+
+ +
+
+
+
+ + 取消 + 关注 + +
+
+ 当前参考均价 +
+
+
{{myCityMap.cityTopMonthAvgPrice}}元/㎡
+
暂无
+
+ +
+ +
+
{{myCityMap.time}}楼市行情区县涨跌详情
+
+
+ +
+
+ +
+
+
+
+
+
+
城市均价及挂牌走势 +
+
+ 半年 + 一年 + 三年 +
+
+
+
+
+
+
+ +
+
热门小区
+
+
+
+
+
{{nearDist.sname}}
+
+
{{nearDist.avgPrice}}元/㎡
+
+
+ +
+
+
+
+
+
+ + + + +
+
+
+ +
+
+
+ + + + +
+
+
+
+ +
+ +
+
城市房价TOP10
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From defae943107a176297608eab983888e7fa8871d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Sat, 14 Apr 2018 14:36:52 +0800 Subject: [PATCH 3/4] pass reg add --- fangija-zsyf/views/user/updatePass.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fangija-zsyf/views/user/updatePass.html b/fangija-zsyf/views/user/updatePass.html index 2cb8847..f414c21 100644 --- a/fangija-zsyf/views/user/updatePass.html +++ b/fangija-zsyf/views/user/updatePass.html @@ -115,6 +115,11 @@ new Vue({ $.toast("请输入密码"); return; } + var reg = /^[a-zA-Z0-9]{1,}$/; + if (!reg.test(this.pass)){ + $.toast("请输入6位以上数字或字母"); + return; + } if (this.pass.length < 7) { $.toast("请输入6位以上数字或字母"); return; From 5553ed6c3d81c1c8815b80d7eceedf1041e560e1 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Sat, 14 Apr 2018 14:37:31 +0800 Subject: [PATCH 4/4] update --- fangija-zsyf/views/house/houseDetail.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index a19d902..928dfdc 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -1548,6 +1548,11 @@ function loadMyCollectCity(){ } cityDetaiVue.$data.citys = curDatas; }else{ + if(positionCity){ + curDatas.splice(0,0, positionCity) + } + cityDetaiVue.$data.citys = curDatas; + $("#cityInfo").hide() }