Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
This commit is contained in:
@@ -21,6 +21,8 @@ axios.interceptors.response.use(function (response) {
|
||||
window.location.reload();
|
||||
})
|
||||
}else{
|
||||
$(".loadingBg").hide();
|
||||
plus.nativeUI.closeWaiting();
|
||||
plus.webview.getWebviewById("error.html").show();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -156,7 +156,7 @@ function addManagement(id, houseStatus, liveStatus){
|
||||
$('.loadingBgDiv').show();
|
||||
checkIsLogin();
|
||||
plus.webview.getWebviewById('views/user/userInfo.html').reload();
|
||||
plus.webview.getWebviewById('yfindex.html').reload();
|
||||
//plus.webview.getWebviewById('yfindex.html').reload();
|
||||
}else{
|
||||
$.toast(response.data.message);
|
||||
}
|
||||
|
||||
@@ -106,7 +106,7 @@ mui.init({
|
||||
});
|
||||
|
||||
function logout() {
|
||||
plus.webview.getWebviewById('yfindex.html').reload();
|
||||
//plus.webview.getWebviewById('yfindex.html').reload();
|
||||
localStorage.removeItem("user_token");
|
||||
localStorage.removeItem("user_token_add_time");
|
||||
//退出登录之前loading下个人中心
|
||||
|
||||
@@ -290,7 +290,7 @@ function checkIsLogin(){
|
||||
function gotoLogin(){
|
||||
clicked('/views/user/codeSms.html',true,false,{},{},function(){
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
plus.webview.getWebviewById('yfindex.html').reload();
|
||||
//plus.webview.getWebviewById('yfindex.html').reload();
|
||||
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
|
||||
checkIsLogin();
|
||||
})
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="content infinite-scroll infinite-scroll-bottom pstion" data-distance="50">
|
||||
<div class="card cardPrice" id="baseInfo">
|
||||
<div class="card cardPrice" id="baseInfo" v-cloak>
|
||||
<div class="card-header">
|
||||
<span>{{topMonth}}月份均价</span>
|
||||
<span>
|
||||
@@ -87,10 +87,10 @@
|
||||
<i class="icon icon-home01"></i>
|
||||
<span>房产管理</span>
|
||||
</div>
|
||||
<div onclick="openNewView('views/house/houseList.html')" id="detailHouseDiv">
|
||||
<!--<div onclick="openNewView('views/house/houseList.html')" id="detailHouseDiv">
|
||||
<i class="icon icon-home01"></i>
|
||||
<span>我的房产</span>
|
||||
</div>
|
||||
</div>-->
|
||||
<div onclick="openNewView('views/intelligentHouse/index.html')">
|
||||
<i class="icon icon-home02"></i>
|
||||
<span>智能选房</span>
|
||||
@@ -1203,6 +1203,7 @@ var oriCity = "";
|
||||
var oriLat = 0;
|
||||
var oriLng = 0;
|
||||
var region = "";
|
||||
var oriRegion = "";
|
||||
var scoreCount = 0;
|
||||
var lat = 0;
|
||||
var lng = 0;
|
||||
@@ -1214,7 +1215,8 @@ document.addEventListener('plusready', onPlusReady, false);
|
||||
function onPlusReady(){
|
||||
getPosition();
|
||||
versionUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
// 获取当前用户位置
|
||||
function getPosition(){
|
||||
plus.geolocation.getCurrentPosition(function(p){
|
||||
@@ -1237,6 +1239,7 @@ function getPosition(){
|
||||
if(region.endWith("区")){
|
||||
region = region.substring(0, region.length-1);
|
||||
}
|
||||
oriRegion = region;
|
||||
oriCity = city;
|
||||
$("#input_city").text(city);
|
||||
}
|
||||
@@ -1353,14 +1356,14 @@ function initBaseInfo(city,region,address,lat,lng){
|
||||
}
|
||||
baseInfo.isLogin = response.data.data.isLogin;
|
||||
|
||||
if(response.data.data.isLogin){
|
||||
/*if(response.data.data.isLogin){
|
||||
$("#addHouseDiv").hide();
|
||||
$("#detailHouseDiv").show();
|
||||
}else{
|
||||
$("#addHouseDiv").show();
|
||||
$("#detailHouseDiv").hide();
|
||||
}
|
||||
|
||||
localStorage.setItem("isLogin", response.data.data.isLogin);*/
|
||||
if(response.data.data.momRateType>0){
|
||||
$("#momRateTypeClass").removeClass("icon-arrow-green");
|
||||
$("#momRateTypeClass").addClass("icon-arrow-red");
|
||||
@@ -2127,6 +2130,9 @@ function changeCity(cityStr){
|
||||
var sort = 1;
|
||||
city = cityStr
|
||||
if(oriCity== cityStr){
|
||||
if(oriRegion!=""){
|
||||
$("#region").text(oriRegion);
|
||||
}
|
||||
lat = oriLat;
|
||||
lng = oriLng;
|
||||
if(cityStr=="上海"){
|
||||
@@ -2654,6 +2660,7 @@ $("body").delegate("#hotList ul li", "click", function () {
|
||||
//var url = '../district/details?city='+select_city+"®ion="+select_region+"&name="+select_name;
|
||||
//clicked(url, true);
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
Reference in New Issue
Block a user