diff --git a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js index 7740940..53c55ff 100644 --- a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js +++ b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js @@ -16,7 +16,7 @@ Vue.component('city_increase_ranking',{ ''+ ''+ ''+ - '
  • '+ + '
  • '+ ''+ '
    '+ '
    '+ @@ -41,29 +41,53 @@ Vue.component('city_increase_ranking',{ }, methods:{ loadCityIncreaseRanking:function(){ - axios.get("/rest/quotations/potentialUpTopInfos").then(function(response){ + axios.get("/rest/quotations/markUpTopInfos").then(function(response){ cityIncreaseRankingData.cityIncreaseRankingList = response.data.data; }).catch(function(error){ console.log(error) }) }, follow:function(city,event){ - 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/user/userInfo.html').reload() - }).catch(function(error){ - console.log(error) - }) + 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{ + } + }) + }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/user/userInfo.html').reload() + }).catch(function(error){ + console.log(error) + }) + } + }, abolish:function(city,event){ - 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/user/userInfo.html').reload() - }).catch(function(error){ - console.log(error) - }) + if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ + clicked('/views/user/passLogin.html',true,false,{},{},function(){ + if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ + + }else{ + + } + }) + }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/user/userInfo.html').reload() + }).catch(function(error){ + console.log(error) + }) + } + } }, mounted:function(){ diff --git a/fangija-zsyf/views/component/cityPotentialRankingComponent.js b/fangija-zsyf/views/component/cityPotentialRankingComponent.js index 4322962..5acd4f8 100644 --- a/fangija-zsyf/views/component/cityPotentialRankingComponent.js +++ b/fangija-zsyf/views/component/cityPotentialRankingComponent.js @@ -66,19 +66,32 @@ Vue.component('city_potential_ranking',{ }) }, follow:function(city,event){ - 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/user/userInfo.html').reload(); - }).catch(function(error){ - console.log(error) - }) + 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{ + } + }) + }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/user/userInfo.html').reload(); + }).catch(function(error){ + console.log(error) + }) + } + }, abolish:function(city,event){ 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/user/userInfo.html').reload(); + reloadMyFocus() + //plus.webview.getWebviewById('views/user/userInfo.html').reload(); }).catch(function(error){ console.log(error) }) diff --git a/fangija-zsyf/views/component/myFocusComponent.js b/fangija-zsyf/views/component/myFocusComponent.js index 5edb81d..a52a058 100644 --- a/fangija-zsyf/views/component/myFocusComponent.js +++ b/fangija-zsyf/views/component/myFocusComponent.js @@ -63,4 +63,23 @@ Vue.component('my_focus',{ },mounted:function(){ this.loadMyFocus(); } -}) \ No newline at end of file +}) + +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; + } + }).catch(function(error){ + console.log(error) + }) + } +} + diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index d24f535..e36b04c 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -61,7 +61,7 @@