diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 4f9f15a..4380bdf 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.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 a292556..9544449 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -7,15 +7,20 @@ ul li{list-style:none;} img{display:block;} a{color:#F18D00;} a:active{color:#F18D00;} +input{line-height:inherit;} 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;} @@ -275,7 +280,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;} @@ -293,9 +298,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;} @@ -324,8 +329,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;} @@ -443,7 +449,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;} @@ -464,7 +470,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;} @@ -497,13 +503,6 @@ input::-webkit-input-placeholder{ .cardInfo01a .card-footer span strong{font-size:0.75rem;color:#333;font-weight:normal;} .tag small{height:0.9rem;border:solid 1px #FFD038;border-radius:2px;padding:0 5px;font-size:80%;color:#F5A100;line-height:0.9rem;margin-left:0.2rem;display:inline-block;} -/* -.tag small:nth-child(1){background:#E7F2FF;color:#76A5DD;margin-left:0;} -.tag small:nth-child(2){background:#E6F9E6;color:#6FBA6F;} -.tag small:nth-child(3){background:#FDF3DD;color:#E8AF27;} -.tag small:nth-child(4){background:#FDE9E2;color:#DD7B57;} -.tag small:nth-child(5){background:#F5EFFF;color:#A585D6;} -*/ .cardInfo01b .card-footer span{font-size:0.7rem;color:#999;display:inline-block;width:100%;word-wrap:break-word;white-space:normal;} @@ -531,6 +530,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;} @@ -546,7 +548,8 @@ 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;line-height:1.5rem;letter-spacing:0.06rem;text-align:justify;clear:both;overflow:hidden;} +.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 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%;} @@ -612,14 +615,14 @@ input::-webkit-input-placeholder{ .top{width:100%;padding:0.75rem 0.5rem;border-bottom:solid 1px #e7e7e7;overflow:hidden;position:absolute;top:0;z-index:10;} .top.bar{height:auto;} .top.bar ~ .content{top:66px;} -.top .searchBox{background:#EFEFEF;border-radius:0.25rem;overflow:hidden;padding:0.3rem 0;} -.top .searchBox .cityChoice{float:left;margin-left:0.5rem;margin-right:0.5rem;} -.top .searchBox .cityChoice a{color:#333;display:inline-block;} -.top .searchBox .cityChoice i{width:10px;height:5px;background:url(../images/arrow_select.png) no-repeat center center;background-size:100%;display:inline-block;vertical-align:middle;margin-left:0.2rem;} -.top .searchBox span{float:left;border-left:solid 1px #e0e0e0;overflow:hidden;} -.top .searchBox span input{width:85%;background:none;padding-left:0.25rem;display:inline-block;vertical-align:text-bottom;border:none;font-size:0.7rem;} -.top .searchBox span i{width:16px;height:16px;background:url(../images/search.png) no-repeat left center;background-size:100%;display:inline-block;vertical-align:text-bottom;margin-left:0.3rem;} -.top .searchBox .cancel{float:right;color:#2db0fc;} +.top .icon{color:#b4b4b4;padding:0;} +.top .searchBox{background:#EFEFEF;border-radius:0.25rem;padding:0.3rem 0;position:relative;} +.top .searchBox .cityChoice{width:24%;height:26px;margin-left:0.5rem;border-right:solid 1px #e0e0e0;position:absolute;left:0;z-index:100;} +.top .searchBox .cityChoice a{color:#333;line-height:20px;display:inline-block;vertical-align:middle;max-width:70px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} +.top .searchBox .cityChoice i{font-size:0.5rem;right:-0.3rem;} +.top .searchBox span{width:100%;height:26px;display:block;position:relative;} +.top .searchBox span i{font-size:0.9rem;left:34%;padding-left:0.2rem;} +.top .searchBox span input{width:90%;background:none;border:none;padding-left:35%;display:inline-block;vertical-align:middle;line-height:20px;} .top01{background:#fff;border-bottom:solid 1px #e7e7e7;padding:0 0.5rem;} .top01 .searchBox{background:none;} @@ -645,8 +648,9 @@ input::-webkit-input-placeholder{ .popup .bar .searchbar .searchbar-cancel{line-height:36px;} .popup .bar .searchbar .col-5{margin-left:1.5%;margin-right:2.5%;} .popup .bar .searchbar .icon-left{padding:0;line-height:38px;color:#666;} -.popup .bar .searchbar .search-input input{height:36px;border:solid 1px #e6e6ea;} +.popup .bar .searchbar .search-input input{height:36px;line-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;} /* 底部 */ @@ -863,8 +867,11 @@ input::-webkit-input-placeholder{ #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:45%;float:left;padding:0 1rem;} -.icon-chart01{width:1.1rem;height:1rem;background:url(../images/icon-chart01.png) no-repeat center center;background-size:45%;float:left;padding:0 1rem;} +.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;} .scoreBox{height:130px;position:relative;} .score{width:250px;height:250px;margin:0 auto;margin-top:1rem;} @@ -887,7 +894,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%;} @@ -947,19 +953,31 @@ 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;} -.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;} +.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;} +.cardCity02 .card-footer span{border-right:0;} +.cardCity02 .card-footer span em{color:#EB5F34;display:block;} +.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.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;} @@ -1002,19 +1020,12 @@ 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;} +.cardRankingBox01 .cardRanking .card-header{border-right:solid 1px #e7e7e7;padding-top:0;color:#333;} .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;} .cardRankingBox01 .cardRanking .card-footer em{color:#EB5F34;} -/* -.swiper-container{height:auto;padding-bottom:0;} -.swiper-pagination-bullet{background:none;border:solid 1px #d7d7d7;opacity:1;} -.swiper-pagination-bullet-active{background:#F18D00;border:solid 1px #F18D00;} -.swiper-container-horizontal > .swiper-pagination{top:11.2rem;bottom:inherit;} -*/ - /* 贷款 */ .banner{width:100%;height:80px;background:url(../images/banner.png);background-size:100%;margin-bottom:0.5rem;} .banner .content-block{padding:0 2rem;padding-top:1rem;} @@ -1065,7 +1076,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;} @@ -1138,9 +1149,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;} @@ -1148,6 +1161,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;} @@ -1362,11 +1400,15 @@ input[type=range]::-webkit-slider-thumb { /* 自适应 */ @media(max-width:414px){ + .top .searchBox .cityChoice{width:24%;} + .top .searchBox span i{left:28%;} + .top .searchBox span input{padding-left:29%;} .list-block .item-title span.c3a{max-width:220px;} .textAlignLeft{left:88px;} .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%;} @@ -1379,9 +1421,13 @@ input[type=range]::-webkit-slider-thumb { .guideBox02 .link{margin-top:17.7rem;} } @media(max-width:375px){ + .top .searchBox .cityChoice{width:26%;} + .top .searchBox span i{left:29%;} + .top .searchBox span input{padding-left:30%;} .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%;} @@ -1390,6 +1436,10 @@ input[type=range]::-webkit-slider-thumb { .rangeNote span.span05{margin-right:13%;} } @media(max-width:320px){ + .top .searchBox .cityChoice{width:30%;} + .top .searchBox span i{left:34%;} + .top .searchBox span input{padding-left:35%;} + .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;} @@ -1405,8 +1455,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;} @@ -1417,11 +1469,13 @@ 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);} + .bar:after,.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);} + .bar:after,.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/error.html b/fangija-zsyf/error.html index 5b68447..a45d5dc 100644 --- a/fangija-zsyf/error.html +++ b/fangija-zsyf/error.html @@ -38,12 +38,31 @@

重启应用 - 返回刷新 + 返回刷新

+ \ No newline at end of file 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/images/icon-chart01_common.png b/fangija-zsyf/images/icon-chart01_common.png new file mode 100644 index 0000000..0cee2f1 Binary files /dev/null and b/fangija-zsyf/images/icon-chart01_common.png differ diff --git a/fangija-zsyf/images/icon-chart01a_common.png b/fangija-zsyf/images/icon-chart01a_common.png new file mode 100644 index 0000000..581d3a2 Binary files /dev/null and b/fangija-zsyf/images/icon-chart01a_common.png differ diff --git a/fangija-zsyf/images/rankingBg.png b/fangija-zsyf/images/rankingBg.png new file mode 100644 index 0000000..d5d66e7 Binary files /dev/null and b/fangija-zsyf/images/rankingBg.png differ diff --git a/fangija-zsyf/images/rankingCup01.png b/fangija-zsyf/images/rankingCup01.png new file mode 100644 index 0000000..5c31b9e Binary files /dev/null and b/fangija-zsyf/images/rankingCup01.png differ diff --git a/fangija-zsyf/images/rankingCup02.png b/fangija-zsyf/images/rankingCup02.png new file mode 100644 index 0000000..1a825eb Binary files /dev/null and b/fangija-zsyf/images/rankingCup02.png differ diff --git a/fangija-zsyf/images/rankingCup03.png b/fangija-zsyf/images/rankingCup03.png new file mode 100644 index 0000000..32d659a Binary files /dev/null and b/fangija-zsyf/images/rankingCup03.png differ diff --git a/fangija-zsyf/images/rankingCup04.png b/fangija-zsyf/images/rankingCup04.png new file mode 100644 index 0000000..8c338f7 Binary files /dev/null and b/fangija-zsyf/images/rankingCup04.png differ diff --git a/fangija-zsyf/images/rankingCup05.png b/fangija-zsyf/images/rankingCup05.png new file mode 100644 index 0000000..a89fd12 Binary files /dev/null and b/fangija-zsyf/images/rankingCup05.png differ diff --git a/fangija-zsyf/images/rankingImg01a.png b/fangija-zsyf/images/rankingImg01a.png new file mode 100644 index 0000000..41e3a4a Binary files /dev/null and b/fangija-zsyf/images/rankingImg01a.png differ diff --git a/fangija-zsyf/images/rankingImg02a.png b/fangija-zsyf/images/rankingImg02a.png new file mode 100644 index 0000000..00e5f05 Binary files /dev/null and b/fangija-zsyf/images/rankingImg02a.png differ diff --git a/fangija-zsyf/images/rankingImg03a.png b/fangija-zsyf/images/rankingImg03a.png new file mode 100644 index 0000000..ed73789 Binary files /dev/null and b/fangija-zsyf/images/rankingImg03a.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/axiosPlugin.js b/fangija-zsyf/js/axiosPlugin.js index 4c7c481..1195d34 100644 --- a/fangija-zsyf/js/axiosPlugin.js +++ b/fangija-zsyf/js/axiosPlugin.js @@ -22,9 +22,10 @@ axios.interceptors.response.use(function (response) { return response; }, function (error) { try { + if(error=="Error: Network Error" || error.toString().indexOf('timeout') > -1){ if(plus.webview.getWebviewById('error.html')==null){ - clicked('error.html',true,false,{},{},function(){ + clicked('error.html',true,false,{},{flag:1},function(){ window.location.reload(); }) }else{ diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index 4306c8c..6ffdf33 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -1,5 +1,8 @@ var colorList = ['#c23531', '#2f4554', '#61a0a8', '#d48265', '#91c7ae', '#749f83', '#ca8622', '#bda29a', '#6e7074', '#546570', '#c4ccd3']; var labelFont = 'bold 12px Sans-serif'; +var date = new Date(); +var year = date.getFullYear(); +var month = date.getMonth()+1; var dates; var data; @@ -114,7 +117,8 @@ function clickLineChart(type){ } /* 图表切换 */ -function lineChart() { + +/*function lineChart() { mode = "kLine" $(".icon-chart01a").hide(); $(".icon-chart01").show(); @@ -135,7 +139,33 @@ function kLineChart() { $("#chart01a").show(); $("#chart01").hide(); loadLineData(city, region, name, type); -}; +};*/ + +$("body").delegate(".icon-chart01a-no", "click", function () { + $(this).addClass("icon-chart01a"); + $(this).removeClass("icon-chart01a-no"); + $(this).parent().find(".icon-chart01").addClass("icon-chart01-no") + $(this).parent().find("i").removeClass("icon-chart01") + mode = "line" + var type = $("#trendDiv1 a.active").attr("t-v"); + $("#chart01a").show(); + $("#chart01").hide(); + loadLineData(city, region, name, type); +}) + +$("body").delegate(".icon-chart01-no", "click", function () { + + $(this).addClass("icon-chart01"); + $(this).removeClass("icon-chart01-no"); + $(this).parent().find(".icon-chart01a").addClass("icon-chart01a-no") + $(this).parent().find("i").removeClass("icon-chart01a") + mode = "kLine" + var type = $("#trendDiv1 a.active").attr("t-v"); + $("#chart01a").hide(); + $("#chart01").show(); + loadKLineData(city, region, name, type); + +}) function showLoadRentTrends(type) { @@ -199,7 +229,16 @@ function doLoadKLineData(city, region, name, type){ var counts = []; var times = [] var haveCount = false; + var curMonth; + if(month<10){ + curMonth = year+"-0"+month; + }else{ + curMonth = year+"-"+month; + } for(var d in datas){ + if(d == curMonth){ + continue; + } times.push(d); var prices = new Array(); @@ -268,7 +307,6 @@ function showTrends(v){ var option01 = { - animation: false, color: colorList, title: { text: null, @@ -280,9 +318,6 @@ var option01 = { data: ['均价'] }, tooltip: { - triggerOn: 'none', - transitionDuration: 0, - confine: true, bordeRadius: 4, borderWidth: 1, borderColor: '#333', @@ -292,19 +327,21 @@ var option01 = { color: '#333' }, formatter: function (params) { - var res = params[0].seriesName + ' ' + params[0].name; - res += '
月初 : ' + params[0].value[1]+ '元/㎡'; - res += '
月末 : ' + params[0].value[2]+ '元/㎡'; - res += '
最低 : ' + params[0].value[3]+ '元/㎡'; - res += '
最高 : ' + params[0].value[4]+ '元/㎡'; - return res; - }, - position: function (pos, params, el, elRect, size) { - var obj = { - top: 60 - }; - obj[['left', 'right'][+(pos[0] < size.viewSize[0] / 2)]] = 5; - return obj; + var res = params.seriesName + ' ' + params.name; + var vals = params.value; + if(vals == undefined){ + var obj = params[0]; + res = obj.seriesName + ' ' + obj.name; + vals = obj.value; + } + if(vals){ + res += '
月初 : ' + vals[1]+ '元/㎡'; + res += '
月末 : ' + vals[2]+ '元/㎡'; + res += '
最低 : ' + vals[3]+ '元/㎡'; + res += '
最高 : ' + vals[4]+ '元/㎡'; + return res; + } + } }, axisPointer: { @@ -313,20 +350,10 @@ var option01 = { }] }, dataZoom: [{ - type: 'slider', - xAxisIndex: [0, 1], - realtime: false, - start: 1, - end: 99, - top: 5, - height: 20, - handleIcon: 'M10.7,11.9H9.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4h1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z', - handleSize: '120%' - }, { type: 'inside', xAxisIndex: [0, 1], - start: 40, - end: 70, + start: 1, + end: 99, top: 30, height: 20 }], @@ -369,7 +396,7 @@ var option01 = { triggerTooltip: true, handle: { show: true, - margin: -70, + margin: -90, color: '#F18D00' } } @@ -412,7 +439,7 @@ var option01 = { grid: [{ left: 20, right: 20, - top: 60, + top: 30, height: 120 }, { left: 20, @@ -763,7 +790,7 @@ function doLoadLineData(city, region, name, type){ function showLineChart(times, datas){ var option01b = { tooltip: { - triggerOn: 'none', + //triggerOn: 'none', transitionDuration: 0, confine: true, bordeRadius: 4, @@ -791,11 +818,11 @@ function showLineChart(times, datas){ y: 10, x2: 20, y2: 60, - top: 60, + top: 30, height: 120 }, color: ['#78CDE6'], - dataZoom: [{ + /*dataZoom: [{ realtime: false, start: 1, end: 99, @@ -803,7 +830,7 @@ function showLineChart(times, datas){ height: 20, handleIcon: 'M10.7,11.9H9.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4h1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z', handleSize: '120%' - }], + }],*/ xAxis: { type: 'category', boundaryGap: false, diff --git a/fangija-zsyf/js/push-common.js b/fangija-zsyf/js/push-common.js index f56b582..5dab9c5 100644 --- a/fangija-zsyf/js/push-common.js +++ b/fangija-zsyf/js/push-common.js @@ -1,3 +1,8 @@ + String.prototype.startWith=function(str){ + var reg=new RegExp("^"+str); + return reg.test(this); +} + /** * 推送处理业务逻辑 * yinjihuan @@ -27,53 +32,120 @@ document.addEventListener("plusready", function() { if (payload.type == "0") { plus.ui.alert(title+"\n"+content); } else if (payload.type == "1") { - plus.ui.alert(title+"\n"+content,function(){ - 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'); + + 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, ["查看","忽略"] ); + + } else if (payload.type == "2") { - plus.ui.alert(title+"\n"+content,function(){ - clicked('views/webview_embed.html', true,false,{},{url:payload.url}) - }); + 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, ["查看","忽略"] ); + + } 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]; + } + } + } + clicked(openUrl,true,false,{},jsonData) + } + }, title, ["查看","忽略"] ); + + } } } else { if (payload.type == "0") { plus.ui.alert(content); } else if (payload.type == "1") { - plus.ui.alert(title+"\n"+content,function(){ - 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'); + 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, ["查看","忽略"] ); + } else if (payload.type == "2") { - plus.ui.alert(content,function(){ - clicked('views/webview_embed.html', true,false,{},{url:payload.url}) - }); + 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, ["查看","忽略"] ); + + } 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]; + } + } + } + clicked(openUrl,true,false,{},jsonData) + } + }, title, ["查看","忽略"] ); + + } + } } @@ -93,36 +165,54 @@ document.addEventListener("plusready", function() { if (payload.type == "0") { plus.ui.alert(title+"\n"+content); } else if (payload.type == "1") { - plus.ui.alert(title+"\n"+content,function(){ - if (payload.url == '/house/index') { - plus.webview.show('yfindex.html'); - } else { - plus.webview.show(BASE_PATH + payload.url); - } - //切换选项卡高亮 - var defaultTab = document.getElementById("defaultTab"); - var quotations = document.getElementById("quotations"); - var selfInfo = document.getElementById("selfInfo"); - defaultTab.classList.remove("mui-active"); - quotations.classList.remove("mui-active"); - selfInfo.classList.remove("mui-active"); - if (payload.url == '/quotations/index') { - quotations.classList.add("mui-active"); - } else if(payload.url == '/selfInfo/index') { - selfInfo.classList.add("mui-active"); - } else { - defaultTab.classList.add("mui-active"); - } - }); + plus.nativeUI.confirm(content, function(e){ + if (e.index==0) { + if (payload.url == '/house/index') { + plus.webview.show('yfindex.html'); + } else { + plus.webview.show(BASE_PATH + payload.url); + } + + //切换选项卡高亮 + var defaultTab = document.getElementById("defaultTab"); + var quotations = document.getElementById("quotations"); + var selfInfo = document.getElementById("selfInfo"); + defaultTab.classList.remove("mui-active"); + quotations.classList.remove("mui-active"); + selfInfo.classList.remove("mui-active"); + if (payload.url == '/quotations/index') { + quotations.classList.add("mui-active"); + } else if(payload.url == '/selfInfo/index') { + selfInfo.classList.add("mui-active"); + } else { + defaultTab.classList.add("mui-active"); + } + } + }, title, ["查看","忽略"] ); + } else if (payload.type == "2") { - plus.ui.alert(title+"\n"+content,function(){ - openUrl(BASE_PATH+'/message/openView?url='+payload.url); - }); + 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]; + } + } + } + clicked(openUrl,true,false,{},jsonData) + } + }, title, ["查看","忽略"] ); + } }, false); }, false); -function openUrl(url){ - clicked(url,true); -} \ No newline at end of file diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js index 2ba1351..6a13d20 100644 --- a/fangija-zsyf/js/quotations/cityDetail.js +++ b/fangija-zsyf/js/quotations/cityDetail.js @@ -477,6 +477,7 @@ function addUpChart(dataUp, num){ } }, color: ['#EB5F34', '#e7e7e7'], + animation:false, series: [ { name: '小区上涨', @@ -522,6 +523,7 @@ function addDownChart(dataDown){ } }, color: ['#88D053', '#e7e7e7'], + animation:false, series: [ { name: '小区下跌', @@ -641,6 +643,48 @@ function docollectCity(city, type){ }); } +//加载城市报告 +function loadCityReport(city){ + axios.get('/rest/quotations/loadCityReport',{params:{city:city}}).then(function(response){ + if(response.status){ + var cityReport = response.data.data; + cityInfoVue.cityReport = cityReport; + } + }).catch(function(error){console.log(error)}); + +} +//城市报告参数校验 +function paramCheck(param){ + if(typeof(param)=="undefined"||param==null||$.trim(param)==""){ + return false + }else{ + 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/updateVersion/updateVersion.js b/fangija-zsyf/js/updateVersion/updateVersion.js index 179a24f..99b57a0 100644 --- a/fangija-zsyf/js/updateVersion/updateVersion.js +++ b/fangija-zsyf/js/updateVersion/updateVersion.js @@ -57,7 +57,7 @@ var versionInfo = function(){ //下载后安装 var downApp = function(){ var url="http://app.fangjia.com/download/youfang.apk"; //下载文件地址 - plus.nativeUI.showWaiting("下载apk文件..."); + plus.nativeUI.showWaiting("版本更新中..."); var dtask = plus.downloader.createDownload( url, {}, function ( d, status ) { if (status == 200) { //下载成功 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 += "
  • "; + htmlContent += "
    "; + if(i == 0){ + htmlContent += "
    "; + }else if(i == 1){ + htmlContent += "
    "; + }else if(i == 2){ + htmlContent += "
    "; + }else{ + htmlContent += Number(i)+1+""; + } + htmlContent += "
    "+result.name+"
    "; + htmlContent += "
    "+result.assets+"万元
    "; + htmlContent += "
  • "; + } + $('.list-container').append(htmlContent); +} + +document.addEventListener('plusready', onPlusReady, false); + +function onPlusReady(){ + //初始化数据 + initAssetsLevelDetail(); +} diff --git a/fangija-zsyf/js/user/myMessage.js b/fangija-zsyf/js/user/myMessage.js index 1bc578a..2bc6f66 100644 --- a/fangija-zsyf/js/user/myMessage.js +++ b/fangija-zsyf/js/user/myMessage.js @@ -1,3 +1,8 @@ + String.prototype.startWith=function(str){ + var reg=new RegExp("^"+str); + return reg.test(this); +} + //加载flag var mm_loading = false; //最多可加载的条目 @@ -97,7 +102,28 @@ function messageGoto(_this,operation,operationPage,mid){ } if(operation==2){ if (operationPage != null && operationPage != "") { - clicked('../webview_embed.html', true,false,{},{url:operationPage}) + if (operationPage.startWith("http")) { + clicked('../webview_embed.html', true,false,{},{url:operationPage}) + } else { + // 处理打开app中的二级页面,一级页面在type=1中已经处理了,如果有http的地址就是打开外部页面 + // 否则就是打开app内部页面 + var url = operationPage; + 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) + } + } } diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index 9435ac6..b1dca64 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -13,7 +13,7 @@ + + + + +
    +
    +
    + + +

    全国下跌列表

    +
    +
    +
    + +

    没有更多数据

    +

    上拉查看更多排名

    +
    + +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/house/cityRanking.html b/fangija-zsyf/views/house/cityRanking.html new file mode 100644 index 0000000..329f6c0 --- /dev/null +++ b/fangija-zsyf/views/house/cityRanking.html @@ -0,0 +1,269 @@ + + + + + +城市涨幅排行 + + + + + + + + + + + + + +
    +
    +
    + + +

    城市涨幅排行

    +
    +
    +
    + +
    +
    + +

    没有更多数据

    +

    上拉查看更多排名

    + +
    + +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/house/cityRankingAvgPrice.html b/fangija-zsyf/views/house/cityRankingAvgPrice.html new file mode 100644 index 0000000..d864d72 --- /dev/null +++ b/fangija-zsyf/views/house/cityRankingAvgPrice.html @@ -0,0 +1,276 @@ + + + + + +城市均价排行 + + + + + + + + + + + + + +
    +
    +
    + + +

    城市均价排行

    +
    +
    +
    + +
    +
    + +

    没有更多数据

    +

    上拉查看更多排名

    + +
    + +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/house/cityRankingPotential.html b/fangija-zsyf/views/house/cityRankingPotential.html new file mode 100644 index 0000000..5141417 --- /dev/null +++ b/fangija-zsyf/views/house/cityRankingPotential.html @@ -0,0 +1,292 @@ + + + + + +城市潜力排行 + + + + + + + + + + + + + +
    +
    +
    + + +

    城市潜力排行

    +
    +
    +
    + +
    +
    + +

    没有更多数据

    +

    上拉查看更多排名

    + +
    + +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/house/cityUpRanking.html b/fangija-zsyf/views/house/cityUpRanking.html new file mode 100644 index 0000000..89f6deb --- /dev/null +++ b/fangija-zsyf/views/house/cityUpRanking.html @@ -0,0 +1,223 @@ + + + + + +全国上涨列表 + + + + + + + + + + + + + + +
    +
    +
    + + +

    全国上涨列表

    +
    +
    +
    + +

    没有更多数据

    +

    上拉查看更多排名

    + +
    + +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index ceb5bf7..5871341 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -234,8 +234,8 @@
    均价  
    - - + +
    diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index d00da5c..60d001c 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -59,11 +59,11 @@
    - + {{upRate}}% - + {{downRate}}% @@ -89,31 +89,32 @@
    - + +
    +
    城市报告
    +
    + +
    +
    +
    +
      +
    • +
      +
      总人口:{{paramDivisionHead(cityReport.population)}}{{paramDivisionTail(cityReport.population)}}
      +
      +
    • +
    • +
      +
      面积:{{paramFilter(cityReport.area)}}
      +
      +
    • +
    • +
      +
      发展指数:{{paramDivisionHead(cityReport.humanDevelopmentIndex)}}{{paramDivisionTail(cityReport.humanDevelopmentIndex)}}
      +
      +
    • +
    • +
      +
      行政区级别:{{paramFilter(cityReport.administrativeDivision)}}
      +
      +
    • +
    +
    +
    +
    +
    +
      +
    • +
      +
      生产总值:{{paramDivisionHead(cityReport.grp)}}{{paramDivisionTail(cityReport.GRP)}}
      +
      +
    • +
    • +
      +
      人均生产总值:{{paramDivisionHead(cityReport.gnpp)}}{{paramDivisionTail(cityReport.GNPP)}}
      +
      +
    • +
    • +
      +
      人均支配收入:{{paramDivisionHead(cityReport.perCapitaIncome)}}{{paramDivisionTail(cityReport.perCapitaIncome)}}
      +
      +
    • +
    +
    +
    +
    +
    +
      +
    • +
      +
      著名景点:{{paramFilter(cityReport.famousScenery)}}
      +
      +
    • +
    • +
      +
      著名高校:{{paramFilter(cityReport.famousUniversities)}}
      +
      +
    • +
    +
    +
    +
    +
    +
      +
    • +
      +
      气候条件:{{paramFilter(cityReport.weatherConditions)}}
      +
      +
    • +
    • +
      +
      地理位置:{{paramFilter(cityReport.geographicPosition)}}
      +
      +
    • +
    +
    +
    +
    +
    +
      +
    • +
      +
      机场:{{paramFilter(cityReport.airport)}}
      +
      +
    • +
    • +
      +
      火车站:{{paramFilter(cityReport.railwayStation)}}
      +
      +
    • +
    +
    +
    +
    +
    +
    +
    热门小区
    @@ -1222,7 +1352,6 @@ $.config = {router: false} - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index f7933d3..021d913 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -118,7 +118,7 @@
    -


    +

    @@ -434,7 +434,7 @@ function selectUserInfo(){ var mobile = result.mobile; //加载个人信息时候为该变量赋值 _mobile = result.mobile; - $('#user_mobile').html(mobile.substring(0,3)+'****'+mobile.substring(7)+'
    '); + $('#user_mobile').text(mobile.substring(0,3)+'****'+mobile.substring(7)); if(result.headImg != null && result.headImg.length > 0){ $('#user_headImg').attr('src', result.headImg); } @@ -483,12 +483,12 @@ $(document).on("click",".confirm-ok", function () { function initMyHouseParams(){ mh_loading = false; mh_page = undefined; - var mh_pageSize = undefined; - var mh_totalPages = undefined; - var mh_totalRecords = undefined; - var mh_lastIndex = undefined; - var mh_itemsPerLoad = undefined; - var mh_maxItems = 100; + mh_pageSize = undefined; + mh_totalPages = undefined; + mh_totalRecords = undefined; + mh_lastIndex = undefined; + mh_itemsPerLoad = undefined; + mh_maxItems = 100; //清空构造的container $('#myhouse').html(''); // 删除加载提示符 diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index db84aea..3bde691 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -37,8 +37,8 @@
    暂无数据
    -
    {{momAvgPrice}}元/㎡
    +
    {{momAvgPrice}}元/㎡
    @@ -118,7 +118,7 @@
    -
    今日推荐
    +
    热门推荐
    @@ -1195,6 +1195,7 @@ $.config = {router: false}