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

This commit is contained in:
zongzhimin
2018-04-16 16:29:34 +08:00
7 changed files with 65 additions and 34 deletions
+1 -1
View File
@@ -105,7 +105,7 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap,
if(!isNaN(xqPotentialIndexValue)){
//涨跌幅大于零
if(parseInt(xqPotentialIndexValue)>=50){
html += "<div>下跌概率: <em class='up'>"+xqPotentialIndexValue+"%<i class='icon icon-arrow-red'></i></em></div>";
html += "<div>上涨概率: <em class='up'>"+xqPotentialIndexValue+"%<i class='icon icon-arrow-red'></i></em></div>";
}else{
html += "<div>下跌概率: <em class='down'>"+(parseInt(100)-parseInt(xqPotentialIndexValue))+"%<i class='icon icon-arrow-green'></i></em></div>";
}
@@ -53,13 +53,19 @@ Vue.component('city_increase_ranking',{
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()
reloadCityPotentialRanking()
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
$.toast(msg);
}else{
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus()
reloadCityPotentialRanking()
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
//cityDetaiVue.$data.citys.push(city);
}).catch(function(error){
console.log(error)
@@ -68,11 +74,17 @@ Vue.component('city_increase_ranking',{
})
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus()
reloadCityPotentialRanking()
cityDetaiVue.$data.citys.push(city);
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
$.toast(msg);
}else{
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus()
reloadCityPotentialRanking()
cityDetaiVue.$data.citys.push(city);
}
}).catch(function(error){
console.log(error)
})
@@ -69,16 +69,23 @@ Vue.component('city_potential_ranking',{
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") == ""){
alert("rrrr")
}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()
reloadCityIncreaseRanking()
//cityDetaiVue.$data.citys.push(city);
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
$.toast(msg);
}else{
$(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()
reloadCityIncreaseRanking()
//cityDetaiVue.$data.citys.push(city);
}
}).catch(function(error){
console.log(error)
})
@@ -86,12 +93,17 @@ Vue.component('city_potential_ranking',{
})
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus()
reloadCityIncreaseRanking()
cityDetaiVue.$data.citys.push(city);
//plus.webview.getWebviewById('views/user/userInfo.html').reload();
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
$.toast(msg);
}else{
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus()
reloadCityIncreaseRanking()
cityDetaiVue.$data.citys.push(city);
//plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
}).catch(function(error){
console.log(error)
})
@@ -141,4 +153,4 @@ function reloadCityPotentialRanking(){
}).catch(function(error){
console.log(error)
})
}
}
+1 -1
View File
@@ -38,7 +38,7 @@
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
<div class="card-header">
<label>{{myCityMap.city}}</label>
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city)">取消关注</a>
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city)">取消关注</a>
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city)">关注</a>
</div>
+1 -1
View File
@@ -348,7 +348,7 @@ function addItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, xq
if(!isNaN(xqPotentialIndexValue)){
//涨跌幅大于零
if(parseInt(xqPotentialIndexValue)>=50){
html += "<div>下跌概率: <em class='up'>"+xqPotentialIndexValue+"%<i class='icon icon-arrow-red'></i></em></div>";
html += "<div>上涨概率: <em class='up'>"+xqPotentialIndexValue+"%<i class='icon icon-arrow-red'></i></em></div>";
}else{
html += "<div>下跌概率: <em class='down'>"+(parseInt(100)-parseInt(xqPotentialIndexValue))+"%<i class='icon icon-arrow-green'></i></em></div>";
}
@@ -246,8 +246,8 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
var cityAvgPriceKey = result.city;
//取得对应城市的value
var cityAvgPriceValue = cityAvgPriceMap[cityAvgPriceKey];
if(!isNaN(cityAvgPriceValue)){
if(parseInt(cityAvgPriceValue)>=parseInt(result.price)){
if(!isNaN(cityAvgPriceValue) && result.price>0){
if(parseInt(cityAvgPriceValue)>parseInt(result.price)){
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='down'>低"+(parseInt(cityAvgPriceValue)-parseInt(result.price))+"元</em></div>";
}else{
htmlContent = htmlContent + "<div>相比"+result.city+"均价: <em class='up'>高"+(parseInt(result.price)-parseInt(cityAvgPriceValue))+"元</em></div>";
+9 -2
View File
@@ -291,12 +291,19 @@ function addItems(number, lastIndex) {
html = html + "<div class='item-inner'>";
var name = "游客"
var name = null;
if(vo.wxName){
name = vo.wxName
}else if(vo.name){
}
if(name == null){
name = vo.name
}
if(name == null){
name = vo.mobile
}
if(name == null){
name = "游客"
}
html = html + "<div class='item-title-row'>"+
"<div class='item-title'>"+name+"</div>"+
"<div class='item-after'><span data-cid='"+vo.id+"'><i class='icon icon-praise-grey01'></i><label>"+numberConver(vo.praiseCount)+"</label></span></div>"+