From 204b15d5fce0e10c84fcb0ab6b6ab38f9fc37ef5 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Mon, 16 Apr 2018 16:29:27 +0800 Subject: [PATCH 1/5] YOUFANG1.0.3 --- fangija-zsyf/views/evaluate/evaluateReport.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 0c782c2..9b38627 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -257,7 +257,10 @@ $.config = {router: false} house_price.words="元" house_price.compare_money=h.compareMoney }else{ - house_price.compare_money="相等" + //house_price.compare_money="相等" + house_price.compare_word="高" + house_price.words="元" + house_price.compare_money=0 } } From 1beeab69ec4ffbd87a07d59559bf1f17d959db10 Mon Sep 17 00:00:00 2001 From: gongjin Date: Mon, 16 Apr 2018 16:38:34 +0800 Subject: [PATCH 2/5] update --- fangija-zsyf/config.js | 4 +-- fangija-zsyf/css/main.css | 32 +++++++++++++++---- fangija-zsyf/main.html | 4 ++- fangija-zsyf/manifest.json | 17 +++++++++- fangija-zsyf/views/district/aroundDetail.html | 5 +-- fangija-zsyf/views/district/arround.html | 3 +- fangija-zsyf/yfindex.html | 14 ++------ 7 files changed, 52 insertions(+), 27 deletions(-) diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 2abd5c9..f5765d0 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -2,9 +2,9 @@ //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: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.53:8084"; +//var BASE_PATH = "http://192.168.10.53:8084"; //var BASE_PATH = "http://192.168.10.171: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 398ca1e..a08075f 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -1,8 +1,6 @@ @charset "utf-8"; /* CSS Document */ -[v-cloak] { - display: none; -} + /* 公用 */ *{font-size:16px;font-family:arial,"华文细黑";} ul li{list-style:none;} @@ -177,6 +175,7 @@ em.down{color:#88D053;} .popover .list-block .item-link.list-button{color:#333;} /* 工具栏 */ +.bar{background:#fff;} .bar-tab .tab-item{color:#C3C0BC;} .bar-tab .tab-item.active,.bar-tab .tab-item:active{color:#F18D00;} .bar-tab .tab-item .icon{padding:0;font-size:1.05rem;} @@ -237,7 +236,7 @@ em.down{color:#88D053;} .list-block .item-title span{font-size:0.7rem;color:#999;} .list-block .item-title span.span01{font-size:0.7rem;color:#666;margin-left:0.3rem;} .list-block .item-title input{display:inline-block;text-align:center;width:60px;border:solid 1px #e6e6ea;} -.list-block .item-title b{font-size:0.9rem;} +.list-block .item-title b{font-size:0.8rem;} .list-block .item-title em{font-size:0.8rem;color:#EB5F34;} .list-block .item-title .button.button-fill{display:inline-block;width:50px;height:24px;line-height:24px;margin-left:0.5rem;vertical-align:2px;} .list-block .item-title.row{margin-left:0;width:100%;} @@ -311,8 +310,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;} @@ -854,6 +854,11 @@ input::-webkit-input-placeholder{ /* 图表 */ .chart{width:100%;height:250px;} .chart tspan{font-size:0.6rem;text-shadow:none;} +/* +#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;} @@ -1059,7 +1064,7 @@ input::-webkit-input-placeholder{ .topBg02 p a{font-size:0.75rem;} .collection{position:absolute;right:0.75rem;top:0.4rem;text-align:center;color:#666;font-size:0.7rem;} - +.collection02{border:solid 1px #C3C0BC;color:#999;} .icon-collection01{width:16px;height:16px;background:url(../images/icon-collection01.png) no-repeat center center;background-size:100%;display:block;margin:0 auto;margin-bottom:0.1rem;} .icon-collection02{width:16px;height:16px;background:url(../images/icon-collection02.png) no-repeat center center;background-size:100%;display:block;margin:0 auto;margin-bottom:0.1rem;} @@ -1291,6 +1296,20 @@ input[type=range]::-webkit-slider-thumb { .contentStart img{width:70%;margin:0 auto;margin-top:30%;} .contentStart #test_btn{background:#fff;color:#21a5fe;width:10rem;margin:0 auto;margin-top:1.5rem;} +/* 引导页 */ +.swiper-container{width:100%;height:100%;background:#fff;z-index:10000;} +.swiper-slide img.guideImg01{width:90%;margin:0 auto;margin-top:7.4rem;} +.swiper-slide img.guideImg02{width:85%;margin:0 auto;margin-top:7rem;} +.swiper-slide img.guideImg03{width:55%;margin:0 auto;margin-top:8rem;} +.swiper-slide div{position:absolute;bottom:5rem;width:100%;} +.swiper-slide p{text-align:center;} +.swiper-slide p label{font-size:1rem;} +.swiper-slide p small{font-size:0.7rem;color:#999;} +.swiper-slide div.content-block{bottom:1.5rem;} +.swiper-slide div.content-block .button{width:50%;margin:0 auto;height:2.1rem;line-height:2rem;} +.swiper-pagination-bullet{width:10px;height:10px;background:#D7D7D7;opacity:1;} +.swiper-pagination-bullet-active{width:22px;height:10px;background:#F18D00;border-radius:0.3rem;} + /* 字体图标 */ @font-face {font-family: "iconfont"; src: url('iconfont.eot?t=1522051063980'); /* IE9*/ @@ -1365,7 +1384,6 @@ input[type=range]::-webkit-slider-thumb { } @media(max-width:320px){ .list-block .item-title span.c3a{max-width:112px;} - .list-block .item-title label{max-width:100px;} label.spacing01{margin-right:11px;} label.spacing02{margin-right:12px;} .priceInfo div div span{width:125px;} diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index 2f5f160..82c7932 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -11,7 +11,9 @@ @@ -22,7 +23,7 @@
-
+
diff --git a/fangija-zsyf/views/district/arround.html b/fangija-zsyf/views/district/arround.html index 8b233e4..da789df 100644 --- a/fangija-zsyf/views/district/arround.html +++ b/fangija-zsyf/views/district/arround.html @@ -27,7 +27,6 @@ line-height: 24px; background: url(../../images/dw.png) no-repeat; } - .page > header.bar {background: #F18D00;} @@ -36,7 +35,7 @@
-
+
diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index 68abbd7..764c443 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -15,20 +15,10 @@ From 9db85bfca1dd9d72dd59c1318c4b9233aa8c54cb Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Mon, 16 Apr 2018 16:58:54 +0800 Subject: [PATCH 3/5] aa --- fangija-zsyf/views/house/add.html | 29 +++++++++++++++++++++++++++++ fangija-zsyf/yfindex.html | 9 +++++++++ 2 files changed, 38 insertions(+) diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index 3194f18..78a87fc 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -1652,6 +1652,7 @@ $("#input_status").click(function(e){ /* 错误提示 */ $("#evaluation_btn").on("click", function () { + $.showPreloader(); var a = $("#input_city").val(); var b = $("#input_address").val(); var c = $("#input_houseType").val(); @@ -1660,84 +1661,105 @@ $("#evaluation_btn").on("click", function () { var f = $("#input_area").val(); if(a == ""){ + $.hidePreloader(); $.toast("请选择城市"); return false; }else if(b == ""){ + $.hidePreloader(); $.toast("请选择房屋地址"); return false; }else if(c == ""){ + $.hidePreloader(); $.toast("请选择房屋类型"); return false; }else if(d == ""){ + $.hidePreloader(); $.toast("请选择楼栋室号"); return false; }else if(e == ""){ + $.hidePreloader(); $.toast("楼层不能为空!"); return false; }else if(e.indexOf("所在楼层")!= -1){ + $.hidePreloader(); $.toast("所在楼层不能为空!"); return false; }else if(e.indexOf("总楼层")!= -1){ + $.hidePreloader(); $.toast("总楼层不能为空!"); return false; }else if(f == ""){ + $.hidePreloader(); $.toast("请输入房屋面积"); return false; }else if(!$("#input_area").isPositiveFloat() || f=='0'){ + $.hidePreloader(); $.toast("请输入正确的面积!") return false }else if(Number(f)<10 || Number(f)>1000){ + $.hidePreloader(); $.toast("面积范围10-1000㎡"); return false; } if(type==0){ if($("#input_status").val()=='出租'){ if($("#input_time01").isBlank()){ + $.hidePreloader(); $.toast("请选择起租日期") return false; } if($("#input_time02").isBlank()){ + $.hidePreloader(); $.toast("请选择到期日期") return false; } if($("#input_time01").val()>$("#input_time02").val()){ + $.hidePreloader(); $.toast("到期日期必须晚于起租日期"); return false; } var nowDay = new Date().format("yyyy-MM-dd"); if($("#input_time02").val()200000){ + $.hidePreloader(); $.toast("租金范围100-200000元"); return false; } if(!$("#input_rent").isPositiveInteger()){ + $.hidePreloader(); $.toast("每期租金必须是整数") return false; } if($("#input_cycle").isBlank()){ + $.hidePreloader(); $.toast("收租周期不能为空") return false; } if($("#input_time03").isBlank()){ + $.hidePreloader(); $.toast("下次收租日期不能为空") return false; } if($("#input_time03").val()>$("#input_time02").val()){ + $.hidePreloader(); $.toast("收租日期不能晚于到期日期"); return false; } if($("#input_time03").val()parseInt(num[1])){ + $.hidePreloader(); $.toast("总楼层选择错误!") return false } } if($("#cityAddress").val() != "" && $("#cityAddress").val() != $("#input_city").val()){ + $.hidePreloader(); $.toast("城市和房屋地址不匹配") return false } + axios.get("/rest/index/checkAddress", { params: { city: $("#input_city").val(), @@ -1773,6 +1798,7 @@ $("#evaluation_btn").on("click", function () { $("#input_city").val(district.city) checkIsLogin(); }else{ + $.hidePreloader(); // $("#nextBtn").attr("disabled", false) console.log("error"); $.toast(response.data.message) @@ -1787,6 +1813,7 @@ $("#evaluation_btn").on("click", function () { //var loginFlag=false; function checkIsLogin(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ + $.hidePreloader(); clicked('/views/user/codeSms.html',true,false,{},{},function(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ @@ -1837,7 +1864,9 @@ function addEvaluation(){ plus.webview.getWebviewById('views/house/houseManageList.html').reload(); plus.webview.getWebviewById('views/user/userInfo.html').reload(); clicked('/views/evaluate/evaluateReport.html',true,false,{},{hid:id}) + $.hidePreloader(); }else{ + $.hidePreloader(); $.toast(response.data.message); } }) diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index 68abbd7..be25158 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -2639,6 +2639,15 @@ function openDistWindow(city, region, name){ } });*/ +/* 投票 */ +$(".vote01 .icon-light-grey").on("click", function(){ + $(".vote01 .icon-light-grey").addClass("icon-light-red"); + $(".vote02 .icon-light-grey").removeClass("icon-light-blue"); +}); +$(".vote02 .icon-light-grey").on("click", function(){ + $(".vote01 .icon-light-grey").removeClass("icon-light-red"); + $(".vote02 .icon-light-grey").addClass("icon-light-blue"); +}); $("body").delegate("#hotList ul li", "click", function () { var select_city = $(this).find("a").attr("data-city"); From 6f27bf90e363bd92dce4947a8b04c88a97e71a93 Mon Sep 17 00:00:00 2001 From: gongjin Date: Mon, 16 Apr 2018 17:02:50 +0800 Subject: [PATCH 4/5] update --- fangija-zsyf/views/house/cityDetail.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fangija-zsyf/views/house/cityDetail.html b/fangija-zsyf/views/house/cityDetail.html index 20a2c9d..97516ba 100644 --- a/fangija-zsyf/views/house/cityDetail.html +++ b/fangija-zsyf/views/house/cityDetail.html @@ -32,13 +32,14 @@ +

房产行情

- 取消关注 + 取消关注 关注
From 154b9e376a354aff9509d25cacccdae8cd6c35e8 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Mon, 16 Apr 2018 17:28:05 +0800 Subject: [PATCH 5/5] aa --- fangija-zsyf/yfindex.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index a56b511..b5103c9 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -1571,7 +1571,7 @@ $("#region").click(function(e){ }) })*/ -$("body").delegate(".icon-light-red", "click", function () { +$("body").delegate(".vote01 .icon-light-grey", "click", function () { var id = $(this).attr("data-val"); var voteFavorCount = parseInt($("#voteFavorCount_"+id).text().split("  ")[0].replace("票",""))+1; var voteNoFavorCount = parseInt($("#voteNoFavorCount_"+id).text().split("  ")[0].replace("票","")); @@ -1584,7 +1584,7 @@ $("body").delegate(".icon-light-red", "click", function () { doVote(id,0); }); -$("body").delegate(".icon-light-grey", "click", function () { +$("body").delegate(".vote02 .icon-light-grey", "click", function () { var id = $(this).attr("data-val"); var voteFavorCount = parseInt($("#voteFavorCount_"+id).text().split("  ")[0].replace("票","")); var voteNoFavorCount = parseInt($("#voteNoFavorCount_"+id).text().split("  ")[0].replace("票",""))+1; @@ -1846,7 +1846,7 @@ function addItems(number, lastIndex) { html += '
'+dataObj[i].title+ '
'+ - ''+dataObj[i].voteFavorText+''+ + ''+dataObj[i].voteFavorText+''+ '
'+ '
'+dataObj[i].voteNoFavorText+''+ '
V.S
'; @@ -2630,11 +2630,11 @@ function openDistWindow(city, region, name){ });*/ /* 投票 */ -$(".vote01 .icon-light-grey").on("click", function(){ +$("body").delegate(".vote01 .icon-light-grey", "click", function () { $(".vote01 .icon-light-grey").addClass("icon-light-red"); $(".vote02 .icon-light-grey").removeClass("icon-light-blue"); }); -$(".vote02 .icon-light-grey").on("click", function(){ +$("body").delegate(".vote02 .icon-light-grey", "click", function () { $(".vote01 .icon-light-grey").removeClass("icon-light-red"); $(".vote02 .icon-light-grey").addClass("icon-light-blue"); });