From e1fe37bc929b701a1a2bfb6bdc42e14dc67ddd06 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Sat, 14 Apr 2018 10:13:21 +0800 Subject: [PATCH 1/5] YOUFANG app --- fangija-zsyf/views/rent/rentManager.html | 1 - 1 file changed, 1 deletion(-) diff --git a/fangija-zsyf/views/rent/rentManager.html b/fangija-zsyf/views/rent/rentManager.html index a5e9136..d0d4bb1 100644 --- a/fangija-zsyf/views/rent/rentManager.html +++ b/fangija-zsyf/views/rent/rentManager.html @@ -205,7 +205,6 @@ function onPlusReady() { console.log(error) }); - //var id="165878889770385408" /* 编辑状态-确定 */ $(document).on('click','#confirm_btn', function () { From ea6ea1740b1e6835988868396b37fd1f9fc56821 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 10:21:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E8=AF=A6=E6=83=85?= =?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/js/district/districtDetail.js | 25 ++--- fangija-zsyf/views/district/detail.html | 109 ++++++++++++++------- 2 files changed, 78 insertions(+), 56 deletions(-) diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index 00f2244..19f917a 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -9,10 +9,6 @@ var mapLoadCount = 0; /* 关注&已关注切换 */ -$(".collection01").on("click", function () { - doAddCollect() -}); - function doAddCollect(){ if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ @@ -34,7 +30,6 @@ function addCollect(){ $(".collection02").show(); $.toast("随时掌握小区动态"); } - alert(12) plus.webview.getWebviewById('views/user/userInfo.html').reload(); plus.webview.getWebviewById('yfindex.html').reload(); plus.webview.getWebviewById('views/house/houseManageList.html').reload(); @@ -79,22 +74,22 @@ function removeCollect(){ } /* button状态切换 */ -$("#trendTabDiv .button").on("click", function () { +/*$("#trendTabDiv .button").on("click", function () { $(this).parent().children().removeClass("active"); $(this).addClass("active"); }); - +*/ /* 图表切换 */ -$("#tabAvgDiv").on("click", function () { +/*$("#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); +/*var t1 = window.setInterval(loadMap,1000); function loadMap(){ mapLoadCount++; if(lng && lat){ @@ -109,7 +104,7 @@ function loadMap(){ $("#mapDiv").hide(); } } -} +}*/ //小区详情 function loadDistrictInfo(){ @@ -301,11 +296,6 @@ function loadKLineData(city, region, name){ }); } -$("#trendDiv1 a").click(function(){ - //showTrends(); - var v = $(this).attr("t-v"); - showTrends(v) -}); function showTrends(v){ if(v == "36"){ @@ -534,8 +524,7 @@ $("#trendDiv2 a").click(function(){ /* 小区租金走势 */ -function loadRentTrends(city, region, name){ - var type = $("#trendDiv2 a.active").attr("t-v") +function loadRentTrends(city, region, name, type){ axios.get("/rest/trend/distRentTrends", { params: { city: city, diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 562d89e..dd7e4c1 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -70,8 +70,8 @@
{{city}}{{region}}{{address}}
@@ -114,17 +114,17 @@
@@ -132,8 +132,8 @@
@@ -270,40 +270,61 @@ function onPlusReady() { name = self.name; // 创建根实例 baseInfo = new Vue({ - el: '#districtBaseInfo', - data: { - name : "", - city:"", - region: "", - address: "", - avgPrice:"", - oneMonthUpDownRange:"", - priceRate:"", - cityPrice:"", - finishBuildingDate:"", - householdCount:"", - cubagePercent:"", - carSiteCount:"", - virescencePercent:"", - estateCharge:"", - moreArea:"", - developer:"", - estateCompany:"", - tags:[], - nearDists:[], - regionIndex:"", - schoolIndex:"" - + el: '#districtBaseInfo', + data: { + name : "", + city:"", + region: "", + address: "", + avgPrice:"", + oneMonthUpDownRange:"", + priceRate:"", + cityPrice:"", + finishBuildingDate:"", + householdCount:"", + cubagePercent:"", + carSiteCount:"", + virescencePercent:"", + estateCharge:"", + moreArea:"", + developer:"", + estateCompany:"", + tags:[], + nearDists:[], + regionIndex:"", + schoolIndex:"" + }, + methods:{ + showChat: function(type){ + if(type == 2) { + document.getElementById("tabChart2").style = "z-index:1"; + document.getElementById("tabChart1").style = "z-index:-1"; + } else { + document.getElementById("tabChart2").style = "z-index:-1"; + document.getElementById("tabChart1").style = "z-index:1"; } + + } + } }) /* 小区均价分析 */ loadKLineData(city, region, name); /* 小区租金走势 */ - loadRentTrends(city, region, name); + loadRentTrends(city, region, name,2); } - +function showLoadRentTrends(type) { + if(type == 3) { + document.getElementById("trendDivTab3").setAttribute("class","tab-link button active"); + document.getElementById("trendDivTab2").setAttribute("class","tab-link button"); + } else { + document.getElementById("trendDivTab3").setAttribute("class","tab-link button"); + document.getElementById("trendDivTab2").setAttribute("class","tab-link button active"); + } + + loadRentTrends(city, region, name,type); +} /*baseInfo = new Vue({ el: '#districtBaseInfo', @@ -330,9 +351,21 @@ function onPlusReady() { regionIndex:"", schoolIndex:"" - } - })*/ - + }, + methods:{ + showChat: function(type){ + if(type == 2) { + document.getElementById("tabChart2").style = "z-index:1"; + document.getElementById("tabChart1").style = "z-index:-1"; + } else { + document.getElementById("tabChart2").style = "z-index:-1"; + document.getElementById("tabChart1").style = "z-index:1"; + } + + } + } + }) + */ function openMapWindow(){ clicked('arround.html',true,false,{},{city:city,region:region,name:name,lat:lat,lng:lng}); } From 57572a97a4b6643bbb245981eda310963e5bd4a8 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Sat, 14 Apr 2018 10:41:25 +0800 Subject: [PATCH 3/5] YOUFANG app 1.0.3 --- fangija-zsyf/views/news/newsDetail.html | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/fangija-zsyf/views/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index dcf49c4..ee4962e 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -170,15 +170,10 @@ function onPlusReady() { id = self.newsId; shareId = id shareUrl = shareUrl+id - $.ajax({ - type : 'get', - url : BASE_PATH + "/rest/news/detail", - data:{newsId:id}, - dataType:'json', - async:false, - success:function(result){ - if(result.code==200){ - data = result.data + + axios.get("/rest/news/detail",{params:{newsId:id}}).then(function(response){ + if(response.data.code==200){ + data = response.data.data $("#title").text(data.title) $("#title2").text(data.title) $("#source").text(data.source==null?"":"来源:"+data.source) @@ -200,10 +195,10 @@ function onPlusReady() { //是否收藏 isCollect(); } - }, - error:function(){ - } - }) + + }).catch(function(error){ + console.log(error) + }); getPosition(); updateSerivces(); } From ea7d2d3deefc96c09dab1f80a40660f182925947 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 10:46:48 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=A7=9F=E9=87=91=E8=B5=B0=E5=8A=BF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/district/districtDetail.js | 1 + 1 file changed, 1 insertion(+) diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index 19f917a..0dcd6d5 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -525,6 +525,7 @@ $("#trendDiv2 a").click(function(){ /* 小区租金走势 */ function loadRentTrends(city, region, name, type){ + if(type == undefined) type= 2; axios.get("/rest/trend/distRentTrends", { params: { city: city, From 3eda178c366e91eb682015da2c541e87a182d1dd Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Sat, 14 Apr 2018 11:43:10 +0800 Subject: [PATCH 5/5] YOUFANG --- .../views/component/cityIncreaseRankingComponent.js | 12 ++++++++++-- .../views/component/cityPotentialRankingComponent.js | 11 ++++++++++- fangija-zsyf/views/house/houseDetail.html | 11 +++++++++-- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js index 53c55ff..ae6f51f 100644 --- a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js +++ b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js @@ -49,11 +49,20 @@ Vue.component('city_increase_ranking',{ }, follow:function(city,event){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ - alert("请先登录") clicked('/views/user/passLogin.html',true,false,{},{},function(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ }else{ + axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + $(event.target).parent().children().removeClass("dn"); + $(event.target).addClass("dn"); + reloadMyFocus() + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + }).catch(function(error){ + console.log(error) + }) } }) }else{ @@ -61,7 +70,6 @@ Vue.component('city_increase_ranking',{ $(event.target).parent().children().removeClass("dn"); $(event.target).addClass("dn"); reloadMyFocus() - //plus.webview.getWebviewById('views/user/userInfo.html').reload() }).catch(function(error){ console.log(error) }) diff --git a/fangija-zsyf/views/component/cityPotentialRankingComponent.js b/fangija-zsyf/views/component/cityPotentialRankingComponent.js index 5acd4f8..d754df3 100644 --- a/fangija-zsyf/views/component/cityPotentialRankingComponent.js +++ b/fangija-zsyf/views/component/cityPotentialRankingComponent.js @@ -67,11 +67,20 @@ Vue.component('city_potential_ranking',{ }, follow:function(city,event){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ - alert("请先登录") clicked('/views/user/passLogin.html',true,false,{},{},function(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ }else{ + axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + $(event.target).parent().children().removeClass("dn"); + $(event.target).addClass("dn"); + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + reloadMyFocus() + }).catch(function(error){ + console.log(error) + }) } }) }else{ diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 33acfc3..ed82840 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -1472,12 +1472,19 @@ function markFocus(){ function addFocus(city){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ - alert("请先登录") clicked('/views/user/passLogin.html',true,false,{},{},function(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ }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(); + }).catch(function(error){ + console.log(error) + }) } }) }else{