From ea566418176308f8953922637bb5b5f983c173ce Mon Sep 17 00:00:00 2001 From: gaojuan Date: Thu, 19 Apr 2018 18:05:17 +0800 Subject: [PATCH] update --- fangija-zsyf/js/quotations/cityDetail.js | 78 ++++++++++++++++--- .../component/cityIncreaseRankingComponent.js | 9 +-- .../cityPotentialRankingComponent.js | 24 +----- .../views/component/myFocusComponent.js | 19 ----- fangija-zsyf/views/house/cityDetail.html | 1 + fangija-zsyf/views/house/houseDetail.html | 6 -- 6 files changed, 72 insertions(+), 65 deletions(-) diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js index 47fcc76..bca5fe0 100644 --- a/fangija-zsyf/js/quotations/cityDetail.js +++ b/fangija-zsyf/js/quotations/cityDetail.js @@ -1,4 +1,62 @@ var ret = [] +var myFocusDatas = {myFocusList: []}; +var cityIncreaseRankingData = {cityIncreaseRankingList:[],test:"ttt"}; +var cityPotentialRankingData = {cityPotentialRankingList:[]}; + +function reloadMyFocus(){ + if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ + $("#myFocusFirstPage").hide() + $("#myFocus").hide(); + }else{ + axios.get("/rest/quotations/userCollectCityInfo").then(function(response){ + if(response.data.data.length==0){ + $("#myFocusFirstPage").hide(); + $("#myFocus").hide(); + }else{ + myFocusDatas.myFocusList = response.data.data; + $("#myFocus").show() + } + }).catch(function(error){ + console.log(error) + }) + } +} +function reloadCityIncreaseRanking(){ + axios.get("/rest/quotations/markUpTopInfos").then(function(response){ + cityIncreaseRankingData.cityIncreaseRankingList = response.data.data; + }).catch(function(error){ + console.log(error) + }) +} + +function reloadCityPotentialRanking(){ + axios.get("/rest/quotations/potentialUpTopInfos").then(function(response){ + list = response.data.data; + $(list).each(function(i){ + var index = this.index; + var totalHalfStar = Math.round(Math.round(index/5)/2) //总半星 + var starNum = Math.floor(totalHalfStar/2) //全星 + var halfStarNum = totalHalfStar%2 //半星 + var noneStarNum = 5-starNum-halfStarNum //空星 + this.starNum = starNum; + this.halfStarNum = halfStarNum; + this.noneStarNum = noneStarNum; + }) + cityPotentialRankingData.cityPotentialRankingList = response.data.data; + + + + + }).catch(function(error){ + console.log(error) + }) +} + + +function IsInArray(arr, val){ +  var testStr=','+arr.join(",")+","; +  return testStr.indexOf(","+val+",")!=-1; +} function loadMyCollectCity(){ plus.nativeUI.showWaiting(); @@ -497,7 +555,8 @@ function collectCity(city, type){ $.confirm(title, function () { docollectCity(city, type) - plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + // plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + },function(){ plus.webview.getWebviewById('views/house/houseDetail.html').reload(); //loadMyCollectCity(); @@ -518,7 +577,6 @@ function docollectCity(city, type){ }).then(function (response) { var msg = response.data.message; if(msg){ - if(msg == "取消关注成功"){ try{ cityInfoVue.$data.collecd = false; @@ -540,16 +598,16 @@ function docollectCity(city, type){ //loadMyCollectCity(); $("a[href='#tabQuotation1']").click(); - //plus.webview.getWebviewById('views/house/houseDetail.html').reload(); - reloadMyFocus(); - reloadCityPotentialRanking() - reloadCityIncreaseRanking() + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + //reloadMyFocus(); + //reloadCityPotentialRanking() + //reloadCityIncreaseRanking() }else if(msg == "关注成功"){ cityInfoVue.$data.collecd = true; plus.webview.getWebviewById('views/house/houseDetail.html').reload(); - reloadMyFocus(); - reloadCityPotentialRanking() - reloadCityIncreaseRanking() + //reloadMyFocus(); + //reloadCityPotentialRanking() + //reloadCityIncreaseRanking() }else{ $.toast(msg); } @@ -562,3 +620,5 @@ function docollectCity(city, type){ } + + diff --git a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js index 20f7f8d..52a9a8f 100644 --- a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js +++ b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js @@ -1,4 +1,4 @@ -var cityIncreaseRankingData = {cityIncreaseRankingList:[],test:"ttt"}; + Vue.component('city_increase_ranking',{ template:'
'+ @@ -204,10 +204,3 @@ Vue.component('city_increase_ranking',{ } }) -function reloadCityIncreaseRanking(){ - axios.get("/rest/quotations/markUpTopInfos").then(function(response){ - cityIncreaseRankingData.cityIncreaseRankingList = response.data.data; - }).catch(function(error){ - console.log(error) - }) -} diff --git a/fangija-zsyf/views/component/cityPotentialRankingComponent.js b/fangija-zsyf/views/component/cityPotentialRankingComponent.js index c71d9d0..ac9161c 100644 --- a/fangija-zsyf/views/component/cityPotentialRankingComponent.js +++ b/fangija-zsyf/views/component/cityPotentialRankingComponent.js @@ -1,4 +1,4 @@ -var cityPotentialRankingData = {cityPotentialRankingList:[]}; + Vue.component('city_potential_ranking',{ template:'
'+ @@ -203,25 +203,3 @@ Vue.component('city_potential_ranking',{ } }) -function reloadCityPotentialRanking(){ - axios.get("/rest/quotations/potentialUpTopInfos").then(function(response){ - list = response.data.data; - $(list).each(function(i){ - var index = this.index; - var totalHalfStar = Math.round(Math.round(index/5)/2) //总半星 - var starNum = Math.floor(totalHalfStar/2) //全星 - var halfStarNum = totalHalfStar%2 //半星 - var noneStarNum = 5-starNum-halfStarNum //空星 - this.starNum = starNum; - this.halfStarNum = halfStarNum; - this.noneStarNum = noneStarNum; - }) - cityPotentialRankingData.cityPotentialRankingList = response.data.data; - - - - - }).catch(function(error){ - console.log(error) - }) -} diff --git a/fangija-zsyf/views/component/myFocusComponent.js b/fangija-zsyf/views/component/myFocusComponent.js index 0eaf3ed..fd20e54 100644 --- a/fangija-zsyf/views/component/myFocusComponent.js +++ b/fangija-zsyf/views/component/myFocusComponent.js @@ -65,22 +65,3 @@ Vue.component('my_focus',{ } }) -function reloadMyFocus(){ - if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ - $("#myFocusFirstPage").hide() - $("#myFocus").hide(); - }else{ - axios.get("/rest/quotations/userCollectCityInfo").then(function(response){ - if(response.data.data.length==0){ - $("#myFocusFirstPage").hide(); - $("#myFocus").hide(); - }else{ - myFocusDatas.myFocusList = response.data.data; - $("#myFocus").show() - } - }).catch(function(error){ - console.log(error) - }) - } -} - diff --git a/fangija-zsyf/views/house/cityDetail.html b/fangija-zsyf/views/house/cityDetail.html index 08fadcc..cfda17a 100644 --- a/fangija-zsyf/views/house/cityDetail.html +++ b/fangija-zsyf/views/house/cityDetail.html @@ -153,6 +153,7 @@ var year = date.getFullYear()+'年'; var month = date.getMonth()+1+'月'; var city = "普洱" var cityInfoVue; + document.addEventListener('plusready', onPlusReady, false); function onPlusReady() { diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index cb51084..376aac9 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -1397,7 +1397,6 @@ $.config = {router: false} //加载首页全国数据 function loadAllCityData(){ - alert("全国"); var date=new Date; var year=date.getFullYear(); var month=date.getMonth()+1; @@ -1416,7 +1415,6 @@ function loadAllCityData(){ allCityVue.avgUownRate = response.data.data.avgUownRate; }) .catch(function (error) { - alert("error:"+error) console.log(error); }); @@ -1609,10 +1607,6 @@ function hotCity(city){ }); } -function IsInArray(arr, val){ -  var testStr=','+arr.join(",")+","; -  return testStr.indexOf(","+val+",")!=-1; -}