diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 4380bdf..8326f0f 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,9 +1,9 @@ /**服务端地址**/ -//var BASE_PATH = "http://youfang.fangjia.com"; +var BASE_PATH = "http://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.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.10.161:8084"; //var BASE_PATH = "http://192.168.10.170:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 8344c4d..6e03ac8 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -12,11 +12,14 @@ em{font-style:normal;color:#333;} em.up{color:#EB5F34;} em.down{color:#88D053;} */ -::../../images{display:none;} +::-webkit-scrollbar{display:none;} +.bt{border-top:solid 0.5rem #f3f3f3;} +.bb{border-bottom:solid 0.5rem #f3f3f3;} .tac{text-align:center;} .dn{display:none;} .di{display:inline;} +.page,.page-group{background:#f3f3f3;} .content{background:#fff;color:#333;z-index:1;} .content.f3{background:#f3f3f3;} .popup{background:#f3f3f3;} @@ -276,7 +279,7 @@ em.down{color:#88D053;} .list-block .item-subtitle div em i{width:7px;height:10px;margin-left:0.2rem;} .list-block .item-subtitle div label{display:block;font-size:0.7rem;color:#666;text-align:center;max-width:100%;} .list-block .item-subtitle div p{margin-bottom:0;} -.list-block .item-subtitle div.price{position:absolute;bottom:-0.3rem;right:0;} +.list-block .item-subtitle div.price{position:absolute;bottom:-0.3rem;right:0.5rem;} .list-block .item-subtitle div.price em{font-size:0.8rem;color:#EB5F34;} .list-block .item-subtitle div.price em strong{font-size:1.4rem;color:#EB5F34;font-weight:bold;margin-right:0.1rem;} .list-block .item-subtitle div.priceBox01 em{display:block;color:#333;} @@ -294,9 +297,9 @@ em.down{color:#88D053;} .list-block .item-inner .item-media{width:1.2rem;height:1.2rem;float:left;margin-right:0.2rem;} .list-block .item-inner .item-media img{width:100%;} -.list-block .add{background:none;font-size:0.75rem;color:#F18D00;position:absolute;top:0;right:0;padding:0.5rem 0.75rem;} -.list-block .add01{padding:0 0.5rem;top:1.1rem;right:0.75rem;} -.list-block .add01a{top:inherit;bottom:0.75rem;right:0.75rem;} +.list-block .add{background:none;font-size:0.75rem;color:#F18D00;position:absolute;top:0;right:0;padding:0.5rem 1.25rem;} +.list-block .add01{padding:0 0.5rem;top:1rem;right:0.75rem;} +.list-block .add01a{top:inherit;bottom:0.75rem;right:1.25rem;} .list-block .delete{width:1.5rem;height:1.55rem;background:url(../images/delete.png) no-repeat center center;background-size:100%;position:absolute;top:-1px;right:0;} .starBox{position:absolute;top:0.6rem;right:1.25rem;font-size:0.7rem;color:#666;text-align:right;} .starBox .star{display:block;} @@ -325,8 +328,9 @@ em.down{color:#88D053;} .content-padded + .newCss ul{padding-bottom:0;} .list-block .item-content label.label-checkbox{float:left;padding-left:0;} +.list-block .item-content label.label-checkbox:last-child{margin-left:0.8rem;} .list-block .item-content label.label-checkbox .item-media{width:auto;height:auto;padding:0;margin:0;} -label.label-checkbox i.icon-form-checkbox{margin-right:0.5rem;} +label.label-checkbox i.icon-form-checkbox{margin-right:0.3rem;} label.label-checkbox i.current{background:url(../images/checkImg.png) no-repeat center center #F18D00;background-size:0.55rem;border:none;} .item-media i.check{width:24px;height:24px;border-radius:1.1rem;border:solid 1px #c7c7cc;margin:0;} .item-media i.checked{background:url(../images/checkImg.png) no-repeat center center #F18D00;border:solid 1px #F18D00;background-size:0.55rem;} @@ -444,7 +448,7 @@ input::-webkit-input-placeholder{ .cardPrice01{border-bottom:solid 0.5rem #f3f3f3;} .cardPrice01 .card-content{background:url(../images/cardBg01.png) no-repeat center bottom;background-size:100%;} .cardPrice01 .card-content-inner{padding-top:0.5rem;padding-bottom:4rem;} -.cardPrice01 .card-footer{width:100%;padding:0 0.75rem;background:none;position:absolute;bottom:0;} +.cardPrice01 .card-footer{width:100%;padding:0 0.75rem;background:none;position:absolute;bottom:0.3rem;} .cardPrice01 .card-footer span{width:50%;border-right:none;text-align:left;} .cardPrice01 .card-footer span:last-child{text-align:right;} @@ -465,7 +469,7 @@ 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 .cardNearby../../images{margin-bottom:0.25rem;} +.cardNearbyBox01 .cardNearbyWin{margin-bottom:0.25rem;} .cardNearbyBox01 .cardNearby{border:solid 1px #e7e7e7;} .cardNearbyBox01 .cardNearby .card-header{padding-top:0.25rem;line-height:1.2rem;} @@ -531,6 +535,9 @@ 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;} +.cardInfo02 .cardInfoPlaceholder{width:6.5rem;height:5.2rem;background:url(../images/cardInfoPlaceholderImg.png) no-repeat center center;background-size:30%;border:solid 1px #e7e7e7;} + .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;} .icon-eye-orange{width:0.7rem;height:0.5rem;background:url(../images/icon-eye-orange.png) no-repeat center center;background-size:100%;margin-right:0.3rem;vertical-align:baseline;} @@ -648,6 +655,7 @@ input::-webkit-input-placeholder{ .popup .bar .searchbar .icon-left{padding:0;line-height:38px;color:#666;} .popup .bar .searchbar .search-input input{height:36px;border:solid 1px #e6e6ea;} .bar.bar-nav01{height:auto;overflow:hidden;padding-left:0.5rem;padding-right:0.5rem;} +.bar.bar-nav01 .title{margin-left:-0.5rem;} .bar.bar-nav01 .button-link{color:#F18D00;} /* 底部 */ @@ -894,7 +902,6 @@ input::-webkit-input-placeholder{ .topic .topicTitle > div.content-block{padding:0;margin:0;position:absolute;top:0.6rem;right:0;z-index:100;} .topic .date{text-align:right;font-size:0.75rem;color:#ccc;padding-right:0.75rem;margin:0;} -.buttons-row .button{height:1.35rem;line-height:1.35rem;} .buttons-row01 .button{border-radius:0.1rem;margin-left:0.5rem;padding:0;font-size:0.65rem;} .buttons-row01 .button:first-child,.buttons-row01 .button:last-child{border-radius:0.1rem;} .buttons-row01a .button{width:22%;} @@ -954,7 +961,7 @@ input::-webkit-input-placeholder{ .cardCity01 .card-header label{font-size:1rem;color:#333;} .cardCity01 .card-header .button{top:0.6rem;} .cardCity01 .card-content-inner{padding-bottom:5rem;} -.cardCity01 .card-footer{bottom:1.5rem;} +.cardCity01 .card-footer{bottom:1rem;} .cardCity02{background:url(../images/rankingBg.png) no-repeat center 5rem;background-size:100%;padding:0 0.75rem;padding-top:2.5rem;padding-bottom:0.8rem;border-bottom:none;position:relative;} .cardCity02 .card-footer{background:rgba(255,255,255,0.7);border:solid 1px #e7e7e7;border-radius:0.4rem;padding-top:1.5rem;padding-bottom:0.5rem;bottom:0;} @@ -963,17 +970,22 @@ input::-webkit-input-placeholder{ .cardCity02 .card-footer span:nth-child(2) em{color:#333;} .cardCity02 .card-footer img{width:3.65rem;position:absolute;top:-1.825rem;left:50%;margin-left:-1.825rem;} -.list-block.media-list.cityList ul:before{height:0;} -.list-block.media-list.cityList ul:after{height:0;} -.list-block.media-list.cityList .item-inner{padding-right:0;padding-top:0;padding-bottom:0;min-height:1.5rem;} -.list-block.media-list.cityList .item-inner:after{height:0;} -.list-block.media-list.cityList .item-subtitle{color:#333;} -.list-block.media-list.cityList ul li:nth-child(1) .item-subtitle{color:#999;} -.list-block.media-list.cityList .item-subtitle div:first-child{margin-left:0;} -.list-block.media-list.cityList .item-subtitle div.col-20:last-child em{color:#F18D00;} -.list-block.media-list.cityList .item-subtitle div.col-20{position:relative;} -.list-block.media-list.cityList .item-subtitle div.col-20 .button{width:auto;height:1.1rem;top:0;left:0;right:inherit;font-style:normal;line-height:1rem;} -.list-block.media-list.cityList .item-subtitle div.col-25 .star .icon{margin-right:0;} +.list-block.cityList ul:before{height:0;} +.list-block.cityList ul:after{height:0;} +.list-block.cityList ul.list-container{margin-bottom:0.5rem;} +.list-block.cityList .item-inner{padding-right:0;padding-top:0;padding-bottom:0;min-height:1.5rem;} +.list-block.cityList .item-inner:after{height:0;} +.list-block.cityList .item-subtitle{color:#333;} +.list-block.cityList ul li:nth-child(1) .item-subtitle div{color:#999;} +.list-block.cityList ul.list-container > div .item-subtitle div{color:#999;} +.list-block.cityList .item-subtitle div:first-child{margin-left:0;} +.list-block.cityList .item-subtitle div.col-20{position:relative;height:1.1rem;} +.list-block.cityList .item-subtitle div.col-20:last-child em{color:#F18D00;} +.list-block.cityList .item-subtitle div.col-20 .button{width:auto;height:1.1rem;top:0;left:0;right:inherit;font-style:normal;line-height:1rem;} +.list-block.cityList .item-subtitle div.col-25 .star .icon{margin-right:0;} +.list-block.cityList .item-subtitle div em{font-size:0.7rem;} +.list-block.cityList .item-subtitle div img{width:1rem;margin:0 auto;} +.list-block.cityList > p{font-size:0.7rem;color:#999;text-align:center;} .list-block.dataList ul:before{height:0;} .list-block.dataList ul:after{height:0;} @@ -1079,7 +1091,7 @@ input::-webkit-input-placeholder{ .contentSuggest .noData a{text-decoration:underline;} .contentSuggest .noData a.button{text-decoration:none;} -.topBg02{background:#ecf6ff;border-bottom:solid 1px #e7e7e7;color:#333;text-align:justify;padding-top:1rem;margin-bottom:0.5rem;} +.topBg02{background:#fff;border-bottom:solid 1px #e7e7e7;color:#333;text-align:justify;padding-top:1rem;} .topBg02 p{font-size:0.75rem;} .topBg02 p label{color:#999;font-size:0.75rem;} .topBg02 p em{color:#EB5F34;font-size:0.75rem;} @@ -1152,9 +1164,11 @@ input::-webkit-input-placeholder{ .contentText{background:#fff;} .topBg01{width:100%;background:url(../images/topBg.png) no-repeat center top;background-size:100%;border-bottom:solid 1px #e7e7e7;padding:1.2rem 0.75rem;padding-bottom:0;color:#fff;overflow:hidden;position:relative;} -.topBg01 img{width:3rem;height:3rem;margin:0 auto;margin-top:0.6rem;} -.topBg01 p{font-size:0.7rem;color:#333;text-align:center;margin-top:0.6rem;} -.topBg01 p .button{width:4rem;margin:0 auto;} +.topBg01 > img{width:3rem;height:3rem;margin:0 auto;margin-top:0.6rem;} +.topBg01 > p{text-align:center;} +.topBg01 > p label{font-size:0.7rem;color:#333;display:block;margin-top:0.6rem;position:relative;} +.topBg01 > p label a{font-size:0.7rem;position:absolute;right:0;top:0;} +.topBg01 > p .button{width:4rem;margin:0 auto;} .tabs .noData img{width:30%;margin:0 auto;margin-top:3rem;} @@ -1162,6 +1176,31 @@ input::-webkit-input-placeholder{ .topic .topicContent .topicContent_center.homeWin{width:540px;overflow:hidden;} .topic .topicContent .topicContent_center.homeWin div{width:90px;} +/* 税费计算&房贷计算 */ +.buttons-tab .button{color:#999;} +.cardReference{margin:0;padding-left:0.75rem;} +.cardReference div{padding-left:0;} +.cardReference div:before,.cardReference div:after{height:1px;} +.cardReference .card-header{font-size:0.75rem;} +.cardReference .card-footer{color:#333;} +.cardReference .card-footer span{font-size:0.75rem;color:#999;width:50%;} +.cardReference .card-footer span em{font-size:0.75rem;} +.cardReference + .content-block-title{font-size:0.6rem;} +.cardReference .chart{width:150px;height:150px;margin:0 auto;} +.legendBox p{margin:0.5rem 0;} +.legendBox p label{font-size:0.75rem;color:#999;text-align:right;display:inline-block;width:50%;} +.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%;} + +/* 分享 */ +.shareBox{height:66px;padding-left:0;padding-right:0.5rem;border-top:solid 1px #e7e7e7;bottom:0;} +.shareBox ul:before{height:0;} +.shareBox .list-block .item-media img{width:2.3rem;height:2.3rem;} +.shareBox .list-block .item-title{font-size:0.75rem;line-height:1.2rem;} +.shareBox .list-block .item-title em{color:#F18D00;} +.shareBox .button{top:0.5rem;} +.shareBox .icon-close{width:10px;height:10px;background:url(../images/icon-close.png) no-repeat center center;background-size:100%;position:absolute;top:0.25rem;right:0.25rem;} + /* 出错页面 */ .contentError{padding-top:30%;} .contentError img{width:30%;margin:0 auto;} @@ -1381,6 +1420,7 @@ input[type=range]::-webkit-slider-thumb { .textAlignLeft01{left:110px;} label.spacing01{margin-right:41px;} label.spacing02{margin-right:42px;} + small.spacing{letter-spacing:32px;} small.spacing01a{margin-right:3.7px;} .rangeNote span.span01{margin-right:8.5%;} .rangeNote span.span01a{margin-left:8%;} @@ -1396,6 +1436,7 @@ input[type=range]::-webkit-slider-thumb { .list-block .item-title span.c3a{max-width:180px;} label.spacing01{margin-right:11px;} label.spacing02{margin-right:12px;} + small.spacing{letter-spacing:28px;} .rangeNote span.span01{margin-right:8.5%;} .rangeNote span.span01a{margin-left:9%;} .rangeNote span.span02{margin-right:8%;} @@ -1404,6 +1445,7 @@ input[type=range]::-webkit-slider-thumb { .rangeNote span.span05{margin-right:13%;} } @media(max-width:320px){ + .topic .topicTitle{font-size:0.75rem;} .list-block .item-title span.c3a{max-width:112px;} .list-block .item-title label{max-width:100px;} label.spacing01{margin-right:11px;} @@ -1419,8 +1461,10 @@ input[type=range]::-webkit-slider-thumb { .cardInfo02 img{width:5rem;height:4rem;} .cardInfo02 .item-subtitle{margin-top:0;} .cardCity .card-footer span em strong{font-size:0.9rem;} - .list-block.media-list.cityList ul li:nth-child(1) .item-subtitle div{font-size:0.6rem;} + .list-block.cityList ul li:nth-child(1) .item-subtitle div{font-size:0.6rem;} + .list-block.cityList ul.list-container > div .item-subtitle div{font-size:0.6rem;} .adBoxApp{width:88%;} + .bar-nav01c + .picker-modal-inner .picker-items-col .picker-item{padding:0 5rem;} } @media(min-height:750px){ .bar-tab{bottom:1.7rem;} @@ -1432,10 +1476,12 @@ input[type=range]::-webkit-slider-thumb { @media only screen and (-webkit-min-device-pixel-ratio:2){ .list-block .item-inner:after{-webkit-transform:scaleY(1);transform:scaleY(1);} .buttons-tab:after{-webkit-transform:scaleY(1);transform:scaleY(1);} + .card-header:after,.card-footer:before{-webkit-transform:scaleY(1);transform:scaleY(1);} } @media only screen and (-webkit-min-device-pixel-ratio:3){ .list-block .item-inner:after{-webkit-transform:scaleY(1);transform:scaleY(1);} .buttons-tab:after{-webkit-transform:scaleY(1);transform:scaleY(1);} + .card-header:after,.card-footer:before{-webkit-transform:scaleY(1);transform:scaleY(1);} } diff --git a/fangija-zsyf/images/cardBg01.png b/fangija-zsyf/images/cardBg01.png index c16e2d3..75e93bf 100644 Binary files a/fangija-zsyf/images/cardBg01.png and b/fangija-zsyf/images/cardBg01.png differ diff --git a/fangija-zsyf/img/rankingBg.png b/fangija-zsyf/img/rankingBg.png new file mode 100644 index 0000000..d5d66e7 Binary files /dev/null and b/fangija-zsyf/img/rankingBg.png differ diff --git a/fangija-zsyf/js/ad_position_image.js b/fangija-zsyf/js/ad_position_image.js index 8c77f1c..70c187a 100644 --- a/fangija-zsyf/js/ad_position_image.js +++ b/fangija-zsyf/js/ad_position_image.js @@ -3,10 +3,10 @@ function add_imgage(imageId,adPosition,device){ params:{position : adPosition} }).then(function(response){ if(response.data.status){ - h = response.data.data; + 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(typeof(h.link)!="undefined"&&h.link!=null&&$.trim(h.link)!=""){ var uid = localStorage.getItem("user_id"); var aId=h.id; diff --git a/fangija-zsyf/js/axiosPlugin.js b/fangija-zsyf/js/axiosPlugin.js index bf0c8cc..4c7c481 100644 --- a/fangija-zsyf/js/axiosPlugin.js +++ b/fangija-zsyf/js/axiosPlugin.js @@ -6,6 +6,7 @@ axios.defaults.timeout = 120000; axios.interceptors.request.use(function (config) { var token = localStorage.getItem("user_token"); config.headers.Authorization = token; + config.headers.appVersion = "1.1"; return config; }, function (error) { return Promise.reject(error); diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js index 466160d..d0de800 100644 --- a/fangija-zsyf/js/quotations/cityDetail.js +++ b/fangija-zsyf/js/quotations/cityDetail.js @@ -641,6 +641,7 @@ function docollectCity(city, type){ }); } +//加载城市报告 function loadCityReport(city){ axios.get('/rest/quotations/loadCityReport',{params:{city:city}}).then(function(response){ if(response.status){ @@ -650,6 +651,7 @@ function loadCityReport(city){ }).catch(function(error){console.log(error)}); } +//城市报告参数校验 function paramCheck(param){ if(typeof(param)=="undefined"||param==null||$.trim(param)==""){ return false @@ -657,7 +659,30 @@ function paramCheck(param){ return true } } - +//城市报告参数过滤 +function paramFilter(param){ + if(typeof(param)=="undefined"||param==null||$.trim(param)==""){ + return "暂无" + }else{ + return param + } +} +//城市报告参数截取 +function paramDivisionHead(param){ + if(paramCheck(param)){ + return param.substring(0,param.indexOf("(")==-1?param.indexOf("("):param.indexOf("(")); + }else{ + return "暂无" + } +} +//城市报告参数截取 +function paramDivisionTail(param){ + if(paramCheck(param)){ + return param.substring(param.indexOf("(")==-1?param.indexOf("("):param.indexOf("(")); + }else{ + return "" + } +} diff --git a/fangija-zsyf/js/user/assetsLevel.js b/fangija-zsyf/js/user/assetsLevel.js new file mode 100644 index 0000000..ae10c70 --- /dev/null +++ b/fangija-zsyf/js/user/assetsLevel.js @@ -0,0 +1,66 @@ +//定义对象 +var assetsLevel = new Vue({ + el: '#assetsLevel', + data: { + level: "",//排名 + name: "",//昵称(有昵称显示昵称,没昵称显示手机号) + assets: ""//总资产 + } +}) + +//用户资产排名查询请求 +function initAssetsLevelDetail(){ + //清空ui下的li元素 + $('.list-container').children("li").remove(); + axios.get(BASE_PATH + "/rest/userAssetsLevel/list", + { + params: {} + }).then(function (response) { + var resultsMap = response.data.data; + var resultList = resultsMap.userAssetsLevelList; + var userAssetsLevel = resultsMap.userAssetsLevel; + //父页面已经判断处理, 这里不用考虑数据不存在的情况 + if(resultList != null && resultList.length > 0){ + addItems(resultList, userAssetsLevel); + } + //数据加载完成隐藏loading效果 + $('#loading').hide(); + $('#pageContent').show(); + }).catch(function (error) { + console.log(error); + }); +} + +/* 分页构造数据 */ +function addItems(resultList, userAssetsLevel) { + var htmlContent = ""; + //控制个人部分显示 + assetsLevel.level = userAssetsLevel.level; + assetsLevel.name = userAssetsLevel.name; + assetsLevel.assets = userAssetsLevel.assets; + for(var i in resultList) { + var result = resultList[i]; + htmlContent += "



城市报告
没有更多数据
+上拉查看更多排名
+
+
+
+ 没有更多数据
+上拉查看更多排名
+ +
+
+
+ 没有更多数据
+上拉查看更多排名
+ +
+
+
+ 没有更多数据
+上拉查看更多排名
+ +没有更多数据
+上拉查看更多排名
+ +
城市报告