diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 2abd5c9..4e04bd9 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -3,8 +3,8 @@ //var BASE_PATH = "http://192.168.10.47:8086"; //var BASE_PATH = "http://192.168.10.161:8084"; //var BASE_PATH = "http://192.168.10.47:8086"; -//var BASE_PATH = "http://192.168.10.161:8084"; -var BASE_PATH = "http://192.168.10.53:8084"; +var BASE_PATH = "http://192.168.10.161:8084"; +//var BASE_PATH = "http://192.168.10.53:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; /**是否显示过启动页面**/ var lauchFlag = false; \ No newline at end of file diff --git a/fangija-zsyf/js/axiosPlugin.js b/fangija-zsyf/js/axiosPlugin.js index 8bfca8b..3d46b8e 100644 --- a/fangija-zsyf/js/axiosPlugin.js +++ b/fangija-zsyf/js/axiosPlugin.js @@ -4,7 +4,7 @@ axios.defaults.headers.post['Content-Type'] = 'application/json'; // 添加请求拦截器 axios.interceptors.request.use(function (config) { var token = localStorage.getItem("user_token"); - config.headers.Authorization = token + config.headers.Authorization = token; return config; }, function (error) { return Promise.reject(error); diff --git a/fangija-zsyf/js/district/district-map.js b/fangija-zsyf/js/district/district-map.js index 5325661..27fab72 100644 --- a/fangija-zsyf/js/district/district-map.js +++ b/fangija-zsyf/js/district/district-map.js @@ -74,7 +74,7 @@ var mapConfig = { /* 打开银行、餐饮等tab大类*/ $('.bar,#aroundLink').on('click', 'a', function () { var $this = $(this); - //$this.addClass('current').siblings().removeClass('current'); + $this.addClass('active').siblings().removeClass('active'); var id = $this.attr('id'); that.hidden_all_mark() that.openTypeWrap(id); diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index 6a4c5c0..1835556 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -33,7 +33,7 @@ function addCollect(){ $(".collection02").show(); $.toast("随时掌握小区动态"); } - + plus.webview.getWebviewById('/views/user/userInfo.html').reload(); }) .catch(function (error) { console.log(error); @@ -65,7 +65,7 @@ function removeCollect(){ $(".collection01").show(); $.toast("取消关注"); } - + plus.webview.getWebviewById('/views/user/userInfo.html').reload(); }) .catch(function (error) { console.log(error); @@ -714,21 +714,16 @@ function loadRentTrends(city, region, name){ } }).then(function (response) { var re = response.data.data - - var categories = new Array(); var series = new Array(); - var m = re.times; var pm = re.distMap var rooms = re.rooms; - if(m && rooms.length>0){ for(var i=0;i'+ + ''+ '
'+ '
'+ '
'+this.name+'
'+ diff --git a/fangija-zsyf/js/user/myHouse.js b/fangija-zsyf/js/user/myHouse.js index 914dfc1..8f5f0bf 100644 --- a/fangija-zsyf/js/user/myHouse.js +++ b/fangija-zsyf/js/user/myHouse.js @@ -79,7 +79,7 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, tempTotalPricePercent = (parseFloat(tempTotalPrice)*0.7/10000).toFixed(2); tempTotalPrice = (parseFloat(tempTotalPrice)/10000).toFixed(2); } - html += "
  • "; + html += '
  • '; html += "
    "; html += "
    "+result.name+" "+tempTotalPrice+"万"+result.liveStatus+"
    "; html += "
    "; diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index f06e113..d8b62d5 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -1544,7 +1544,8 @@ "views/news/newsDetail.html", "error.html", "views/rent/rent.html", - "views/district/detail.html" + "views/district/detail.html", + "views/house/houseList.html" ], "priority": 0 }, @@ -1613,7 +1614,10 @@ "images/topBg.png", "images/icon-set.png" ], - "refer": [], + "refer": [ + "views/user/passLogin.html", + "views/district/detail.html" + ], "priority": 0 }, "views/evaluate/evaluateList.html": { @@ -1635,6 +1639,29 @@ ], "refer": [], "priority": 0 + }, + "views/user/passLogin.html": { + "resources": [], + "refer": [ + "views/user/bindingMobile.html", + "views/user/codeSms.html" + ], + "priority": 0 + }, + "views/house/houseList.html": { + "resources": [], + "refer": [ + "views/house/add.html", + "views/house/detail.html" + ], + "priority": 0 + }, + "views/house/add.html": { + "resources": [], + "refer": [ + "views/evaluate/evaluateReport.html" + ], + "priority": 0 } }, "idle": { diff --git a/fangija-zsyf/views/component/myFocusComponent.js b/fangija-zsyf/views/component/myFocusComponent.js index 551a754..5edb81d 100644 --- a/fangija-zsyf/views/component/myFocusComponent.js +++ b/fangija-zsyf/views/component/myFocusComponent.js @@ -63,5 +63,4 @@ Vue.component('my_focus',{ },mounted:function(){ this.loadMyFocus(); } - }) \ No newline at end of file diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index 16db67f..f49b153 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -3,7 +3,7 @@ - +房产分析 @@ -83,19 +83,19 @@
    -
    + +
    出租管理
    -
    @@ -296,6 +296,9 @@ var lng; var city; var region; var name; +var oriCity; +var oriRegion; +var oriName; //扩展API加载完毕,现在可以正常调用扩展API function onPlusReady(){ var self = plus.webview.currentWebview(); @@ -344,9 +347,9 @@ function init(){ var houseInfo = response.data.data.houseInfo; lat = houseInfo.lat; lng = houseInfo.lng; - city = houseInfo.city; - region = houseInfo.region; - name = houseInfo.name; + oriCity = houseInfo.city; + oriRegion = houseInfo.region; + oriName = houseInfo.name; address = houseInfo.address; var text = houseInfo.name; var length = text.length; @@ -359,6 +362,9 @@ function init(){ if(response.data.data.rentRooms){ rentRooms = response.data.data.rentRooms; } + city = houseInfo.city; + region = houseInfo.region; + name = houseInfo.name; baseInfo.id=houseInfo.id; baseInfo.city = houseInfo.city; baseInfo.name = houseInfo.name; @@ -482,12 +488,6 @@ $("#trendTabDiv .button").on("click", function () { $(this).parent().children().removeClass("active"); $(this).addClass("active"); }); -$("#trendDiv2").on("click", function () { - $("#trendDiv2 a").removeClass("active") - $(this).addClass("active") - //alert() - loadRentTrends(city, region, name); -}); /* 图表切换 */ $("#tabAvgDiv").on("click", function () { $("#tabChart1").css("z-index","1"); @@ -497,6 +497,10 @@ $("#tabRentDiv").on("click", function () { $("#tabChart2").css("z-index","1"); $("#tabChart1").css("z-index","-1"); }); +function openNewView(viewHtml) { + alert(viewHtml) + clicked(viewHtml,true,false,{},{city:oriCity,region:oriRegion,name:oriName}) +} diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index ba0084d..3bfe6c3 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -370,9 +370,24 @@ $.config = {router: false} var cityChoose = new Vue({ el:"#cityChoose", data:{ - city:city + city:'' } }) + plus.geolocation.getCurrentPosition(function(p){ + //province = p.address.province; + var cityStr = p.address.city; + if(cityStr){ + cityChoose.city = cityStr.endsWith("市")?cityStr.substring(0,cityStr.length-1):cityStr; + } + //region = p.address.district; + }, function(e){ + }, + { + provider:'baidu', + enableHighAccuracy:true, + coordsType:'bd09ll' + } + ); /* 关注&已关注切换 */ $(".collection01").on("click", function () { $(this).hide(); @@ -421,6 +436,7 @@ $.config = {router: false} $("#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()); @@ -575,7 +591,6 @@ function markFocus(){ function addFocus(city){ axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ - //reloadMyFocus() }).catch(function(error){ console.log(error) }) diff --git a/fangija-zsyf/views/house/houseList.html b/fangija-zsyf/views/house/houseList.html index da795e6..9c7ab5c 100644 --- a/fangija-zsyf/views/house/houseList.html +++ b/fangija-zsyf/views/house/houseList.html @@ -93,6 +93,30 @@
    + + + - \ No newline at end of file diff --git a/fangija-zsyf/views/setting/setting.html b/fangija-zsyf/views/setting/setting.html index 188c460..d520c2d 100644 --- a/fangija-zsyf/views/setting/setting.html +++ b/fangija-zsyf/views/setting/setting.html @@ -26,9 +26,18 @@

    管理设置

    -
    + @@ -62,20 +74,40 @@ Zepto = $ $.config = {router: false} - - + + + + diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index f66dc9a..b3d8722 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -41,7 +41,7 @@ - @@ -110,7 +110,7 @@ - @@ -275,6 +275,9 @@ function checkIsLogin(){ $('#page-group-login').hide(); $('#page-group-nologin').show(); }else{ + //控制显示 + $('#page-group-nologin').hide(); + $('#page-group-login').show(); //加载个人信息 selectUserInfo(); //加载我的关注 @@ -283,9 +286,6 @@ function checkIsLogin(){ selectHouseInfoList(); //加载我的收藏 selectNewsCollectList(); - //控制显示 - $('#page-group-nologin').hide(); - $('#page-group-login').show(); } } @@ -301,10 +301,22 @@ function gotoUpdatePass(){ clicked('/views/user/updatePass.html',true,false,{},{},function(){}) } -//调整房产申请贷款 +//跳转房产申请贷款 function gotoLoanApply(houseId, city){ clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: city, mobile: _mobile},function(){}) } +//跳转到小区详情 +function gotoDistrictDetail(city,region,name){ + alert(city) + alert(region) + alert(name) + clicked('/views/district/detail.html',true,false,{},{city:city,region:region,name:name},function(){}) +} +//跳转房产详情 +function gotoHouseDetail(id){ + clicked('/views/house/detail.html',true,false,{},{houseId:id},function(){ + }) +} //注册'infinite'事件处理函数 $(document).on('infinite', '.infinite-scroll',function() { @@ -401,6 +413,11 @@ function selectUserInfo(){ }); } +function openSettingPage() { + clicked('../setting/setting.html',true,false,{},{},function(){ + checkIsLogin(); + }) +} $(document).ready(function () { checkIsLogin(); }); diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index ad60cd9..a2a4444 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -1504,7 +1504,7 @@ function initNearDistricts(cityParam,latParam,lngParam,regionParam,order,minPric textStr = textName.substr(0,5)+ "..."; } - html += '
    '+ + html += '
    '+ textStr+ '
    '+response.data.data.dtos[i].avgPrice+'元/㎡
    ';