From 2b8e8f5579bf72e93d0fdac2e8d4177f7abbe5f8 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Fri, 13 Apr 2018 18:29:37 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=94=B6=E8=97=8F=E6=98=BE=E7=A4=BA=E6=9C=89?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/user/userInfo.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index c9374ff..631c81e 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -167,6 +167,7 @@
    +
@@ -176,11 +177,12 @@
-
-
    - -
+
+
+
From d1a8eea4dbac168cae314ded86f26870d8b37cb9 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Fri, 13 Apr 2018 19:02:52 +0800 Subject: [PATCH 02/14] aa --- .../views/evaluate/evaluateReport.html | 1 - fangija-zsyf/views/house/detail.html | 78 +++++++++++++++++-- fangija-zsyf/views/rent/rentManager.html | 3 +- fangija-zsyf/views/user/codeSms.html | 12 +++ 4 files changed, 87 insertions(+), 7 deletions(-) diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 4b09b02..4c4fa79 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -333,7 +333,6 @@ function addManagement(id, houseStatus, liveStatus){ $.toast(response.data.data); plus.webview.getWebviewById('views/house/houseManageList.html').reload(); plus.webview.getWebviewById('views/user/userInfo.html').reload(); - plus.webview.getWebviewById('views/house/houseList.html').reload(); }else{ $.toast(response.data.message); } diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index 7d4a77a..42e362d 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -94,7 +94,7 @@ 出售分析
--> -
+
出租管理
@@ -109,6 +109,38 @@
+
+
+
+
    +
  • +
    +
    目前状态
    +
    出租
    +
    +
  • +
  • +
    +
    出租日期
    +
    2018/02/01 - 2018/07/31
    +
    +
  • +
  • +
    +
    每期租金
    +
    5,000元 (1月/次)
    +
    +
  • +
  • +
    +
    下次收租
    +
    3月1日
    +
    +
  • +
+
+
+
@@ -297,7 +329,7 @@ $.config = {router: false} diff --git a/fangija-zsyf/views/rent/rentManager.html b/fangija-zsyf/views/rent/rentManager.html index 2599ff8..19ed821 100644 --- a/fangija-zsyf/views/rent/rentManager.html +++ b/fangija-zsyf/views/rent/rentManager.html @@ -126,7 +126,7 @@ $.config = {router: false} document.addEventListener('plusready', onPlusReady, false); function onPlusReady() { var self = plus.webview.currentWebview(); - id = self.id + id = self.houseId axios.get('/rest/rent/queryHouseRent',{params:{id:id}}).then(function(response){ var data = response.data.data.houses; $.each(data,function(i){ @@ -281,6 +281,7 @@ function onPlusReady() { } axios.post("/rest/rent/changeStatus",d).then(function(response){ + plus.webview.getWebviewById('views/house/detail.html').reload(); back(),plus.nativeUI.closeWaiting(); }).catch(function(error){ console.log(error) diff --git a/fangija-zsyf/views/user/codeSms.html b/fangija-zsyf/views/user/codeSms.html index 3516c1e..6bcba36 100644 --- a/fangija-zsyf/views/user/codeSms.html +++ b/fangija-zsyf/views/user/codeSms.html @@ -119,6 +119,18 @@ $(".check").on("click", function () { function openView() { clicked(BASE_PATH + '/user/agreement',true) } + +var originalHeight=document.documentElement.clientHeight || document.body.clientHeight; +window.onresize=function(){ + //软键盘弹起与隐藏 都会引起窗口的高度发生变化 + var resizeHeight=document.documentElement.clientHeight || document.body.clientHeight; + if(resizeHeight*1 From 6704ec980d0a765d90919b51bdbcde00ab5f8afa Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Fri, 13 Apr 2018 19:26:51 +0800 Subject: [PATCH 03/14] YOUFANG app --- fangija-zsyf/views/rent/rentManager.html | 53 +++++++++++++----------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/fangija-zsyf/views/rent/rentManager.html b/fangija-zsyf/views/rent/rentManager.html index 2599ff8..e1dc6e6 100644 --- a/fangija-zsyf/views/rent/rentManager.html +++ b/fangija-zsyf/views/rent/rentManager.html @@ -25,7 +25,7 @@
-

出租管理

@@ -128,31 +128,34 @@ function onPlusReady() { var self = plus.webview.currentWebview(); id = self.id axios.get('/rest/rent/queryHouseRent',{params:{id:id}}).then(function(response){ - var data = response.data.data.houses; - $.each(data,function(i){ - var active = ""; - var houseRoomNum = ""; - if(this.id == id){ - active = "active" - } - if(this.houseRoomNum){ - houseRoomNum = ''+this.houseRoomNum+''; - } - $("#titleList").append(''+ - ''+houseRoomNum+'') - $(".buttons-tab01 a").click(function(){ - var id = $(this).attr("val") - window.location.href = "index?id="+id; - }); - }) +// var data = response.data.data.houses; +// $.each(data,function(i){ +// var active = ""; +// var houseRoomNum = ""; +// if(this.id == id){ +// active = "active" +// } +// if(this.houseRoomNum){ +// houseRoomNum = ''+this.houseRoomNum+''; +// } +// $("#titleList").append(''+ +// ''+houseRoomNum+'') +// $(".buttons-tab01 a").click(function(){ +// var id = $(this).attr("val") +// window.location.href = "index?id="+id; +// }); +// }) var houseInfo = response.data.data.houseInfo; - edit.liveStatus=houseInfo.liveStatus; - edit.leaseStartDate=getNowFormatDate(houseInfo.leaseStartDate); - edit.leaseEndDate = getNowFormatDate(houseInfo.leaseEndDate); - edit.lastRentDate = getNowFormatDate(houseInfo.lastRentDate); - edit.nowDay = getNowFormatDate(response.data.data.nowDay); - edit.rent = houseInfo.rent; - edit.cycle = response.data.data.cycle; + if(houseInfo.liveStatus=="出租"){ + edit.liveStatus=houseInfo.liveStatus; + edit.leaseStartDate=getNowFormatDate(houseInfo.leaseStartDate); + edit.leaseEndDate = getNowFormatDate(houseInfo.leaseEndDate); + edit.lastRentDate = getNowFormatDate(houseInfo.lastRentDate); + edit.nowDay = getNowFormatDate(response.data.data.nowDay); + edit.rent = houseInfo.rent; + edit.cycle = response.data.data.cycle; + } + /* 选择-起租日期 */ $("#input_time01").datetimePicker({ toolbarTemplate: '
\ From 3dd8a3c3a88500704907100122a4baac8c7083a1 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Fri, 13 Apr 2018 19:34:49 +0800 Subject: [PATCH 04/14] aa --- fangija-zsyf/views/house/detail.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index cffcb0f..756a6ae 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -122,25 +122,26 @@
  • 出租日期
    -
    2018/02/01 - 2018/07/31
    +
    {{rentTime}}
  • 每期租金
    -
    5,000元 (1月/次)
    +
    {{rentPrice}}
  • 下次收租
    -
    3月1日
    +
    {{nextRent}}
  • +
    @@ -371,9 +372,9 @@ var baseInfo = new Vue({ minSellPrice:"", maxSellPrice:"", rentRooms:"", - rentTime : "-"; - rentPrice : "-"; - nextRent : "-"; + rentTime : "-", + rentPrice : "-", + nextRent : "-" } }) From 9d66615c939b9eb2b64827e46d684fa1608644c4 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Fri, 13 Apr 2018 19:38:12 +0800 Subject: [PATCH 05/14] YOUFANG app --- fangija-zsyf/views/house/houseList.html | 2 +- fangija-zsyf/views/rent/rentManager.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fangija-zsyf/views/house/houseList.html b/fangija-zsyf/views/house/houseList.html index 03789d7..3cd3c3f 100644 --- a/fangija-zsyf/views/house/houseList.html +++ b/fangija-zsyf/views/house/houseList.html @@ -325,7 +325,7 @@ function addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xq } html += '
  • '; html += "
    "; - html += "
    "+result.name+" "+tempTotalPrice+"万"; + html += "
    "+tempTotalPrice+"万"; if(result.liveStatus!=null && result.liveStatus.length>0){ html += ""+result.liveStatus+"
    "; }else{ diff --git a/fangija-zsyf/views/rent/rentManager.html b/fangija-zsyf/views/rent/rentManager.html index 8c77016..a5e9136 100644 --- a/fangija-zsyf/views/rent/rentManager.html +++ b/fangija-zsyf/views/rent/rentManager.html @@ -284,7 +284,7 @@ function onPlusReady() { } axios.post("/rest/rent/changeStatus",d).then(function(response){ - plus.webview.getWebviewById('views/house/detail.html').reload(); + plus.webview.getWebviewById('/views/house/detail.html').reload(); back(),plus.nativeUI.closeWaiting(); }).catch(function(error){ console.log(error) From ed302fb59ffb7436a1a1d9ee337fc8a1bb239cd8 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Fri, 13 Apr 2018 19:43:43 +0800 Subject: [PATCH 06/14] YOUFANG app 1.0.3 --- fangija-zsyf/views/house/houseDetail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 3beeede..33acfc3 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -243,7 +243,7 @@
    {{nearDist.sname}}
    -
    {{nearDist.avgPrice}}元/㎡
    +
    {{nearDist.avgPrice==0?"暂无":nearDist.avgPrice+"元/㎡"}}
    From 40aca592226ab7b13403b504af3421607fa0150b Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Fri, 13 Apr 2018 20:17:40 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=84=E5=8C=BA?= =?UTF-8?q?=E5=8E=BF=E6=97=A0=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E6=95=88?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/regions.html | 30 ++++++++++++++++++--------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/fangija-zsyf/views/house/regions.html b/fangija-zsyf/views/house/regions.html index 054e22c..29712a7 100644 --- a/fangija-zsyf/views/house/regions.html +++ b/fangija-zsyf/views/house/regions.html @@ -19,13 +19,13 @@
    -
    +

    {{city}}各区县涨跌排行

    -
    +
    @@ -69,8 +69,14 @@
    -
    + +
    @@ -112,7 +118,6 @@ $.config = {router: false} var city = self.city regionsInfoVue.$data.city = city; loadRegionInfo(city); - } //loadRegionInfo("上海"); @@ -123,14 +128,19 @@ $.config = {router: false} } }).then(function (response) { var msg = response.data.data; - if(msg){ - for(var i in msg){ - var da = msg[i] - da.oneMonthUpDownRange = (da.oneMonthUpDownRange*100).toFixed(2) + if(response.data.status){ + if(msg!=null && msg.length>0){ + for(var i in msg){ + var da = msg[i] + da.oneMonthUpDownRange = (da.oneMonthUpDownRange*100).toFixed(2) + } + regionsInfoVue.$data.regionInfos = msg; + }else{ + //控制显示无数据效果 + $('#hasDataDiv').hide(); + $('#noDataDiv').show(); } - regionsInfoVue.$data.regionInfos = msg; } - }) .catch(function (error) { console.log(error); From 025d5eb6bc5f01596e49cd8382bb320955042e68 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Sat, 14 Apr 2018 10:11:36 +0800 Subject: [PATCH 08/14] aa --- fangija-zsyf/views/rent/rentManager.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fangija-zsyf/views/rent/rentManager.html b/fangija-zsyf/views/rent/rentManager.html index a5e9136..48175dd 100644 --- a/fangija-zsyf/views/rent/rentManager.html +++ b/fangija-zsyf/views/rent/rentManager.html @@ -152,8 +152,14 @@ function onPlusReady() { edit.leaseEndDate = getNowFormatDate(houseInfo.leaseEndDate); edit.lastRentDate = getNowFormatDate(houseInfo.lastRentDate); edit.nowDay = getNowFormatDate(response.data.data.nowDay); - edit.rent = houseInfo.rent; + if(houseInfo.rent==0){ + edit.rent = ""; + }else{ + edit.rent = houseInfo.rent; + } edit.cycle = response.data.data.cycle; + }else{ + edit.cycle = "1 月 /次"; } /* 选择-起租日期 */ From e1fe37bc929b701a1a2bfb6bdc42e14dc67ddd06 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Sat, 14 Apr 2018 10:13:21 +0800 Subject: [PATCH 09/14] 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 10/14] =?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 11/14] 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 12/14] =?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 13/14] 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{ From 418f4c2aefc16bf1b9af1a04c7c52ddcc2ca8e92 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Sat, 14 Apr 2018 14:21:22 +0800 Subject: [PATCH 14/14] 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);