diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 5cca8c7..8326f0f 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,5 +1,5 @@ /**服务端地址**/ -//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"; diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 48b02b7..23418c6 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -1,6 +1,6 @@ @charset "utf-8"; /* CSS Document */ - +[v-cloak]{display:none;} /* 公用 */ *{font-size:16px;font-family:arial,"华文细黑";} ul li{list-style:none;} @@ -12,18 +12,11 @@ em{font-style:normal;color:#333;} em.up{color:#EB5F34;} em.down{color:#88D053;} */ - -::-webkit-scrollbar{display:none;} -.bt{border-top:solid 0.5rem #f3f3f3;} -.bb{border-bottom:solid 0.5rem #f3f3f3;} - ::../../images{display:none;} - .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;} @@ -283,7 +276,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.5rem;} +.list-block .item-subtitle div.price{position:absolute;bottom:-0.3rem;right:0;} .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;} @@ -301,9 +294,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 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 .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 .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;} @@ -334,7 +327,7 @@ em.down{color:#88D053;} .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.3rem;} +label.label-checkbox i.icon-form-checkbox{margin-right:0.5rem;} 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;} @@ -419,6 +412,7 @@ input::-webkit-input-placeholder{ .list-block .item-subtitle small.small01:nth-of-type(2){background:#fff7e7;color:#f5b715;} .list-block .item-subtitle small.small01:nth-of-type(3){background:#e9f8f0;color:#88D053;} .list-block .item-subtitle small.small04{color:#fff;} +.delete_btn{width:12px;height:15px;background:url(../images/delete.png) no-repeat left center;background-size:100%;float:right;margin-right:0.75rem;margin-top:0.3rem;} /* 卡片 */ .card{border-radius:0;box-shadow:none;} @@ -451,7 +445,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.3rem;} +.cardPrice01 .card-footer{width:100%;padding:0 0.75rem;background:none;position:absolute;bottom:0;} .cardPrice01 .card-footer span{width:50%;border-right:none;text-align:left;} .cardPrice01 .card-footer span:last-child{text-align:right;} @@ -472,7 +466,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 .cardNearbyWin{margin-bottom:0.25rem;} +.cardNearbyBox01 .cardNearby../../images{margin-bottom:0.25rem;} .cardNearbyBox01 .cardNearby{border:solid 1px #e7e7e7;} .cardNearbyBox01 .cardNearby .card-header{padding-top:0.25rem;line-height:1.2rem;} @@ -715,6 +709,7 @@ input::-webkit-input-placeholder{ .topic .topicTitle > div:nth-child(2){text-align:right;float:right;} .topic .topicTitle > div:nth-child(2) p label{color:#999;} .topic .topicTitle > div:nth-child(2) p em{color:#EB5F34;} + .topic .topicTitle.topicTitle01{border-bottom:none;} .topic .topicContent .topicTitle01{color:#333;margin-top:0;font-size:0.8rem;} .topic .topicContent .topicTitle01 em{font-size:1.2rem;} @@ -864,7 +859,7 @@ input::-webkit-input-placeholder{ .topic .topicContent .topicContent_bottom01 label em{color:#EB5F34;margin-left:0.1rem;} /* 广告 */ -.ad{display:block;} +.ad{display:block;border-bottom:solid 0.5rem #f3f3f3;} .ad img{width:100%;} /* 图表 */ @@ -877,6 +872,12 @@ input::-webkit-input-placeholder{ .icon-chart01a{width:0.9rem;height:0.8rem;background:url(../images/icon-chart01a.png) no-repeat center center;background-size:100%;float:left;} .icon-chart01{width:0.9rem;height:0.8rem;background:url(../images/icon-chart01.png) no-repeat center center;background-size:100%;float:left;} + +/* +#tabChart{width:100%;height:360px;} +#tabChart1{width:100%;position:absolute;z-index:1;} +#tabChart2{width:100%;display:block;position:absolute;z-index:-1;} +*/ .scoreBox{height:130px;position:relative;} .score{width:250px;height:250px;margin:0 auto;margin-top:1rem;} .scoreText{width:250px;height:150px;position:absolute;top:0;left:50%;margin-left:-125px;} @@ -898,6 +899,7 @@ 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%;} @@ -957,7 +959,6 @@ 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;} .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;} @@ -967,22 +968,17 @@ 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.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.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.dataList ul:before{height:0;} .list-block.dataList ul:after{height:0;} @@ -1088,7 +1084,7 @@ input::-webkit-input-placeholder{ .contentSuggest .noData a{text-decoration:underline;} .contentSuggest .noData a.button{text-decoration:none;} -.topBg02{background:#fff;border-bottom:solid 1px #e7e7e7;color:#333;text-align:justify;padding-top:1rem;} +.topBg02{background:#ecf6ff;border-bottom:solid 1px #e7e7e7;color:#333;text-align:justify;padding-top:1rem;margin-bottom:0.5rem;} .topBg02 p{font-size:0.75rem;} .topBg02 p label{color:#999;font-size:0.75rem;} .topBg02 p em{color:#EB5F34;font-size:0.75rem;} @@ -1161,11 +1157,9 @@ 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{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;} +.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;} .tabs .noData img{width:30%;margin:0 auto;margin-top:3rem;} @@ -1404,7 +1398,6 @@ 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%;} @@ -1420,7 +1413,6 @@ 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%;} @@ -1429,7 +1421,6 @@ 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;} @@ -1445,10 +1436,8 @@ 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.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;} + .list-block.media-list.cityList ul li:nth-child(1) .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;} 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/user/myMessage.js b/fangija-zsyf/js/user/myMessage.js index d4ce568..1bc578a 100644 --- a/fangija-zsyf/js/user/myMessage.js +++ b/fangija-zsyf/js/user/myMessage.js @@ -23,8 +23,9 @@ function addMessage(loadNum,startNum){ return; } mm_totalCount = response.data.data.totalCount; + var unReadNum = response.data.data.unReadNum; // tab.mm_num = mm_totalCount; - $("#mm_num").html("消息("+mm_totalCount+")") + $("#mm_num").html("消息("+unReadNum+")") var html=""; $.each(messageList,function(){ // var clickStr = ""; @@ -67,7 +68,10 @@ function messageGoto(_this,operation,operationPage,mid){ bottom: '50px', }; axios.post('/rest/message/readMesage',{mid:mid}).then(function(response){ - console.log(response) + if(response.status){ + var unReadNum = response.data.data; + $("#mm_num").html("消息("+unReadNum+")") + } }).catch(function(error){ console.log(error) }); diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index 4063ebe..7dfbec1 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -7,7 +7,7 @@ "id": "H5693FF3D",/*应用的标识,创建应用时自动生成,勿手动修改*/ "name": "有房",/*应用名称,程序桌面图标名称*/ "version": { - "name": "1.1.6",/*应用版本名称*/ + "name": "1.1.9",/*应用版本名称*/ "code": "20109" }, "description": "有房,围绕房产提供全方位数据分析的房产及金融服务平台,通过个性化的智能推荐,定制专属的个人投资或购房计划,多维度管理自有房产并提供房产融资通道。",/*应用描述信息*/ diff --git a/fangija-zsyf/views/city/regionRanking.html b/fangija-zsyf/views/city/regionRanking.html new file mode 100644 index 0000000..178947b --- /dev/null +++ b/fangija-zsyf/views/city/regionRanking.html @@ -0,0 +1,157 @@ + + +
+ + +