diff --git a/fangija-zsyf/cardInfoPlaceholderImg.png b/fangija-zsyf/cardInfoPlaceholderImg.png index 8b65c49..bf8a3e2 100644 Binary files a/fangija-zsyf/cardInfoPlaceholderImg.png and b/fangija-zsyf/cardInfoPlaceholderImg.png differ diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index a11ed51..1615c87 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,9 +1,10 @@ /**服务端地址**/ -//var BASE_PATH = "https://youfang.fangjia.com"; +var BASE_PATH = "https://youfang.fangjia.com"; //var BASE_PATH = "http://192.168.10.128:8084"; //var BASE_PATH = "http://192.168.10.164:8084"; //var BASE_PATH = "http://192.168.10.53:8084"; -var BASE_PATH = "http://192.168.10.47:8086"; +//var BASE_PATH = "http://192.168.10.47:8086"; +var BASE_PATH = "http://192.168.9.60:8084"; //var BASE_PATH = "http://192.168.10.161:8084"; //var BASE_PATH = "http://192.168.10.170:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; @@ -26,4 +27,7 @@ var EVALUATE_LIST=10;// "有房房产评估列表-广告图" var ESTATE_MARKET_COUNTRY=11;// "有房房产行情全国-广告图" var ESTATE_MARKET_SHANGHAI=12;// "有房房产行情上海-广告图" var ESTATE_DETAIL=13;// "有房房产详情-广告图" -var DISTRICT_DETAIL_PRICE=14;// "有房小区详情-广告图" \ No newline at end of file +var DISTRICT_DETAIL_PRICE=14;// "有房小区详情-广告图" + +//渠道 +var YOUFANG_CHANNEL = "fangjia"; diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index b5b20cc..3e2c372 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -491,7 +491,7 @@ input::-webkit-input-placeholder{ .cardInfo01{color:#333;} .cardInfo01 > img{width:100%;} .cardInfo01 span{font-size:0.55rem;color:#B5B5B5;} -.cardInfo01 .card-header{padding:0.5rem 0;font-size:0.85rem;} +.cardInfo01 .card-header{padding:0.5rem 0;font-size:0.9rem;} .cardInfo01 .card-content-inner{padding:0.5rem 0;} .cardInfo01 .card-footer{padding:0.5rem 0;} .cardInfo01 .card-footer span label{font-size:0.55rem;line-height:0.8rem;display:inline-block;vertical-align:text-top;} @@ -515,7 +515,7 @@ input::-webkit-input-placeholder{ .cardInfo02 .item-content{padding:0;} .cardInfo02 .item-title{font-size:0.9rem;white-space:normal;-webkit-line-clamp:2;-webkit-box-orient:vertical;display:-webkit-box;} .cardInfo02 .item-title span{text-align:right;} -.cardInfo02 .item-subtitle font{font-size:0.7rem;white-space:normal;-webkit-line-clamp:2;-webkit-box-orient:vertical;display:-webkit-box;margin:0.2rem 0;} +.cardInfo02 .item-subtitle font{font-size:0.7rem;white-space:normal;-webkit-line-clamp:2;-webkit-box-orient:vertical;display:-webkit-box;margin:0.3rem 0;} .cardInfo02 .item-subtitle span{font-size:0.55rem;color:#B5B5B5;max-width:100%;} .cardInfo02 .item-subtitle small{font-size:0.7rem;color:#999;} .cardInfo02 .item-subtitle em{font-size:0.7rem;color:#EB5F34;} @@ -539,8 +539,18 @@ input::-webkit-input-placeholder{ .cardInfo03 .card-content-inner div.vote02 label{color:#8698F0;text-align:left;} .cardInfo03 .card-content-inner em{font-size:1rem;color:#F18D00;text-align:center;line-height:45px;position:absolute;left:48%;} -.cardInfo01 .cardInfoPlaceholder{width:100%;height:180px;background:url(../images/cardInfoPlaceholderImg.png) no-repeat center center;background-size:20%;border:solid 1px #e7e7e7;} +.cardInfo01 .cardInfoPlaceholder{width:100%;height:180px;background:url(../images/cardInfoPlaceholderImg.png) no-repeat center center;background-size:15%;border:solid 1px #e7e7e7;} .cardInfo02 .cardInfoPlaceholder{width:6.5rem;height:5.2rem;background:url(../images/cardInfoPlaceholderImg.png) no-repeat center center;background-size:30%;border:solid 1px #e7e7e7;} +.cardLoan{box-shadow:0 4px 10px 0 rgba(211,214,217,0.70);border-radius:0.25rem;margin:0;} +.cardLoan .card-content-inner p{text-align:center;line-height:1rem;margin:0.25rem 0;} +.cardLoan .card-content-inner p label{font-size:0.7rem;color:#333;} +.cardLoan .card-content-inner p small{font-size:0.6rem;color:#999;} +.cardLoan .card-content-inner p em{font-size:1.25rem;color:#EA122C;font-weight:bold;margin-right:0.1rem;} +.cardLoan .card-content-inner p font{font-size:0.7rem;color:#EA122C;} +.cardLoan .card-content-inner p span{font-size:0.65rem;color:#333;} +.cardLoan .card-content-inner p a{width:4.5rem;margin:0 auto;margin-top:0.5rem;} +.icon-loan01{width:18px;height:15px;background:url(../images/icon-loan01a.png) no-repeat center center;background-size:100%;margin-right:0.3rem;} +.icon-loan02{width:15px;height:15px;background:url(../images/icon-loan02a.png) no-repeat center center;background-size:100%;margin-right:0.3rem;} .icon-eye-white{width:0.89rem;height:0.57rem;background:url(../images/icon-eye-white.png) no-repeat center center;background-size:100%;margin-right:0.3rem;vertical-align:baseline;} .icon-eye-grey{width:0.85rem;height:0.6rem;background:url(../images/icon-eye-grey.png) no-repeat center center;background-size:100%;margin-right:0.3rem;vertical-align:baseline;} @@ -559,12 +569,10 @@ input::-webkit-input-placeholder{ /* 资讯 */ .content-padded{margin:0.75rem;} .content-padded h1{font-size:1.1rem;line-height:1.6rem;letter-spacing:0.11rem;} -.content-padded p{font-size:0.8rem;color:#333;line-height:1.5rem;letter-spacing:0.06rem;text-align:justify;clear:both;overflow:hidden;} +.content-padded p{font-size:0.8rem;line-height:1.5rem;letter-spacing:0.06rem;text-align:justify;clear:both;overflow:hidden;} .content-padded p span{margin-left:1rem;} .content-padded p small{font-size:0.65rem;color:#999;line-height:0.9rem;letter-spacing:0.07rem;float:left;} .content-padded img{width:100%;} -.content-padded img.icon{width:auto;} -.content-padded ol{padding-left:0.75rem;} .adBoxApp{width:80%;margin:0 auto;margin-top:1rem;margin-bottom:1.5rem;overflow:hidden;} .adBoxApp img{float:left;width:5.6rem;height:4.7rem;margin-right:1rem;} @@ -824,6 +832,7 @@ input::-webkit-input-placeholder{ .topic .topicContent .topicContent_center.home div .icon.icon-personal02{background:url(../images/icon-personal02.png) no-repeat center center;background-size:100%;} .topic .topicContent .topicContent_center.home div .icon.icon-personal03{background:url(../images/icon-personal03.png) no-repeat center center;background-size:100%;} .topic .topicContent .topicContent_center.home div .icon.icon-personal04{background:url(../images/icon-personal04.png) no-repeat center center;background-size:100%;} +.topic .topicContent .topicContent_center.home div .icon.icon-personal05{background:url(../images/icon-personal05.png) no-repeat center center;background-size:100%;} .topic .topicContent .topicContent_center.home div .icon.icon-evaluation01{background:url(../images/icon-evaluation01.png) no-repeat center center;background-size:100%;} .topic .topicContent .topicContent_center.home div .icon.icon-evaluation02{background:url(../images/icon-evaluation02.png) no-repeat center center;background-size:100%;} @@ -870,21 +879,23 @@ input::-webkit-input-placeholder{ .topic .topicContent .topicContent_bottom01 label em{color:#EB5F34;margin-left:0.1rem;} /* 广告 */ -.ad{display:block;border-bottom:solid 0.5rem #f3f3f3;} +.ad{display:block;} .ad img{width:100%;} /* 图表 */ .chart{width:100%;height:250px;} .chart tspan{font-size:0.6rem;text-shadow:none;} -.chart01Box{height:270px;} -#chart01{height:270px;} -#chart01a{height:270px;} -.topic .topicTitle > div.icon01Box{overflow:hidden;float:none;display:inline-block;vertical-align:middle;margin-left:-0.5rem;} -.icon-chart01a{width:1.1rem;height:1rem;background:url(../images/icon-chart01a.png) no-repeat center center;background-size:55%;float:left;padding:0 0.8rem;} -.icon-chart01{width:1.1rem;height:1rem;background:url(../images/icon-chart01.png) no-repeat center center;background-size:55%;float:left;padding:0 0.8rem;} - -.icon-chart01a-no{width:1.1rem;height:1rem;background:url(../images/icon-chart01a_common.png) no-repeat center center;background-size:55%;float:left;padding:0 0.8rem;} -.icon-chart01-no{width:1.1rem;height:1rem;background:url(../images/icon-chart01_common.png) no-repeat center center;background-size:55%;float:left;padding:0 0.8rem;} +.chart01Box,#chart01a,#chart01{height:260px;} +/* +.chart01Box{height:260px;position:relative;} +#chart01a{height:260px;position:absolute;} +#chart01{height:260px;position:absolute;} +*/ +.topic .topicTitle > div.icon01Box{overflow:hidden;float:none;display:inline-block;vertical-align:middle;} +.icon-chart01a-no{width:1.1rem;height:1rem;background:url(../images/icon-chart01a-no.png) no-repeat center center;background-size:55%;padding:0 0.8rem;} +.icon-chart01a{width:1.1rem;height:1rem;background:url(../images/icon-chart01a.png) no-repeat center center;background-size:55%;padding:0 0.8rem;} +.icon-chart01-no{width:1.1rem;height:1rem;background:url(../images/icon-chart01-no.png) no-repeat center center;background-size:55%;padding:0 0.8rem;} +.icon-chart01{width:1.1rem;height:1rem;background:url(../images/icon-chart01.png) no-repeat center center;background-size:55%;padding:0 0.8rem;} .scoreBox{height:130px;position:relative;} .score{width:250px;height:250px;margin:0 auto;margin-top:1rem;} @@ -1033,7 +1044,7 @@ input::-webkit-input-placeholder{ .cardRankingBox01 .cardRanking{width:33.33%;border:none;border-radius:0;margin:0;} .cardRankingBox01 .cardRanking:last-child{border-right:none;} .cardRankingBox01 .cardRanking .card-header:first-child{border-right:none;padding:0;padding-top:0.5rem;padding-bottom:0.5rem;font-size:0.75rem;} -.cardRankingBox01 .cardRanking .card-header{border-right:solid 1px #e7e7e7;padding-top:0;color:#333;} +.cardRankingBox01 .cardRanking .card-header{border-right:solid 1px #e7e7e7;padding-top:0;} .cardRankingBox01 .cardRanking .card-header em{font-size:0.85rem;color:#F18D00;margin-right:0.2rem;} .cardRankingBox01 .cardRanking .card-content-inner{color:#999;border-right:solid 1px #e7e7e7;} .cardRankingBox01 .cardRanking .card-footer{padding:0;border-right:solid 1px #e7e7e7;} @@ -1190,6 +1201,18 @@ input::-webkit-input-placeholder{ .legendBox p label i{width:0.4rem;height:0.4rem;border-radius:100%;display:inline-block;margin-right:0.3rem;} .legendBox p span{font-size:0.75rem;display:inline-block;width:50%;} +/* 大额信用卡 */ +.creditCardBox{padding:0 0.75rem;} +.creditCardBox > img{width:4.51rem;height:1.3rem;margin-top:0.75rem;} +.creditCardBox > div > img{margin:0 auto;} +.creditCardBox > div p{text-align:center;margin-top:1rem;margin-bottom:1rem;} +.creditCardBox > div p .icon-creditCard01{width:1.1rem;height:0.9rem;background:url(../images/icon-creditCard01.png) no-repeat center center;background-size:100%;margin-right:0.3rem;} +.creditCardBox > div p .icon-creditCard02{width:0.98rem;height:0.98rem;background:url(../images/icon-creditCard02.png) no-repeat center center;background-size:100%;margin-right:0.3rem;} +.creditCardBox > div p em{font-size:0.9rem;color:#F18D00;display:inline-block;vertical-align:middle;} +.creditCardBox > p{text-align:center;margin-top:1rem;margin-bottom:0;} +.creditCardBox > p em{font-size:0.8rem;} +.creditCardBox > p label{font-size:1rem;color:#fff;background:#F18D00;border-radius:0.25rem;margin:0 1.1rem;padding:0.2rem 0.5rem;} + /* 分享 */ .shareBox{height:66px;padding-left:0;padding-right:0.5rem;border-top:solid 1px #e7e7e7;bottom:0;} .shareBox ul:before{height:0;} diff --git a/fangija-zsyf/images/icon-chart01-no.png b/fangija-zsyf/images/icon-chart01-no.png new file mode 100644 index 0000000..17a4ca3 Binary files /dev/null and b/fangija-zsyf/images/icon-chart01-no.png differ diff --git a/fangija-zsyf/images/icon-chart01a-no.png b/fangija-zsyf/images/icon-chart01a-no.png new file mode 100644 index 0000000..581d3a2 Binary files /dev/null and b/fangija-zsyf/images/icon-chart01a-no.png differ diff --git a/fangija-zsyf/images/icon-creditCard01.png b/fangija-zsyf/images/icon-creditCard01.png new file mode 100644 index 0000000..b2c7942 Binary files /dev/null and b/fangija-zsyf/images/icon-creditCard01.png differ diff --git a/fangija-zsyf/images/icon-creditCard02.png b/fangija-zsyf/images/icon-creditCard02.png new file mode 100644 index 0000000..e727332 Binary files /dev/null and b/fangija-zsyf/images/icon-creditCard02.png differ diff --git a/fangija-zsyf/images/icon-loan01.png b/fangija-zsyf/images/icon-loan01.png new file mode 100644 index 0000000..e3f81fd Binary files /dev/null and b/fangija-zsyf/images/icon-loan01.png differ diff --git a/fangija-zsyf/images/icon-loan01a.png b/fangija-zsyf/images/icon-loan01a.png new file mode 100644 index 0000000..a35c3d7 Binary files /dev/null and b/fangija-zsyf/images/icon-loan01a.png differ diff --git a/fangija-zsyf/images/icon-loan02.png b/fangija-zsyf/images/icon-loan02.png new file mode 100644 index 0000000..d70ae30 Binary files /dev/null and b/fangija-zsyf/images/icon-loan02.png differ diff --git a/fangija-zsyf/images/icon-loan02a.png b/fangija-zsyf/images/icon-loan02a.png new file mode 100644 index 0000000..cff1c61 Binary files /dev/null and b/fangija-zsyf/images/icon-loan02a.png differ diff --git a/fangija-zsyf/images/icon-personal05.png b/fangija-zsyf/images/icon-personal05.png new file mode 100644 index 0000000..738972b Binary files /dev/null and b/fangija-zsyf/images/icon-personal05.png differ diff --git a/fangija-zsyf/js/ad_position_image.js b/fangija-zsyf/js/ad_position_image.js index 70c187a..3135ae4 100644 --- a/fangija-zsyf/js/ad_position_image.js +++ b/fangija-zsyf/js/ad_position_image.js @@ -4,8 +4,12 @@ function add_imgage(imageId,adPosition,device){ }).then(function(response){ if(response.data.status){ var h = response.data.data; - if(typeof(h.imgId)!="undefined"&&h.imgId!=null&&$.trim(h.imgId)!=""){ - $("#"+imageId).attr("src",BASE_PATH+"/img/"+h.imgId); + if (h == "" || h == null) { + return; + } + console.log(h); + if(typeof(h.imgUrl)!="undefined"&&h.imgUrl!=null&&$.trim(h.imgUrl)!=""){ + $("#"+imageId).attr("src",h.imgUrl); } if(typeof(h.link)!="undefined"&&h.link!=null&&$.trim(h.link)!=""){ var uid = localStorage.getItem("user_id"); diff --git a/fangija-zsyf/js/common.js b/fangija-zsyf/js/common.js index 8863d6a..ad0e8ac 100644 --- a/fangija-zsyf/js/common.js +++ b/fangija-zsyf/js/common.js @@ -84,13 +84,13 @@ w.clicked=function(id,wa,ns,ws, params,callback,callbackParams){ // return null; // } if(w.plus){ + var startTime = new Date().getTime(); wa&&(waiting=plus.nativeUI.showWaiting()); ws=ws||{}; ws.scrollIndicator||(ws.scrollIndicator='none'); ws.scalable||(ws.scalable=false); var pre='';//'http://192.168.1.178:8080/h5/'; openw=plus.webview.create(pre+id,id,ws,params); - ns||openw.addEventListener('loaded',function(){//页面加载完成后才显示 // setTimeout(function(){//延后显示可避免低端机上动画时白屏 openw.show(as); @@ -103,6 +103,8 @@ w.clicked=function(id,wa,ns,ws, params,callback,callbackParams){ callback(callbackParams); } openw=null; + var endTime = new Date().getTime(); + savePageLog(endTime - startTime, id); },false); return openw; }else{ @@ -110,6 +112,45 @@ w.clicked=function(id,wa,ns,ws, params,callback,callbackParams){ } return null; }; +/** + * 记录页面访问日志 + */ +function savePageLog(residenceTime, page) { + var device = plus.device.uuid; + var model = plus.device.model; + + var pushClientId = ""; + var info = plus.push.getClientInfo(); + if (info != null) { + pushClientId = info.clientid; + } + plus.geolocation.getCurrentPosition(function(p){ + baidu_province = p.address.province; + baidu_city = p.address.city; + baidu_region = p.address.district; + baidu_lng = p.coords.longitude; + baidu_lat = p.coords.latitude; + baidu_address = p.address.street; + doSavePageLog({page:page, lng:baidu_lng, lat:baidu_lat, province:baidu_province, city:baidu_city, region:baidu_region, address:baidu_address, device:device, model:model, pushClientId:pushClientId,channel:YOUFANG_CHANNEL,residenceTime:residenceTime}); + }, function(e){ + doSavePageLog({page:page, device:device, model:model, pushClientId:pushClientId,channel:YOUFANG_CHANNEL,residenceTime:residenceTime}); + }, + { + provider:'baidu', + enableHighAccuracy:true, + coordsType:'bd09ll' + } + ); +} + +function doSavePageLog(data) { + axios.post("/rest/log/save", data).then(function (response) { + + }).catch(function (error) { + console.log(error); + }); +} + w.openDoc=function(t,c){ var d=plus.webview.getWebviewById('document'); if(d){ diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index 6ffdf33..6206159 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -802,7 +802,7 @@ function showLineChart(times, datas){ color: '#666' }, formatter: function (params) { - var res = params[0].name + '
' + "均价:"+params[0].value + '元/㎡'; + var res = params[0].name + '
' + "均价:"+(typeof(params[0].value)=="undefined"?"暂无":(params[0].value+ '元/㎡')) ; return res; }, position: function (pos, params, el, elRect, size) { diff --git a/fangija-zsyf/js/loan/loanInfo.js b/fangija-zsyf/js/loan/loanInfo.js index 6977a27..8b8d155 100644 --- a/fangija-zsyf/js/loan/loanInfo.js +++ b/fangija-zsyf/js/loan/loanInfo.js @@ -3,6 +3,8 @@ var APPLY_LOAN = "applyLoan"; //如果是抵押贷款时候,需要上层页面传入houseId var houseId; +var loanPrice; +var loanType; var _params = {}; document.addEventListener('plusready', onPlusReady, false); @@ -10,6 +12,15 @@ document.addEventListener('plusready', onPlusReady, false); function onPlusReady(){ var self = plus.webview.currentWebview(); houseId= self.houseId; + loanPrice= self.loanPrice; + loanType= self.loanType; + if(loanType==1){ + $(".checkbox i").removeClass("current"); + $("#loanTypeDiv1").find("i").addClass("current"); + }else if(loanType==2){ + $(".checkbox i").removeClass("current"); + $("#loanTypeDiv2").find("i").addClass("current"); + } $('#input_city').val(self.city); $('#input_phoneNumber').val(self.mobile); } @@ -93,6 +104,10 @@ $("#next_btn").on("click", function () { $.toast("请输入申请金额"); return false; } + if(loanPrice!=0 && loanPrice>16)+(b>>16)+(c>>16);return d<<16|65535&c}function c(a,b){return a<>>32-b}function d(a,d,e,f,g,h){return b(c(b(b(d,a),b(f,h)),g),e)}function e(a,b,c,e,f,g,h){return d(b&c|~b&e,a,b,f,g,h)}function f(a,b,c,e,f,g,h){return d(b&e|c&~e,a,b,f,g,h)}function g(a,b,c,e,f,g,h){return d(b^c^e,a,b,f,g,h)}function h(a,b,c,e,f,g,h){return d(c^(b|~e),a,b,f,g,h)}function i(a,c){a[c>>5]|=128<>>9<<4)+14]=c;var d,i,j,k,l,m=1732584193,n=-271733879,o=-1732584194,p=271733878;for(d=0;d>5]>>>b%32&255);return c}function k(a){var b,c=[];for(c[(a.length>>2)-1]=void 0,b=0;b>5]|=(255&a.charCodeAt(b/8))<16&&(e=i(e,8*a.length)),c=0;16>c;c+=1)f[c]=909522486^e[c],g[c]=1549556828^e[c];return d=i(f.concat(k(b)),512+8*b.length),j(i(g.concat(d),640))}function n(a){var b,c,d="0123456789abcdef",e="";for(c=0;c>>4&15)+d.charAt(15&b);return e}function o(a){return unescape(encodeURIComponent(a))}function p(a){return l(o(a))}function q(a){return n(p(a))}function r(a,b){return m(o(a),o(b))}function s(a,b){return n(r(a,b))}function t(a,b,c){return b?c?r(b,a):s(b,a):c?p(a):q(a)}"function"==typeof define&&define.amd?define(function(){return t}):a.md5=t}(this); \ No newline at end of file diff --git a/fangija-zsyf/js/push-common.js b/fangija-zsyf/js/push-common.js index 5dab9c5..6bc93d8 100644 --- a/fangija-zsyf/js/push-common.js +++ b/fangija-zsyf/js/push-common.js @@ -32,59 +32,43 @@ document.addEventListener("plusready", function() { if (payload.type == "0") { plus.ui.alert(title+"\n"+content); } else if (payload.type == "1") { - - plus.nativeUI.confirm(content, function(e){ - if (e.index==0) { - if(plus.webview.getWebviewById('H5693FF3D')==null){ - plus.webview.show(plus.webview.getWebviewById("HBuilder")); - }else{ - plus.webview.show(plus.webview.getWebviewById("H5693FF3D")); - } - var targetTab = payload.url+".html"; - var defaultTab = document.getElementById(targetTab); - //模拟首页点击 - mui.trigger(defaultTab, 'tap'); - //切换选项卡高亮 - var current = document.querySelector(".mui-bar-tab>.mui-tab-item.mui-active"); - if (defaultTab != current) { - current.classList.remove('mui-active'); - defaultTab.classList.add('mui-active'); - } - } - }, title, ["查看","忽略"] ); - + if(plus.webview.getWebviewById('H5693FF3D')==null){ + plus.webview.show(plus.webview.getWebviewById("HBuilder")); + }else{ + plus.webview.show(plus.webview.getWebviewById("H5693FF3D")); + } + var targetTab = payload.url+".html"; + var defaultTab = document.getElementById(targetTab); + //模拟首页点击 + mui.trigger(defaultTab, 'tap'); + //切换选项卡高亮 + var current = document.querySelector(".mui-bar-tab>.mui-tab-item.mui-active"); + if (defaultTab != current) { + current.classList.remove('mui-active'); + defaultTab.classList.add('mui-active'); + } } else if (payload.type == "2") { if (payload.url.startWith("http")) { - - plus.nativeUI.confirm(content, function(e){ - if (e.index==0) { - clicked('views/webview_embed.html', true,false,{},{url:payload.url}) - } - }, title, ["查看","忽略"] ); - + clicked('views/webview_embed.html', true,false,{},{url:payload.url}) } else { // 处理打开app中的二级页面,一级页面在type=1中已经处理了,如果有http的地址就是打开外部页面 // 否则就是打开app内部页面 - plus.nativeUI.confirm(content, function(e){ - if (e.index==0) { - var url = payload.url; - var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?'); - var openUrl = url.substring(0, sindex); - var paramStr = url.substring(sindex+1); - var jsonData = {}; - var parray = paramStr.split('&') - for(var i=0;i 0) { - jsonData[subArray[0]] = subArray[1]; - } - } + var url = payload.url; + var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?'); + var openUrl = url.substring(0, sindex); + var paramStr = url.substring(sindex+1); + var jsonData = {}; + var parray = paramStr.split('&') + for(var i=0;i 0) { + jsonData[subArray[0]] = subArray[1]; } - clicked(openUrl,true,false,{},jsonData) } - }, title, ["查看","忽略"] ); + } + clicked(openUrl,true,false,{},jsonData) } } @@ -92,57 +76,43 @@ document.addEventListener("plusready", function() { if (payload.type == "0") { plus.ui.alert(content); } else if (payload.type == "1") { - plus.nativeUI.confirm(content, function(e){ - if (e.index==0) { - if(plus.webview.getWebviewById('H5693FF3D')==null){ - plus.webview.show(plus.webview.getWebviewById("HBuilder")); - }else{ - plus.webview.show(plus.webview.getWebviewById("H5693FF3D")); - } - var targetTab = payload.url+".html"; - var defaultTab = document.getElementById(targetTab); - //模拟首页点击 - mui.trigger(defaultTab, 'tap'); - //切换选项卡高亮 - var current = document.querySelector(".mui-bar-tab>.mui-tab-item.mui-active"); - if (defaultTab != current) { - current.classList.remove('mui-active'); - defaultTab.classList.add('mui-active'); - } - } - }, title, ["查看","忽略"] ); + if(plus.webview.getWebviewById('H5693FF3D')==null){ + plus.webview.show(plus.webview.getWebviewById("HBuilder")); + }else{ + plus.webview.show(plus.webview.getWebviewById("H5693FF3D")); + } + var targetTab = payload.url+".html"; + var defaultTab = document.getElementById(targetTab); + //模拟首页点击 + mui.trigger(defaultTab, 'tap'); + //切换选项卡高亮 + var current = document.querySelector(".mui-bar-tab>.mui-tab-item.mui-active"); + if (defaultTab != current) { + current.classList.remove('mui-active'); + defaultTab.classList.add('mui-active'); + } } else if (payload.type == "2") { if (payload.url.startWith("http")) { - - plus.nativeUI.confirm(content, function(e){ - if (e.index==0) { - clicked('views/webview_embed.html', true,false,{},{url:payload.url}) - } - }, title, ["查看","忽略"] ); - + clicked('views/webview_embed.html', true,false,{},{url:payload.url}) } else { // 处理打开app中的二级页面,一级页面在type=1中已经处理了,如果有http的地址就是打开外部页面 // 否则就是打开app内部页面 - plus.nativeUI.confirm(content, function(e){ - if (e.index==0) { - var url = payload.url; - var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?'); - var openUrl = url.substring(0, sindex); - var paramStr = url.substring(sindex+1); - var jsonData = {}; - var parray = paramStr.split('&') - for(var i=0;i 0) { - jsonData[subArray[0]] = subArray[1]; - } - } + var url = payload.url; + var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?'); + var openUrl = url.substring(0, sindex); + var paramStr = url.substring(sindex+1); + var jsonData = {}; + var parray = paramStr.split('&') + for(var i=0;i 0) { + jsonData[subArray[0]] = subArray[1]; } - clicked(openUrl,true,false,{},jsonData) } - }, title, ["查看","忽略"] ); + } + clicked(openUrl,true,false,{},jsonData) } @@ -194,21 +164,26 @@ document.addEventListener("plusready", function() { } else if (payload.type == "2") { plus.nativeUI.confirm(content, function(e){ if (e.index==0) { - var url = payload.url; - var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?'); - var openUrl = url.substring(0, sindex); - var paramStr = url.substring(sindex+1); - var jsonData = {}; - var parray = paramStr.split('&') - for(var i=0;i 0) { - jsonData[subArray[0]] = subArray[1]; + if (payload.url.startWith("http")) { + clicked('views/webview_embed.html', true,false,{},{url:payload.url}) + } else { + var url = payload.url; + var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?'); + var openUrl = url.substring(0, sindex); + var paramStr = url.substring(sindex+1); + var jsonData = {}; + var parray = paramStr.split('&') + for(var i=0;i 0) { + jsonData[subArray[0]] = subArray[1]; + } } } - } - clicked(openUrl,true,false,{},jsonData) + clicked(openUrl,true,false,{},jsonData) + } + } }, title, ["查看","忽略"] ); diff --git a/fangija-zsyf/js/user/myHouse.js b/fangija-zsyf/js/user/myHouse.js index 352406d..6c7f117 100644 --- a/fangija-zsyf/js/user/myHouse.js +++ b/fangija-zsyf/js/user/myHouse.js @@ -116,7 +116,9 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, }else{ html += "
下跌概率: 暂无
"; } - + if(localStorage.getItem("showLoanMenu")!=null && localStorage.getItem("showLoanMenu")=="true"){ + html += "
抵押可贷额度: "+tempTotalPricePercent+"
"; + } html += ""; //调整最新的等级显示(其它等级不显示start) diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index 9e81c35..f697965 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -55,6 +55,10 @@ + + + + diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index 5f034b1..ccf769b 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -7,8 +7,8 @@ "id": "H5693FF3D",/*应用的标识,创建应用时自动生成,勿手动修改*/ "name": "有房",/*应用名称,程序桌面图标名称*/ "version": { - "name": "1.1.15",/*应用版本名称*/ - "code": "20113" + "name": "1.1.19",/*应用版本名称*/ + "code": "20115" }, "description": "有房,围绕房产提供全方位数据分析的房产及金融服务平台,通过个性化的智能推荐,定制专属的个人投资或购房计划,多维度管理自有房产并提供房产融资通道。",/*应用描述信息*/ "icons": { @@ -327,7 +327,7 @@ "splash": false, "push": false, "spot": false - } + },"adid":"126990310005" }, "dependencies": { "pages": { diff --git a/fangija-zsyf/start.html b/fangija-zsyf/start.html index 27200ff..bc00902 100644 --- a/fangija-zsyf/start.html +++ b/fangija-zsyf/start.html @@ -32,7 +32,7 @@ diff --git a/fangija-zsyf/views/component/baseInfoComponent.js b/fangija-zsyf/views/component/baseInfoComponent.js index d2f2ca9..266b4b0 100644 --- a/fangija-zsyf/views/component/baseInfoComponent.js +++ b/fangija-zsyf/views/component/baseInfoComponent.js @@ -293,9 +293,9 @@ function addSubstitution(sr, hs, house){ } if(initPrice < soufu_min){ - s +=",资金缺口约为"+((soufu_min-initPrice)-(soufu_max-initPrice))+"万"; + s +=",资金缺口约为"+Math.abs(Math.round(((soufu_min-initPrice)-(soufu_max-initPrice))*100)/100)+"万"; }else if(initPrice > soufu_min && initPrice < soufu_max){ - s += ",资金缺口约为"+(soufu_max-initPrice)+"万"; + s += ",资金缺口约为"+Math.abs(Math.round((soufu_max-initPrice)*100)/100)+"万"; }else if(initPrice > soufu_max){ s += "。"; } diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 2998e96..06e7d71 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -82,12 +82,30 @@ --> -
-

-

您的反馈很重要,是我们努力的动力

-
- - +
+
+
+
+
+

+

最高可贷额度

+

{{loan_price}}万

+

月利率低至0.6%
最快三天放款

+

立即申请

+
+
+
+
+
+
+

+

最高可贷额度

+

50万

+

月利率0.42%起
最长5年

+

立即申请

+
+
+
@@ -105,7 +123,16 @@
- +
+

+

您的反馈很重要,是我们努力的动力

+
+ + +
+
+ +
均价走势
@@ -160,6 +187,7 @@ $.config = {router: false} var shareId=''; var picUrl = '_www/images/default_share.png'; var hid = ""; + var oriCity; document.addEventListener('plusready', onPlusReady, false); function onPlusReady(){ @@ -170,6 +198,13 @@ $.config = {router: false} shareUrl = shareUrl+"hid="+hid; sharehrefTitle = "小区评估报告"; + //控制贷款按钮是否可以显示,便于ios版本审核 + if(localStorage.getItem("showLoanMenu")!=null && localStorage.getItem("showLoanMenu")=="true"){ + $('#house_loan').show(); + }else{ + $('#house_loan').hide(); + } + var house_info = new Vue({ el:'#house_info', data:{ @@ -178,6 +213,13 @@ $.config = {router: false} house_room_num:"" } }) + var house_loan = new Vue({ + el:'#house_loan', + data:{ + loan_price:"" + } + }) + var house_price = new Vue({ el:"#house_price", data:{ @@ -254,14 +296,28 @@ $.config = {router: false} house_info.name = h.name sharehrefTitle=h.name+"评估报告" house_info.city_region = h.city+"-"+h.region + oriCity = h.city; house_info.house_room_num = (h.houseRoomNum==null||h.houseRoomNum=="")?"暂无":h.houseRoomNum; // house_info.house_type = (h.roomCount==0?"":h.roomCount+"室")+(h.hallCount==0?"":h.hallCount+"厅 ")+(h.area==0?"":h.area+"㎡ ")+((h.floor==0||h.height==0)?"":h.floor+"/"+h.height+"层") if(h.totalPrice==0){ house_price.total_price = "暂无"; + $("#loanDiv1").hide(); + $("#loanDiv2").hide(); + $("#textStr1").text("最快三天放款"); }else{ house_price.total_price = (h.totalPrice/10000).toFixed(2) house_price.w = "万" + $("#loanDiv1").show(); + $("#loanDiv2").show(); + house_loan.loan_price = ((h.totalPrice/10000)*0.7).toFixed(0); + if(house_loan.loan_price>=200){ + $("#textStr1").text("超长年限30年"); + }else{ + $("#textStr1").text("最快三天放款"); + } } + + //alert(house_price.loanPrice) house_price.avg_price = h.avgPrice==0?"暂无":h.avgPrice+"元/㎡" house_price.percentage_30=h.oneMonthUpDownRange==0?"暂无":h.oneMonthUpDownRange if(h.oneMonthUpDownRange<0){ @@ -561,6 +617,23 @@ function openaddWindow(){ }) } +function gotoLoanApply(type){ + var eventType = "loanClick"; + var dataMap = {}; + dataMap["hid"]=hid; + saveBehaviorLog(eventType,dataMap); //保存用户点击事件 + //最大贷款限额 + var loanPrice = 0; + //贷款类型 0-无 1-房抵贷 2-信用贷 + var loanType = type; + if(type == 1){ + loanPrice = $("#loanPrice").text(); + }else if(type == 2){ + loanPrice = 50; + } + clicked('/views/loan/loanInfo.html',true,false,{},{houseId: hid, city: oriCity, mobile: "",loanPrice:loanPrice,loanType:loanType},function(){}) +} + function share(){ var eventType = "shareEvaluateClick"; var dataMap = {}; diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index 4fc7ede..69344d5 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -1856,7 +1856,7 @@ function formatTime(time){ //判断是否登录 //var loginFlag=false; function checkIsLogin(){ - if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ + if(localStorage.getItem("user_token") == 'null' || localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ $("#evaluation_btn").removeAttr("disabled"); clicked('/views/user/codeSms.html',true,false,{},{},function(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index 845f634..8bcbe7b 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -18,7 +18,7 @@ .topic .topicContent .topicContent_center.home div span{font-size:0.7rem;color:#666;} .list-block ul:before{height:0;} .list-block ul:after{height:0;} - .list-block.media-list ul:after{height:1px;} + .list-block.media-list:first-child ul:after{height:1px;} .list-block .item-inner{padding-top:0;padding-bottom:0;min-height:1.8rem;} .list-block .item-inner:after{height:0;} .districtMap + .list-block.media-list span{line-height:1.2rem;} @@ -102,15 +102,42 @@ 我要置换
-
+
+
+
+
+
+

+

最高可贷额度

+

{{loanPrice}}万

+

月利率低至0.6%
最快三天放款

+

立即申请

+
+
+
+ +
+
+
+

+

最高可贷额度

+

50万

+

月利率0.42%起
最长5年

+

立即申请

+
+
+
+
+
- +
@@ -335,6 +362,7 @@
+ - + diff --git a/fangija-zsyf/views/news/newsDetail.html b/fangija-zsyf/views/news/newsDetail.html index df25d89..7789fb1 100644 --- a/fangija-zsyf/views/news/newsDetail.html +++ b/fangija-zsyf/views/news/newsDetail.html @@ -355,13 +355,20 @@ function addItems(number, lastIndex) { content = content.substr(0,250)+"..."; } } - + var reply = ""; + if(vo.replyStatus==1){//对回复已回复 + reply = "
"+ + "
作者
"+ + "
"+ + "
"+vo.commentReply+"
"; + } html = html + "
"+timeString+"
"+ "
"+ "
"+content+"
"+ + reply+ "
"+ ""+ - ""; + ""; } // 添加新条目 diff --git a/fangija-zsyf/views/rent/rent.html b/fangija-zsyf/views/rent/rent.html index 0a6ac6d..5b01e9f 100644 --- a/fangija-zsyf/views/rent/rent.html +++ b/fangija-zsyf/views/rent/rent.html @@ -85,7 +85,7 @@
- +
diff --git a/fangija-zsyf/views/setting/about.html b/fangija-zsyf/views/setting/about.html index 6cc3e1a..832a612 100644 --- a/fangija-zsyf/views/setting/about.html +++ b/fangija-zsyf/views/setting/about.html @@ -84,6 +84,9 @@ $.config = {router: false} + + + - +