diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index a025979..93f7615 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -12,6 +12,7 @@ em{font-style:normal;color:#333;} em.up{color:#EB5F34;} em.down{color:#88D053;} */ +::../../images{display:none;} .dn{display:none;} .di{display:inline;} @@ -450,7 +451,6 @@ input::-webkit-input-placeholder{ .cardNearbyName{margin-top:0;margin-bottom:0;padding-bottom:0.3rem;} .cardNearbyName span{font-size:0.75rem;} .cardNearbyBox{width:100%;background:#f3f3f3;overflow-x:auto;} -.cardNearbyBox::-webkit-scrollbar{display:none;} .cardNearbyWin{width:22.5rem;margin-left:0.25rem;overflow:hidden;} .cardNearby{width:6.75rem;border-radius:0.16rem;float:left;margin-right:0;color:#333;} .cardNearby div{padding-top:0;padding-bottom:0;} @@ -459,14 +459,13 @@ input::-webkit-input-placeholder{ .cardNearby .card-footer{font-size:0.65rem;color:#999;min-height:1.5rem;margin-top:-0.2rem;} .cardNearbyBox01{background:none;margin-top:-0.5rem;} -.cardNearbyBox01 .cardNearbyWin{margin-bottom:0.25rem;} +.cardNearbyBox01 .cardNearby../../images{margin-bottom:0.25rem;} .cardNearbyBox01 .cardNearby{border:solid 1px #e7e7e7;} .cardNearbyBox01 .cardNearby .card-header{padding-top:0.25rem;line-height:1.2rem;} .arrow-up{font-size:0;line-height:0;border-width:10px;border-color:#f3f3f3;border-top-width:0;border-style:dashed;border-bottom-style:solid;border-left-color:transparent;border-right-color:transparent;position:absolute;bottom:0;left:16%;} .cardRentBox{width:100%;background:#fff;overflow-x:auto;border-bottom:solid 1px #e7e7e7;} -.cardRentBox::-webkit-scrollbar{display:none;} .cardRentWin{width:25rem;overflow:hidden;margin-left:0.75rem;border-left:solid 1px #e7e7e7;} .cardRent{border-radius:0;border-right:solid 1px #e7e7e7;box-shadow:none;float:left;margin:0;} .cardRent .card-content-inner{font-size:0.7rem;color:#EB5F34;padding:0.5rem 0.75rem;} @@ -1146,6 +1145,10 @@ input::-webkit-input-placeholder{ .tabs .noData img{width:30%;margin:0 auto;margin-top:3rem;} +.topic .topicContent.homeBox{overflow-x:auto;} +.topic .topicContent .topicContent_center.homeWin{width:540px;overflow:hidden;} +.topic .topicContent .topicContent_center.homeWin div{width:90px;} + /* 出错页面 */ .contentError{padding-top:30%;} .contentError img{width:30%;margin:0 auto;} diff --git a/fangija-zsyf/error.html b/fangija-zsyf/error.html index 99284f4..49cc90f 100644 --- a/fangija-zsyf/error.html +++ b/fangija-zsyf/error.html @@ -36,7 +36,10 @@ 网络加载异常
请返回重试或检查网络设置
diff --git a/fangija-zsyf/img/default_share.png b/fangija-zsyf/img/default_share.png index a93105d..aa06ca6 100644 Binary files a/fangija-zsyf/img/default_share.png and b/fangija-zsyf/img/default_share.png differ diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index 4987baf..b565f64 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -12,9 +12,17 @@ var mapLoadCount = 0; function doAddCollect(){ if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ - plus.webview.getWebviewById('views/user/userInfo.html').reload(); - plus.webview.getWebviewById('views/house/houseDetail.html').reload(); - plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) { + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + } + + if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) { + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + } + + if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){ + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + } doAddCollect(); }) return; @@ -32,7 +40,9 @@ function addCollect(){ $(".collection01").hide(); $(".collection02").show(); $.toast("随时掌握小区动态"); - plus.webview.getWebviewById('views/user/userInfo.html').reload(); + if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){ + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + } } }) @@ -49,7 +59,9 @@ function doRemoveCollect(){ if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ doRemoveCollect(); - plus.webview.getWebviewById('views/user/userInfo.html').reload(); + if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){ + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + } }) return; } else { @@ -67,9 +79,14 @@ function removeCollect(){ $(".collection01").show(); $.toast("取消关注"); } - plus.webview.getWebviewById('views/user/userInfo.html').reload(); + if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) { + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + } + + if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){ + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + } plus.webview.getWebviewById('yfindex.html').reload(); - plus.webview.getWebviewById('views/house/houseManageList.html').reload(); }) .catch(function (error) { console.log(error); @@ -77,20 +94,21 @@ function removeCollect(){ } +//图表 初始化 function inintChart(){ + var type = $("#trendDiv1 a.active").attr("t-v"); /* 小区均价分析 */ - loadLineData(city, region, name, 6) + loadLineData(city, region, name, type) /* 小区租金走势 */ loadRentTrends(city, region, name,2); } -function clickLineChart(e){ - $("#trendDiv1 a").removeClass("active") - $(e).addClass("active") +function clickLineChart(type){ + if(mode == "kLine"){ - loadKLineData(city, region, name); + loadKLineData(city, region, name, type) }else if(mode == "line"){ - loadLineData(city, region, name); + loadLineData(city, region, name, type); } } @@ -102,7 +120,8 @@ function lineChart() { $(".icon-chart01").show(); $("#chart01a").css("z-index","-1"); $("#chart01").css("z-index","1"); - loadKLineData(city, region, name); + var type = $("#trendDiv1 a.active").attr("t-v"); + loadKLineData(city, region, name, type); } function kLineChart() { mode = "line" @@ -110,7 +129,8 @@ function kLineChart() { $(".icon-chart01a").show(); $("#chart01").css("z-index","-1"); $("#chart01a").css("z-index","1"); - + var type = $("#trendDiv1 a.active").attr("t-v"); + loadLineData(city, region, name, type); }; @@ -127,9 +147,41 @@ function showLoadRentTrends(type) { } -function loadKLineData(city, region, name){ - var type = $("#trendDiv1 a.active").attr("t-v"); - axios.get("/rest/trend/kData", { +function loadKLineData(city, region, name, type){ + if(type == "36"){ + if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { + clicked('../user/codeSms.html',true,false,{},{},function(){ + + if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ + + }else{ + $("#trendDiv1 a").removeClass("active") + $("a[t-v='36']").addClass("active") + doLoadKLineData(city, region, name, type) + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + } + }) + return; + } else { + $("#trendDiv1 a").removeClass("active") + $("a[t-v='36']").addClass("active") + doLoadKLineData(city, region, name, type) + } + }else{ + $("#trendDiv1 a").removeClass("active") + if(type == 12){ + $("a[t-v='12']").addClass("active") + }else{ + $("a[t-v='6']").addClass("active") + } + doLoadKLineData(city, region, name, type) + } +} + +function doLoadKLineData(city, region, name, type){ + axios.get("/rest/trend/kData", { params: { city: city, region:region, @@ -178,9 +230,17 @@ function showTrends(v){ if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ showTrends(v); - plus.webview.getWebviewById('views/user/userInfo.html').reload(); - plus.webview.getWebviewById('views/house/houseDetail.html').reload(); - plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) { + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + } + + if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) { + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + } + + if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){ + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + } }) return; } else { @@ -522,6 +582,7 @@ function showRentChart2(categories, series, roomDatas){ }, yAxis: { type: 'value', + scale: true, axisLine: { lineStyle: { color: '#ccc' @@ -611,8 +672,42 @@ myChart03.setOption(option03,true); //曲线图 -function loadLineData(city, region, name){ - var type = $("#trendDiv1 a.active").attr("t-v"); +function loadLineData(city, region, name, type){ + //var type = $("#trendDiv1 a.active").attr("t-v"); + if(type == "36"){ + if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { + clicked('../user/codeSms.html',true,false,{},{},function(){ + + if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ + + }else{ + $("#trendDiv1 a").removeClass("active") + $("a[t-v='36']").addClass("active") + doLoadLineData(city, region, name, type) + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + } + }) + return; + } else { + $("#trendDiv1 a").removeClass("active") + $("a[t-v='36']").addClass("active") + doLoadLineData(city, region, name, type) + } + }else{ + $("#trendDiv1 a").removeClass("active") + if(type == 12){ + $("a[t-v='12']").addClass("active") + }else{ + $("a[t-v='6']").addClass("active") + } + doLoadLineData(city, region, name, type) + } + +} + +function doLoadLineData(city, region, name, type){ axios.get("/rest/trend/distTrends", { params: { city: city, @@ -639,11 +734,7 @@ function loadLineData(city, region, name){ //option01b.xAxis.data = times //option01b.series.data = districtTrends - showLineChart(times, districtTrends); - - - } }).catch(function (error) { console.log(error); diff --git a/fangija-zsyf/js/log/log_stat.js b/fangija-zsyf/js/log/log_stat.js index 798e7a6..5a44596 100644 --- a/fangija-zsyf/js/log/log_stat.js +++ b/fangija-zsyf/js/log/log_stat.js @@ -39,3 +39,36 @@ function doSavePageLog(data) { console.log(error); }); } + + +/** + * 记录用户行为日志 + */ +function saveBehaviorLog(event,dataMap) { + var page = document.getElementsByTagName("title")[0].innerHTML; + var device = plus.device.uuid; + var model = plus.device.model; + plus.geolocation.getCurrentPosition(function(p){ + baidu_city = p.address.city; + baidu_lng = p.coords.longitude; + baidu_lat = p.coords.latitude; + baidu_address = p.address.street; + doSaveBehaviorLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model,event:event,businessData:dataMap}); + }, function(e){ + doSaveBehaviorLog({page:page, device:device, model:model,event:event,businessData:dataMap}); + }, + { + provider:'baidu', + enableHighAccuracy:true, + coordsType:'bd09ll' + } + ); +} + +function doSaveBehaviorLog(data) { + axios.post("/rest/log/saveBehaviorLog", data).then(function (response) { + + }).catch(function (error) { + console.log(error); + }); +} diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js index 3fb27b6..2ba1351 100644 --- a/fangija-zsyf/js/quotations/cityDetail.js +++ b/fangija-zsyf/js/quotations/cityDetail.js @@ -198,9 +198,17 @@ function clickTrend(city, type){ if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ clickTrend(city, type); - plus.webview.getWebviewById('views/user/userInfo.html').reload(); - plus.webview.getWebviewById('views/house/houseDetail.html').reload(); - plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) { + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + } + + if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) { + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + } + + if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){ + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + } }) return; } else { @@ -543,9 +551,13 @@ function collectCity(city, type){ if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ collectCity(city, type) - plus.webview.getWebviewById('views/house/houseManageList.html').reload(); - plus.webview.getWebviewById('views/user/userInfo.html').reload(); - //plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) { + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + } + + if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){ + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + } }) return; } else { @@ -562,7 +574,9 @@ function collectCity(city, type){ // plus.webview.getWebviewById('views/house/houseDetail.html').reload(); },function(){ - plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) { + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + } //loadMyCollectCity(); }); @@ -602,13 +616,17 @@ function docollectCity(city, type){ //loadMyCollectCity(); $("a[href='#tabQuotation1']").click(); - plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) { + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + } //reloadMyFocus(); //reloadCityPotentialRanking() //reloadCityIncreaseRanking() }else if(msg == "关注成功"){ cityInfoVue.$data.collecd = true; - plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) { + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + } //reloadMyFocus(); //reloadCityPotentialRanking() //reloadCityIncreaseRanking() diff --git a/fangija-zsyf/js/quotations/collectCity.js b/fangija-zsyf/js/quotations/collectCity.js index b8107b0..bd7c6f1 100644 --- a/fangija-zsyf/js/quotations/collectCity.js +++ b/fangija-zsyf/js/quotations/collectCity.js @@ -528,10 +528,18 @@ function showRegionInfo(city){ function collectCity(city, index){ if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ - plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) { + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + } collectCity(city) - plus.webview.getWebviewById('views/house/houseManageList.html').reload(); - plus.webview.getWebviewById('views/user/userInfo.html').reload(); + + if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) { + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + } + + if(plus.webview.getWebviewById('views/user/userInfo.html')!= null){ + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + } }) return; diff --git a/fangija-zsyf/js/shara/sharaMine.js b/fangija-zsyf/js/shara/sharaMine.js index fbe4551..48d1717 100644 --- a/fangija-zsyf/js/shara/sharaMine.js +++ b/fangija-zsyf/js/shara/sharaMine.js @@ -78,10 +78,10 @@ function shareMessage(msg,s){ var ss=shares['weixin']; ss&&ss.nativeClient&&(shareBts.push({title:'微信朋友圈',s:ss,x:'WXSceneTimeline'}), shareBts.push({title:'微信好友',s:ss,x:'WXSceneSession'})); - ss=shares['qq']; + /* ss=shares['qq']; ss&&ss.nativeClient&&shareBts.push({title:'QQ',s:ss}); ss=shares['sinaweibo']; - ss&&shareBts.push({title:'新浪微博',s:ss}); + ss&&shareBts.push({title:'新浪微博',s:ss});*/ // 弹出分享列表 shareBts.length>0?plus.nativeUI.actionSheet({title:'分享链接',cancel:'取消',buttons:shareBts},function(e){ (e.index>0)&&shareAction(shareBts[e.index-1],true); diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index 5798ce9..40a16ef 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -118,10 +118,11 @@ var self = plus.webview.currentWebview(); for (var i = 0; i < 4; i++) { var temp = {}; - var sub = plus.webview.create(subpages[i], subpages[i], subpage_style); if (i > 0) { - sub.hide(); + /*var sub = plus.webview.create(subpages[i], subpages[i], subpage_style); + sub.hide();*/ }else{ + var sub = plus.webview.create(subpages[i], subpages[i], subpage_style); temp[subpages[i]] = "true"; mui.extend(aniShow,temp); } @@ -142,6 +143,9 @@ //显示目标选项卡 //若为iOS平台或非首次显示,则直接显示 if(mui.os.ios||aniShow[targetTab]){ + if(plus.webview.getWebviewById(targetTab)==null){ + plus.webview.create(targetTab, targetTab, subpage_style) + } plus.webview.show(targetTab); }else{ //否则,使用fade-in动画,且保存变量 diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index 8cf9750..280b2ce 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -7,7 +7,7 @@ "id": "H5693FF3D",/*应用的标识,创建应用时自动生成,勿手动修改*/ "name": "有房",/*应用名称,程序桌面图标名称*/ "version": { - "name": "1.1.1",/*应用版本名称*/ + "name": "1.1.6",/*应用版本名称*/ "code": "20109" }, "description": "有房,围绕房产提供全方位数据分析的房产及金融服务平台,通过个性化的智能推荐,定制专属的个人投资或购房计划,多维度管理自有房产并提供房产融资通道。",/*应用描述信息*/ @@ -154,8 +154,8 @@ ], "frameworks": [], /*调用Native.js调用原生Objective-c API需要引用的FrameWork,如需调用GameCenter,则添加"GameKit.framework"*/ "plistcmds": [ - "Set :NSLocationWhenInUseUsageDescription 根据您的位置信息,您可随时掌握所在位置周边房产的行情。", - "Set :NSLocationAlwaysUsageDescription 根据您的位置信息,您可随时掌握所在位置周边房产的行情。" + "Set :NSLocationAlwaysUsageDescription 根据您的位置信息,您可随时掌握所在位置周边房产的行情。", + "Set :NSLocationWhenInUseUsageDescription 根据您的位置信息,您可随时掌握所在位置周边房产的行情。" ] }, "google": { diff --git a/fangija-zsyf/views/changeHouse/index.html b/fangija-zsyf/views/changeHouse/index.html index e1bc6cd..8fe9bb4 100644 --- a/fangija-zsyf/views/changeHouse/index.html +++ b/fangija-zsyf/views/changeHouse/index.html @@ -31,7 +31,7 @@