Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts: fangija-zsyf/views/component/cityIncreaseRankingComponent.js fangija-zsyf/views/component/cityPotentialRankingComponent.js
This commit is contained in:
@@ -60,6 +60,7 @@ Vue.component('city_increase_ranking',{
|
||||
$(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();
|
||||
@@ -80,6 +81,7 @@ Vue.component('city_increase_ranking',{
|
||||
$(event.target).parent().children().removeClass("dn");
|
||||
$(event.target).addClass("dn");
|
||||
reloadMyFocus()
|
||||
reloadCityPotentialRanking()
|
||||
cityDetaiVue.$data.citys.push(city);
|
||||
}
|
||||
|
||||
@@ -103,6 +105,7 @@ Vue.component('city_increase_ranking',{
|
||||
$(event.target).parent().children().removeClass("dn");
|
||||
$(event.target).addClass("dn");
|
||||
reloadMyFocus();
|
||||
reloadCityPotentialRanking()
|
||||
//plus.webview.getWebviewById('views/user/userInfo.html').reload()
|
||||
var da = cityDetaiVue.$data.citys
|
||||
if(da && da.length>0){
|
||||
@@ -123,3 +126,11 @@ Vue.component('city_increase_ranking',{
|
||||
this.loadCityIncreaseRanking();
|
||||
}
|
||||
})
|
||||
|
||||
function reloadCityIncreaseRanking(){
|
||||
axios.get("/rest/quotations/markUpTopInfos").then(function(response){
|
||||
cityIncreaseRankingData.cityIncreaseRankingList = response.data.data;
|
||||
}).catch(function(error){
|
||||
console.log(error)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -79,11 +79,11 @@ Vue.component('city_potential_ranking',{
|
||||
}else{
|
||||
$(event.target).parent().children().removeClass("dn");
|
||||
$(event.target).addClass("dn");
|
||||
alert(city)
|
||||
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){
|
||||
@@ -100,6 +100,7 @@ Vue.component('city_potential_ranking',{
|
||||
$(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();
|
||||
}
|
||||
@@ -114,7 +115,7 @@ Vue.component('city_potential_ranking',{
|
||||
$(event.target).parent().children().removeClass("dn");
|
||||
$(event.target).addClass("dn");
|
||||
reloadMyFocus()
|
||||
|
||||
reloadCityIncreaseRanking()
|
||||
var da = cityDetaiVue.$data.citys
|
||||
if(da && da.length>0){
|
||||
var index = da.indexOf(city)
|
||||
@@ -132,4 +133,24 @@ Vue.component('city_potential_ranking',{
|
||||
mounted:function(){
|
||||
this.loadCityPotentialRanking();
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
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)
|
||||
})
|
||||
}
|
||||
@@ -136,7 +136,8 @@ $.config = {router: false}
|
||||
<script type="text/javascript" src="../../js/beacon_release.js"></script>
|
||||
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
|
||||
<script src="../../config.js"></script>
|
||||
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../config.js"></script>
|
||||
<script type="text/javascript" src="../../js/common.js" ></script>
|
||||
<script type="text/javascript" src="../../js/axios.min.js"></script>
|
||||
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
|
||||
|
||||
@@ -1235,6 +1235,7 @@ $.config = {router: false}
|
||||
<script type="text/javascript" src="../../js/light7-2.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/sm.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../config.js"></script>
|
||||
<script type="text/javascript" src="../../js/axios.min.js"></script>
|
||||
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
|
||||
|
||||
@@ -137,6 +137,7 @@ $.config = {router: false}
|
||||
<script type="text/javascript" src="../../js/vue.js"></script>
|
||||
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../config.js"></script>
|
||||
<script type='text/javascript' src='../../js/common.js' charset='utf-8'></script>
|
||||
<script type="text/javascript" src="../../js/axios.min.js"></script>
|
||||
|
||||
@@ -327,6 +327,13 @@
|
||||
<a href="#tabCity2" class="tab-link button">按城市等级</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="content-block content-block01 content dn" style="top:66px;z-index:100;" id="selectContainer">
|
||||
<div class="container" style="top:0;">
|
||||
<div class="city" style="width:100%;">
|
||||
<div class="city-list"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tabs">
|
||||
<div id="tabCity1" class="tab active">
|
||||
<div class="content-block content-block01 content">
|
||||
@@ -1199,6 +1206,7 @@ $.config = {router: false}
|
||||
<script type="text/javascript" src="../../js/vue.js"></script>
|
||||
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../config.js"></script>
|
||||
<script type='text/javascript' src='../../js/common.js' charset='utf-8'></script>
|
||||
<script type="text/javascript" src="../../js/axios.min.js"></script>
|
||||
@@ -1321,13 +1329,13 @@ $.config = {router: false}
|
||||
|
||||
/* 获取城市 */
|
||||
$(".popup-about01 .cityGPS").on("click", function () {
|
||||
$("#input_city").val($(this).find("p").text());
|
||||
//$("#input_city").val($(this).find("p").text());
|
||||
$(".cityChoice a").text($(this).find("p").text());
|
||||
$(".popup-about01 p").removeClass("active");
|
||||
addFocus($(this).find("p").text())
|
||||
});
|
||||
$(".popup-about01 p").on("click", function () {
|
||||
$("#input_city").val($(this).text());
|
||||
//$("#input_city").val($(this).text());
|
||||
$(".cityChoice a").text($(this).text());
|
||||
$(".popup-about01 p").removeClass("active");
|
||||
$(this).addClass("active");
|
||||
@@ -1340,6 +1348,42 @@ $.config = {router: false}
|
||||
});
|
||||
|
||||
loadMyCollectCity();
|
||||
|
||||
//城市选择
|
||||
//$("#cityCopy").html($('.tabs').html())
|
||||
var getAllCitys = function() {
|
||||
var list = new Array();
|
||||
$("#tabCity1 #cityContainer .city p").each(function(i, o) {
|
||||
list.push($(o).text());
|
||||
});
|
||||
return list;
|
||||
}
|
||||
|
||||
var search = function(){
|
||||
var city = $("#citySearchInp").val();
|
||||
$("#selectContainer .city-list").empty();
|
||||
$("#selectContainer").show();
|
||||
|
||||
var cityList = getAllCitys();
|
||||
for(var i=0;i<cityList.length;i++) {
|
||||
if(cityList[i].indexOf(city) != -1){
|
||||
$("#selectContainer .city-list").append('<p class="close-popup" onclick="addCityFocus(\''+cityList[i]+'\')">'+cityList[i]+'</p>');
|
||||
}
|
||||
}
|
||||
|
||||
if(city == ""){
|
||||
$("#selectContainer").hide();
|
||||
}
|
||||
}
|
||||
|
||||
$("#citySearchInp").bind('input propertychange keyup', function() {
|
||||
search();
|
||||
});
|
||||
|
||||
$("#citySearchInp").bind('keyup', function() {
|
||||
search();
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1393,10 +1437,14 @@ $.config = {router: false}
|
||||
|
||||
});
|
||||
|
||||
function addCityFocus(city){
|
||||
//city=city.replace("<i></i>","")
|
||||
//$("#input_city").text(city);
|
||||
addFocus(city);
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
<script>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1511,15 +1559,13 @@ function addFocus(city){
|
||||
|
||||
}else{
|
||||
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
|
||||
if(response.data.status){
|
||||
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();
|
||||
createData(city, myDatasVue.$data.cityDatas.length);
|
||||
} else {
|
||||
$.toast(response.data.message);
|
||||
}
|
||||
reloadMyFocus()
|
||||
reloadCityIncreaseRanking()
|
||||
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();
|
||||
createData(city, myDatasVue.$data.cityDatas.length);
|
||||
}).catch(function(error){
|
||||
console.log(error)
|
||||
})
|
||||
@@ -1529,6 +1575,8 @@ function addFocus(city){
|
||||
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
|
||||
if(response.data.status){
|
||||
reloadMyFocus()
|
||||
reloadCityIncreaseRanking()
|
||||
reloadCityPotentialRanking()
|
||||
cityDetaiVue.$data.citys.push(city);
|
||||
} else {
|
||||
$.toast(response.data.message);
|
||||
|
||||
@@ -93,6 +93,7 @@ $.config = {router: false}
|
||||
<script type="text/javascript" src="../../js/vue.js"></script>
|
||||
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../config.js"></script>
|
||||
<script type='text/javascript' src='../../js/common.js' charset='utf-8'></script>
|
||||
<script type="text/javascript" src="../../js/axios.min.js"></script>
|
||||
|
||||
@@ -116,6 +116,7 @@ $.config = {router: false}
|
||||
|
||||
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/vue.js"></script>
|
||||
<script src="../../config.js"></script>
|
||||
<script type="text/javascript" src="../../js/common.js" ></script>
|
||||
|
||||
@@ -83,6 +83,7 @@ $.config = {router: false}
|
||||
|
||||
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/common.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -204,6 +204,7 @@ $.config = {router: false}
|
||||
|
||||
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/common.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -79,6 +79,7 @@ $.config = {router: false}
|
||||
|
||||
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/vue.js" ></script>
|
||||
<script type="text/javascript" src="../../js/zepto.md5.js" ></script>
|
||||
<script type="text/javascript" src="../../config.js"></script>
|
||||
|
||||
@@ -87,6 +87,7 @@ $.config = {router: false}
|
||||
|
||||
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/vue.js" ></script>
|
||||
<script type="text/javascript" src="../../js/zepto.md5.js" ></script>
|
||||
<script type="text/javascript" src="../../config.js"></script>
|
||||
|
||||
@@ -77,6 +77,7 @@ $.config = {router: false}
|
||||
|
||||
<script type="text/javascript" src="../../js/light7.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/cn.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/mui.min.js" charset="utf-8"></script>
|
||||
<script type="text/javascript" src="../../js/vue.js" ></script>
|
||||
<script type="text/javascript" src="../../js/zepto.md5.js" ></script>
|
||||
<script type="text/javascript" src="../../config.js"></script>
|
||||
|
||||
Reference in New Issue
Block a user