Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1

This commit is contained in:
xuhe@fangjia.com
2018-04-13 13:07:49 +08:00
5 changed files with 104 additions and 34 deletions
@@ -16,7 +16,7 @@ Vue.component('city_increase_ranking',{
'</div>'+
'</a>'+
'</li>'+
'<li v-for="(ci,index) in cityIncreaseRankingList">'+
'<li v-for="(ci,index) in cityIncreaseRankingList" :key="ci.city">'+
'<a class="item-content">'+
'<div class="item-inner">'+
'<div class="item-subtitle row">'+
@@ -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(){
@@ -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)
})
@@ -63,4 +63,23 @@ Vue.component('my_focus',{
},mounted:function(){
this.loadMyFocus();
}
})
})
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)
})
}
}
@@ -61,7 +61,7 @@
</div>
<div class="card-footer">
<span>
<em><strong>{{percentage_30}}</strong>%<i v-bind:class="arrow"></i></em>
<em><strong>{{percentage_30}}</strong>{{p}}<i v-bind:class="arrow"></i></em>
<label>近30天涨跌幅</label>
</span>
<span>
@@ -165,7 +165,8 @@ $.config = {router: false}
city:"",
compare_word:"",
compare_money:"",
words:""
words:"",
p:""
}
})
// var evaluate_msg = new Vue({
@@ -227,9 +228,11 @@ $.config = {router: false}
if(h.oneMonthUpDownRange<0){
house_price.arrow="icon icon-arrow-green"
house_price.percentage_30=-h.oneMonthUpDownRange
house_price.p = "%"
}else if(h.oneMonthUpDownRange>0){
house_price.arrow="icon icon-arrow-red"
house_price.percentage_30=h.oneMonthUpDownRange
house_price.p = "%"
}else{
house_price.percentage_30="暂无"
}
+18 -7
View File
@@ -1467,13 +1467,24 @@ function markFocus(){
}
function addFocus(city){
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
createData(city, myDatasVue.$data.cityDatas.length);
}).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){
reloadMyFocus()
createData(city, myDatasVue.$data.cityDatas.length);
}).catch(function(error){
console.log(error)
})
}
}
</script>