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

This commit is contained in:
raoyanhui
2018-04-14 18:27:22 +08:00
7 changed files with 71 additions and 40 deletions
+31 -3
View File
@@ -1,6 +1,33 @@
var ret = []
function loadMyCollectCity(){
plus.nativeUI.showWaiting();
axios.get("/rest/quotations/userCollectCitys",{}).then(function (response) {
var curDatas = response.data.data
if(curDatas && curDatas.length>0){
if(positionCity){
if(!IsInArray(curDatas, positionCity)){
curDatas.splice(0,0, positionCity)
}
}
cityDetaiVue.$data.citys = curDatas;
}else{
if(positionCity){
cityDetaiVue.$data.citys.push(positionCity);
}
$("#cityInfo").hide()
}
plus.nativeUI.closeWaiting();
}).catch(function (error) {
console.log(error);
});
}
function loadCurCity(city){
plus.nativeUI.showWaiting();
axios.get("/rest/quotations/userCollectCitys",{}).then(function (response) {
var curDatas = response.data.data
if(curDatas && curDatas.length>0){
@@ -10,7 +37,7 @@ function loadCurCity(city){
cityInfoVue.$data.collecd = false;
}
}
plus.nativeUI.closeWaiting();
}).catch(function (error) {
console.log(error);
});
@@ -478,8 +505,9 @@ function docollectCity(city){
}
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
//loadMyCollectCity();
$("a[href='#tabQuotation1']").click();
//plus.webview.getWebviewById('views/house/houseDetail.html').reload();
}else if(msg == "关注成功"){
cityInfoVue.$data.collecd = true;
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
@@ -51,7 +51,6 @@ Vue.component('city_increase_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") == ""){
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
@@ -60,6 +59,7 @@ Vue.component('city_increase_ranking',{
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)
})
@@ -70,6 +70,7 @@ Vue.component('city_increase_ranking',{
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus()
cityDetaiVue.$data.citys.push(city);
}).catch(function(error){
console.log(error)
})
@@ -90,7 +91,15 @@ Vue.component('city_increase_ranking',{
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus();
//plus.webview.getWebviewById('views/user/userInfo.html').reload()
//plus.webview.getWebviewById('views/user/userInfo.html').reload()
var da = cityDetaiVue.$data.citys
if(da && da.length>0){
var index = da.indexOf(city)
if(index>0){
da.splice(index, 1)
cityDetaiVue.$data.citys = da;
}
}
}).catch(function(error){
console.log(error)
})
@@ -69,15 +69,17 @@ 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");
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()
//cityDetaiVue.$data.citys.push(city);
}).catch(function(error){
console.log(error)
})
@@ -88,6 +90,7 @@ Vue.component('city_potential_ranking',{
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus()
cityDetaiVue.$data.citys.push(city);
//plus.webview.getWebviewById('views/user/userInfo.html').reload();
}).catch(function(error){
console.log(error)
@@ -100,6 +103,15 @@ Vue.component('city_potential_ranking',{
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus()
var da = cityDetaiVue.$data.citys
if(da && da.length>0){
var index = da.indexOf(city)
if(index>0){
da.splice(index, 1)
cityDetaiVue.$data.citys = da;
}
}
//plus.webview.getWebviewById('views/user/userInfo.html').reload();
}).catch(function(error){
console.log(error)
+8 -8
View File
@@ -47,35 +47,35 @@
</header>
<nav class="bar bar-tab">
<a class="tab-item external active" id="bus">
<span class="icon icon-around01"></span>
<span class="icon iconfont icon-around01"></span>
<span class="tab-label">公交</span>
</a>
<a class="tab-item external" id="subway">
<span class="icon icon-around02"></span>
<span class="icon iconfont icon-around02"></span>
<span class="tab-label">地铁</span>
</a>
<a class="tab-item external" id="school">
<span class="icon icon-around03"></span>
<span class="icon iconfont icon-around03"></span>
<span class="tab-label">学校</span>
</a>
<a class="tab-item external" id="hos">
<span class="icon icon-around04"></span>
<span class="icon iconfont icon-around04"></span>
<span class="tab-label">医院</span>
</a>
<a class="tab-item external" id="bank">
<span class="icon icon-around05"></span>
<span class="icon iconfont icon-around05"></span>
<span class="tab-label">银行</span>
</a>
<a class="tab-item external" id="supermark">
<span class="icon icon-around06"></span>
<span class="icon iconfont icon-around06"></span>
<span class="tab-label">购物</span>
</a>
<a class="tab-item external" id="hs">
<span class="icon icon-around07"></span>
<span class="icon iconfont icon-around07"></span>
<span class="tab-label">房屋</span>
</a>
<a class="tab-item external" id="id="xianwu"">
<span class="icon icon-around08"></span>
<span class="icon iconfont icon-around08"></span>
<span class="tab-label">嫌恶</span>
</a>
</nav>
+2
View File
@@ -521,6 +521,8 @@ function addManagement(id, houseStatus, liveStatus){
}).then(function (response) {
var status = response.data.status;
if(status){
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
$.toast("修改状态成功!");
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}else{
+5 -24
View File
@@ -1434,8 +1434,13 @@ $("a[href='#tabQuotation1'],a[href='#tabQuotation0']").click(function(){
$("#cityInfo").hide()
})
function clickCity(val){
city = val;
$("#cityInfo").show()
$("#tabCityDiv a").removeClass("active");
// $("a[href="+val+"]").addClass("active");
@@ -1535,30 +1540,6 @@ function hotCity(city){
}
function loadMyCollectCity(){
axios.get("/rest/quotations/userCollectCitys",{}).then(function (response) {
var curDatas = response.data.data
if(curDatas && curDatas.length>0){
if(positionCity){
if(!IsInArray(curDatas, positionCity)){
curDatas.splice(0,0, positionCity)
}
}
cityDetaiVue.$data.citys = curDatas;
}else{
if(positionCity){
cityDetaiVue.$data.citys.push(positionCity);
}
$("#cityInfo").hide()
}
}).catch(function (error) {
console.log(error);
});
}
</script>
+1 -2
View File
@@ -1740,7 +1740,7 @@ function addItems(number, lastIndex) {
'</div>';
}
if(dataObj[i].type=="推荐小区"){
html += '<div class="card cardInfo cardInfo02" onclick="openUrl(\''+BASE_PATH+'/district/details?city='+dataObj[i].recommendDistrictCity+'&region='+dataObj[i].recommendDistrictRegion+'&name='+dataObj[i].recommendDistrictName+'\')">'+
html += '<div class="card cardInfo cardInfo02" onclick="openDistWindow(\''+dataObj[i].recommendDistrictCity+'\',\''+dataObj[i].recommendDistrictRegion+'\',\''+dataObj[i].recommendDistrictName+'\')">'+
'<div class="card-content">'+
'<div class="list-block media-list"><ul><li class="item-content">'+
'<div class="item-media"><img src='+dataObj[i].coverImg+'></div>'+
@@ -2622,7 +2622,6 @@ function openIntelligentHouseView() {
}
function openDistWindow(city, region, name){
clicked('views/district/detail.html',true,false,{},{city:city,region:region,name:name});
}
</script>
<script>