diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 4d0b28f..a126994 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,8 +1,8 @@ /**服务端地址**/ //var BASE_PATH = "http://192.168.10.128:8084"; //var BASE_PATH = "http://192.168.10.47:8086"; -var BASE_PATH = "http://192.168.10.161:8086"; +var BASE_PATH = "http://192.168.10.161:8084"; //var BASE_PATH = "http://192.168.10.53:8084"; -var BASE_PATH = "http://192.168.10.171:8084"; +//var BASE_PATH = "http://192.168.10.170:8084"; /**是否显示过启动页面**/ var lauchFlag = false; \ No newline at end of file diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 25a7c2e..0666237 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -298,8 +298,9 @@ em.down{color:#88D053;} .popup-about02 .list-block.historyList{margin-top:-1px;} .popup-about02 .list-block.historyList .searchHistory{padding-top:0;} .newCss ul{padding:0.75rem;padding-top:0;padding-left:0.25rem;overflow:hidden;} -.newCss ul li{background:#F4F4F4;border-radius:0.16rem;display:inline-block;margin-left:0.5rem;margin-bottom:0.5rem;padding:0 0.5rem;line-height:1.5rem;} +.newCss ul li{background:#F4F4F4;border-radius:0.16rem;display:inline-block;margin-left:0.5rem;margin-bottom:0.5rem;padding:0 0.5rem;line-height:1.5rem;font-size:0.65rem;color:#333;} .newCss ul li span{font-size:0.65rem;color:#333;} +.newCss ul li a{font-size:0.65rem;color:#333;} .newCss ul:before,.popup-about02 .list-block.newCss ul:after{height:0;} .content-padded + .newCss ul{padding-bottom:0;} @@ -479,7 +480,7 @@ input::-webkit-input-placeholder{ .tag small:nth-child(5){background:#F5EFFF;color:#A585D6;} */ -.cardInfo01b .card-footer span{font-size:0.7rem;color:#999;} +.cardInfo01b .card-footer span{font-size:0.7rem;color:#999;display:inline-block;width:100%;word-wrap:break-word;white-space:normal;} .cardInfo02{padding:0.25rem 0;} .cardInfo02 img{width:6.5rem;height:5.2rem;} @@ -538,13 +539,13 @@ input::-webkit-input-placeholder{ .list-block.commentList .item-text{height:auto;min-height:1.5rem;} .commentBox{height:66px;background:#fff;position:absolute;right:0;left:0;bottom:0;z-index:10;} -.commentBox .searchbar{padding:0.75rem 0.5rem;padding-left:0;margin:0;height:66px;background:#fff;border-top:solid 1px #DCDCDC;position:absolute;right:0;left:0;bottom:0;z-index:10;} +.commentBox .searchbar{padding:0.75rem 0.5rem;padding-left:0;margin:0;height:66px;background:#fff;border-top:solid 1px #e7e7e7;position:absolute;right:0;left:0;bottom:0;z-index:10;} .commentBox .searchbar .search-input{line-height:36px;} .commentBox .searchbar .search-input input{height:36px;background:#EFEFEF;} .commentBox .searchbar.commentInputBox .search-input input{padding-left:1.8rem;} -.commentBox .searchbar span{text-align:center;} -.commentBox .searchbar span a font{font-size:0.65rem;color:#666;line-height:36px;} -.commentBox .searchbar span .collection{margin-left:0.75rem;position:static;} +.commentBox .searchbar span{text-align:center;line-height:36px;} +.commentBox .searchbar span font{font-size:0.65rem;color:#666;} +.commentBox .searchbar span.collection{margin-left:0.75rem;position:static;} .commentBox .searchbar > a{line-height:36px;} .icon-comments{width:17px;height:16px;background:url(../images/icon-comments.png) no-repeat center center;background-size:100%;margin-left:0.3rem;vertical-align:baseline;} @@ -1211,6 +1212,8 @@ input[type=range]::-webkit-slider-thumb { .icon-around03:before { content: "\e610"; } +.icon-star:before { content: ""; } + /* 自适应 */ @media(max-width:414px){ .list-block .item-title span.c3a{max-width:220px;} diff --git a/fangija-zsyf/js/common.js b/fangija-zsyf/js/common.js index 1bf58bb..caac7b6 100644 --- a/fangija-zsyf/js/common.js +++ b/fangija-zsyf/js/common.js @@ -7,22 +7,40 @@ document.addEventListener('touchstart',shield,false);//取消浏览器的所有 document.oncontextmenu=shield;//屏蔽选择函数 // H5 plus事件处理 var ws=null,as='pop-in'; +(function() { + var first = null; + mui.back = function() { //首次按键,提示‘再按一次退出应用’ + if (!first) { + first = new Date().getTime(); + mui.toast('再按一次退出应用'); + setTimeout(function() { + first = null; + }, 1000); + } else { + if (new Date().getTime() - first > 1000) { + plus.runtime.quit(); + } + } + }; +}) function plusReady(){ - ws=plus.webview.currentWebview(); + /*ws=plus.webview.currentWebview(); // Android处理返回键 plus.key.addEventListener('backbutton',function(){ - /*if (ws.id == 'yfindex.html') { + if (ws.id == 'yfindex.html') { + alert("aa") plus.nativeUI.confirm("确认退出",function(e) { + alert(e.index); if(e.index == 0) { plus.runtime.quit(); } }); } else { back(); - }*/ + } back(); },false); - compatibleAdjust(); + compatibleAdjust();*/ } if(w.plus){ plusReady(); diff --git a/fangija-zsyf/js/login/codeSms.js b/fangija-zsyf/js/login/codeSms.js index b994a94..7fccf62 100644 --- a/fangija-zsyf/js/login/codeSms.js +++ b/fangija-zsyf/js/login/codeSms.js @@ -78,6 +78,7 @@ $("#login_btn").on("click", function () { var token = resData.data; localStorage.setItem("user_token", token); $.toast(resData.message); + back(); } else { $.toast(resData.message); } diff --git a/fangija-zsyf/views/evaluate/evaluateList.html b/fangija-zsyf/views/evaluate/evaluateList.html index fb0bf9e..8f976ee 100644 --- a/fangija-zsyf/views/evaluate/evaluateList.html +++ b/fangija-zsyf/views/evaluate/evaluateList.html @@ -13,9 +13,6 @@ @@ -41,7 +42,7 @@
- +


更多房产资讯上有房APP

@@ -69,19 +71,26 @@
'; } if(dataObj[i].type=="活动"){ - html += '
'+ - '
'+dataObj[i].title+'
'+ - ''+ - '
'; + if(dataObj[i].adUrl!=null && dataObj[i].adUrl!=""){ + html += '
'; + }else{ + html += '
'; + } + html += '
'+dataObj[i].title+'
'+ + ''+ + '
'; } if(dataObj[i].type=="推荐城市"){ html += '
'+ @@ -1802,8 +1826,8 @@ function addItems(number, lastIndex) { '
'+ dataObj[i].title+'
'+ '
'+dataObj[i].introduction+'
'+ - '
'+ - '
'+ + '
'+ + '
'+ '
'+ '
'; } @@ -1853,9 +1877,9 @@ function addItems(number, lastIndex) { if(i>=lastIndex2){ if((dataObj2.length'; } html += '
'; - if(dataObj2[i].index == 0){ - html += '
潜力指数: 暂无
'; - }else{ - html += '
潜力指数: '+dataObj2[i].index+'
'; - } + + html += '
潜力指数: '; + + if(dataObj2[i].index<4){ + html += ''; + }else if(dataObj2[i].index>=5 && dataObj2[i].index<15){ + html += ''; + }else if(dataObj2[i].index>=15 && dataObj2[i].index<25){ + html += ''; + }else if(dataObj2[i].index>=25 && dataObj2[i].index<35){ + html += ''; + }else if(dataObj2[i].index>=35 && dataObj2[i].index<45){ + html += ''; + }else if(dataObj2[i].index>=45 && dataObj2[i].index<55){ + html += ''; + }else if(dataObj2[i].index>=55 && dataObj2[i].index<65){ + html += ''; + }else if(dataObj2[i].index>=65 && dataObj2[i].index<75){ + html += ''; + }else if(dataObj2[i].index>=75 && dataObj2[i].index<85){ + html += ''; + }else if(dataObj2[i].index>=85 && dataObj2[i].index<95){ + html += ''; + }else{ + html += ''; + } + html += "
"; + if(dataObj2[i].weekendMarkup){ if(dataObj2[i].weekendMarkup>=0){ html += '
近30天涨跌幅: '+(dataObj2[i].weekendMarkup/100).toFixed(2)+'%
'; @@ -1907,6 +1954,17 @@ function addItems(number, lastIndex) { } +//数量进行转换 +function numberConver(thumbsUpCount){ + var thumbsUpCountStr = "" + if(thumbsUpCount>=10000){ + thumbsUpCountStr = (thumbsUpCount/10000).toFixed(1)+"万" + }else{ + thumbsUpCountStr = thumbsUpCount + } + return thumbsUpCountStr; +} + // 上次加载的序号 var lastIndex = 5; var lastIndex2 = 5; @@ -2250,7 +2308,7 @@ $("body").delegate("#select_region .button", "click", function () { var minPrice = 0; var maxPrice = 0; if(select_price.indexOf("以上")!=-1){ - select_price = select_price.replaceAll("以上",""); + select_price = select_price.replace("以上",""); minPrice = parseInt(select_price); maxPrice = 0; }else if(select_price.indexOf("不限")!=-1){ @@ -2325,7 +2383,7 @@ $(".confirm_btn").on("click", function () { var minPrice = 0; var maxPrice = 0; if(select_price.indexOf("以上")!=-1){ - select_price = select_price.replaceAll("以上",""); + select_price = select_price.replace("以上",""); minPrice = parseInt(select_price); maxPrice = 0; }else if(select_price.indexOf("不限")!=-1){ @@ -2378,7 +2436,7 @@ $("#select_order li").on("click", function () { var minPrice = 0; var maxPrice = 0; if(select_price.indexOf("以上")!=-1){ - select_price = select_price.replaceAll("以上",""); + select_price = select_price.replace("以上",""); minPrice = parseInt(select_price); maxPrice = 0; }else if(select_price.indexOf("不限")!=-1){ @@ -2448,7 +2506,7 @@ function getCityPriceLevel(cityParam){ var minPrice = 0; var maxPrice = 0; if(select_price.indexOf("以上")!=-1){ - select_price = select_price.replaceAll("以上",""); + select_price = select_price.replace("以上",""); minPrice = parseInt(select_price); maxPrice = 0; }else if(select_price.indexOf("不限")!=-1){ @@ -2520,7 +2578,6 @@ function getDistrictList(cityParam,latParam,lngParam,regionParam,order,minPrice, console.log(error); }); } - mui.init(); function openNewsView(newId) { //mui.openWindow({ @@ -2531,16 +2588,22 @@ function openNewsView(newId) { // } // }); clicked('views/news/newsDetail.html',true,false,{},{newsId:newId},function(newId){ - alert(newId); + axios.post("/rest/comment/getCommentCount",{commentObjId : newId}).then(function (response) { + var msg = response.data.message + if(response.data.status){ + $("#visitComment_"+newId).text(response.data.data+"条"); + } + }) + .catch(function (error) { + console.log(error); + }); },newId); - var count = parseInt($("#visitCount_"+newId).text().replace("人",""))+1; - $("#visitCount_"+newId).text(count+'人'); + if($("#visitCount_"+newId).text().indexOf("万")<0){ + var count = parseInt($("#visitCount_"+newId).text().replace("人",""))+1; + $("#visitCount_"+newId).text(count+'人'); + } } -window.addEventListener('refresh', function(e){//执行刷新 - alert("aa"); -}); -