From d908aa50b7907164d9f30b621fc41ce6c16da586 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 16 Apr 2018 15:42:32 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=9A=82=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseDetail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index ff16226..58b0e26 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -243,7 +243,7 @@
{{nearDist.sname}}
-
{{nearDist.avgPrice}}元/㎡
+
{{nearDist.avgPrice}}元/㎡
暂无
From bca34d11859f2ddb979298eea03fcb91707103e0 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 16 Apr 2018 16:18:31 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=85=B3=E6=B3=A8->?= =?UTF-8?q?=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/district/detail.html | 2 +- fangija-zsyf/views/rent/rent.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index deb2de7..2f09d3f 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -68,7 +68,7 @@
diff --git a/fangija-zsyf/views/rent/rent.html b/fangija-zsyf/views/rent/rent.html index dc4ae04..77ec557 100644 --- a/fangija-zsyf/views/rent/rent.html +++ b/fangija-zsyf/views/rent/rent.html @@ -62,7 +62,7 @@
From 1beeab69ec4ffbd87a07d59559bf1f17d959db10 Mon Sep 17 00:00:00 2001 From: gongjin Date: Mon, 16 Apr 2018 16:38:34 +0800 Subject: [PATCH 03/13] 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 04/13] 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 05/13] 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 06/13] 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"); }); From 392f58dc34f13960a6314c96d361e3bd3fd0d892 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 16 Apr 2018 17:47:12 +0800 Subject: [PATCH 07/13] update --- fangija-zsyf/views/house/cityDetail.html | 2 +- fangija-zsyf/views/house/houseDetail.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fangija-zsyf/views/house/cityDetail.html b/fangija-zsyf/views/house/cityDetail.html index 20a2c9d..e46c635 100644 --- a/fangija-zsyf/views/house/cityDetail.html +++ b/fangija-zsyf/views/house/cityDetail.html @@ -38,7 +38,7 @@
- 取消关注 + 取消 关注
diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 58b0e26..6f26612 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -172,7 +172,7 @@
- 取消关注 + 取消 关注
From edd881f85a705b8d489eca0e54623ee6f2f03e25 Mon Sep 17 00:00:00 2001 From: gongjin Date: Mon, 16 Apr 2018 17:50:33 +0800 Subject: [PATCH 08/13] update --- fangija-zsyf/css/main.css | 1 + fangija-zsyf/manifest.json | 20 ++++++++++++++++++-- fangija-zsyf/views/setting/agreement.html | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index a08075f..d482b12 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -1065,6 +1065,7 @@ input::-webkit-input-placeholder{ .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;} +.collection02:active{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;} diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index cc91f03..f5d7e32 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -1701,7 +1701,8 @@ "views/house/houseManageList.html": { "resources": [], "refer": [ - "views/house/add.html" + "views/house/add.html", + "views/evaluate/evaluateReport.html" ], "priority": 0 }, @@ -1715,7 +1716,22 @@ "views/setting/setting.html": { "resources": [], "refer": [ - "views/setting/about.html" + "views/setting/about.html", + "views/user/updatePass.html" + ], + "priority": 0 + }, + "views/evaluate/evaluateReport.html": { + "resources": [], + "refer": [ + "views/house/add.html" + ], + "priority": 0 + }, + "views/setting/about.html": { + "resources": [], + "refer": [ + "views/setting/agreement.html" ], "priority": 0 } diff --git a/fangija-zsyf/views/setting/agreement.html b/fangija-zsyf/views/setting/agreement.html index 387660f..ed2667b 100644 --- a/fangija-zsyf/views/setting/agreement.html +++ b/fangija-zsyf/views/setting/agreement.html @@ -23,7 +23,7 @@
-
+
From f70339381245a5654dd422d7c4b05edd033eb03c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 16 Apr 2018 17:50:33 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E5=8D=9A?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/shara/sharaMine.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fangija-zsyf/js/shara/sharaMine.js b/fangija-zsyf/js/shara/sharaMine.js index aa85060..c2e80fd 100644 --- a/fangija-zsyf/js/shara/sharaMine.js +++ b/fangija-zsyf/js/shara/sharaMine.js @@ -10,7 +10,7 @@ function updateSerivces(){ shares[t.id]=t; } }, function(e){ - alert("获取分享服务列表失败:"+e.message ); + plus.nativeUI.alert("获取分享服务列表失败:"+e.message ); } ); } /** @@ -20,7 +20,7 @@ function updateSerivces(){ */ function shareAction(sb,bh) { if(!sb||!sb.s){ - alert("无效的分享服务!"); + plus.nativeUI.alert("无效的分享服务!"); return; } var msg={content:sharehrefDes,extra:{scene:sb.x}}; @@ -47,11 +47,11 @@ function shareAction(sb,bh) { if ( sb.s.authenticated ) { shareMessage(msg,sb.s); } else { - alert("---未授权---"); + plus.nativeUI.alert("---未授权---"); sb.s.authorize( function(){ shareMessage(msg,sb.s); },function(e){ - alert("认证授权失败:"+e.code+" - "+e.message ); + plus.nativeUI.alert("认证授权失败:"+e.code+" - "+e.message ); }); } @@ -63,11 +63,11 @@ function shareAction(sb,bh) { */ function shareMessage(msg,s){ s.send( msg, function(){ - alert("分享到\""+s.description+"\"成功! " ); + plus.nativeUI.alert("分享到\""+s.description+"\"成功! " ); }, function(e){ console.log(e.code+"========="+e.message) - alert( "分享到\""+s.description+"\"失败 !"); + plus.nativeUI.alert( "分享到\""+s.description+"\"失败 !"); } ); } From 08bce137c42738524910a47e377b0dd6d62d62b5 Mon Sep 17 00:00:00 2001 From: gongjin Date: Mon, 16 Apr 2018 18:03:46 +0800 Subject: [PATCH 10/13] update --- fangija-zsyf/views/district/detail.html | 2 +- fangija-zsyf/views/house/cityDetail.html | 3 ++- fangija-zsyf/views/house/houseDetail.html | 2 +- fangija-zsyf/views/rent/rent.html | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 2f09d3f..deb2de7 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -68,7 +68,7 @@
diff --git a/fangija-zsyf/views/house/cityDetail.html b/fangija-zsyf/views/house/cityDetail.html index e46c635..97516ba 100644 --- a/fangija-zsyf/views/house/cityDetail.html +++ b/fangija-zsyf/views/house/cityDetail.html @@ -32,13 +32,14 @@ +

房产行情

- 取消 + 取消关注 关注
diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 6f26612..20711e7 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -172,7 +172,7 @@
- 取消 + 取消关注 关注
diff --git a/fangija-zsyf/views/rent/rent.html b/fangija-zsyf/views/rent/rent.html index 77ec557..dc4ae04 100644 --- a/fangija-zsyf/views/rent/rent.html +++ b/fangija-zsyf/views/rent/rent.html @@ -62,7 +62,7 @@
From fdba06e5b53f6cfb1f92b511c4f97476b91e924d Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Mon, 16 Apr 2018 18:41:25 +0800 Subject: [PATCH 11/13] aa --- fangija-zsyf/views/house/add.html | 59 +++++++++++++++---------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index 78a87fc..13cb2fa 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -197,7 +197,7 @@
-

提交评估

+

@@ -1652,7 +1652,7 @@ $("#input_status").click(function(e){ /* 错误提示 */ $("#evaluation_btn").on("click", function () { - $.showPreloader(); + $("#evaluation_btn").attr("disabled","disabled"); var a = $("#input_city").val(); var b = $("#input_address").val(); var c = $("#input_houseType").val(); @@ -1661,105 +1661,105 @@ $("#evaluation_btn").on("click", function () { var f = $("#input_area").val(); if(a == ""){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("请选择城市"); return false; }else if(b == ""){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("请选择房屋地址"); return false; }else if(c == ""){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("请选择房屋类型"); return false; }else if(d == ""){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("请选择楼栋室号"); return false; }else if(e == ""){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("楼层不能为空!"); return false; }else if(e.indexOf("所在楼层")!= -1){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("所在楼层不能为空!"); return false; }else if(e.indexOf("总楼层")!= -1){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("总楼层不能为空!"); return false; }else if(f == ""){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("请输入房屋面积"); return false; }else if(!$("#input_area").isPositiveFloat() || f=='0'){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("请输入正确的面积!") return false }else if(Number(f)<10 || Number(f)>1000){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("面积范围10-1000㎡"); return false; } if(type==0){ if($("#input_status").val()=='出租'){ if($("#input_time01").isBlank()){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("请选择起租日期") return false; } if($("#input_time02").isBlank()){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("请选择到期日期") return false; } if($("#input_time01").val()>$("#input_time02").val()){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("到期日期必须晚于起租日期"); return false; } var nowDay = new Date().format("yyyy-MM-dd"); if($("#input_time02").val()200000){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("租金范围100-200000元"); return false; } if(!$("#input_rent").isPositiveInteger()){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("每期租金必须是整数") return false; } if($("#input_cycle").isBlank()){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("收租周期不能为空") return false; } if($("#input_time03").isBlank()){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("下次收租日期不能为空") return false; } if($("#input_time03").val()>$("#input_time02").val()){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("收租日期不能晚于到期日期"); return false; } if($("#input_time03").val()parseInt(num[1])){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("总楼层选择错误!") return false } } if($("#cityAddress").val() != "" && $("#cityAddress").val() != $("#input_city").val()){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); $.toast("城市和房屋地址不匹配") return false } @@ -1798,8 +1798,7 @@ $("#evaluation_btn").on("click", function () { $("#input_city").val(district.city) checkIsLogin(); }else{ - $.hidePreloader(); - // $("#nextBtn").attr("disabled", false) + $("#evaluation_btn").removeAttr("disabled"); console.log("error"); $.toast(response.data.message) } @@ -1813,7 +1812,7 @@ $("#evaluation_btn").on("click", function () { //var loginFlag=false; function checkIsLogin(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ - $.hidePreloader(); + $("#evaluation_btn").removeAttr("disabled"); clicked('/views/user/codeSms.html',true,false,{},{},function(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ @@ -1860,13 +1859,13 @@ function addEvaluation(){ }) .then(function (response) { if(response.data.data!=null && response.data.data.success){ + $("#evaluation_btn").removeAttr("disabled"); var id = response.data.data.id; 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(); + $("#evaluation_btn").removeAttr("disabled"); $.toast(response.data.message); } }) From f5f4ec04874225676554dc9855702bc6ab669b39 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 16 Apr 2018 19:28:19 +0800 Subject: [PATCH 12/13] update --- fangija-zsyf/config.js | 4 +-- fangija-zsyf/css/main.css | 1 + fangija-zsyf/js/district/districtDetail.js | 8 +++-- fangija-zsyf/js/quotations/cityDetail.js | 13 ++++--- .../component/cityIncreaseRankingComponent.js | 14 ++++---- .../cityPotentialRankingComponent.js | 14 ++++---- .../views/component/myFocusComponent.js | 1 + fangija-zsyf/views/district/detail.html | 35 ++----------------- fangija-zsyf/views/house/cityDetail.html | 4 +-- fangija-zsyf/views/house/houseDetail.html | 8 ++--- fangija-zsyf/views/rent/rent.html | 19 +++++----- 11 files changed, 53 insertions(+), 68 deletions(-) diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index f5765d0..2abd5c9 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 a08075f..661f486 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -2,6 +2,7 @@ /* CSS Document */ /* 公用 */ +[v-cloak]{display:none;} *{font-size:16px;font-family:arial,"华文细黑";} ul li{list-style:none;} img{display:block;} diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index fc5cb03..d625c0a 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -524,16 +524,17 @@ var option01 = { }; -$("#trendDiv2 a").click(function(){ +/*$("#trendDiv2 a").click(function(){ $("#trendDiv2 a").removeClass("active") $(this).addClass("active") //var v = $(this).attr("t-v"); loadRentTrends(city, region, name); -}); +});*/ /* 小区租金走势 */ function loadRentTrends(city, region, name, type){ + if(type == undefined) type= 2; axios.get("/rest/trend/distRentTrends", { params: { @@ -549,6 +550,7 @@ function loadRentTrends(city, region, name, type){ var m = re.times; var pm = re.distMap var rooms = re.rooms; + if(m && rooms.length>0){ for(var i=0;i{{!ci.oneMonthUpDownRange||ci.oneMonthUpDownRange==""?"暂无":Math.abs(100*ci.oneMonthUpDownRange).toFixed(2)+"%"}}'+ '
'+ '
'+ - '关注'+ - '取消'+ + '关注'+ + '取消'+ '
'+ '
'+ '
'+ @@ -47,12 +47,12 @@ Vue.component('city_increase_ranking',{ console.log(error) }) }, - follow:function(city,event){ + follow:function(city,event, type){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ clicked('/views/user/passLogin.html',true,false,{},{},function(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ }else{ - axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ var msg = response.data.message; if(msg != "取消关注成功" && msg != "关注成功"){ $.toast(msg); @@ -73,7 +73,7 @@ Vue.component('city_increase_ranking',{ } }) }else{ - axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ var msg = response.data.message; if(msg != "取消关注成功" && msg != "关注成功"){ $.toast(msg); @@ -91,7 +91,7 @@ Vue.component('city_increase_ranking',{ } }, - abolish:function(city,event){ + abolish:function(city,event, type){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ clicked('/views/user/passLogin.html',true,false,{},{},function(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ @@ -101,7 +101,7 @@ Vue.component('city_increase_ranking',{ } }) }else{ - axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ $(event.target).parent().children().removeClass("dn"); $(event.target).addClass("dn"); reloadMyFocus(); diff --git a/fangija-zsyf/views/component/cityPotentialRankingComponent.js b/fangija-zsyf/views/component/cityPotentialRankingComponent.js index 36f2729..ac5339b 100644 --- a/fangija-zsyf/views/component/cityPotentialRankingComponent.js +++ b/fangija-zsyf/views/component/cityPotentialRankingComponent.js @@ -33,8 +33,8 @@ Vue.component('city_potential_ranking',{ ''+ '
'+ '
'+ - '关注'+ - '取消'+ + '关注'+ + '取消'+ '
'+ '
'+ ''+ @@ -65,13 +65,13 @@ Vue.component('city_potential_ranking',{ console.log(error) }) }, - follow:function(city,event){ + follow:function(city,event,type){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ clicked('/views/user/passLogin.html',true,false,{},{},function(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ alert("rrrr") }else{ - axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ var msg = response.data.message; if(msg != "取消关注成功" && msg != "关注成功"){ @@ -92,7 +92,7 @@ Vue.component('city_potential_ranking',{ } }) }else{ - axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ var msg = response.data.message; if(msg != "取消关注成功" && msg != "关注成功"){ $.toast(msg); @@ -110,8 +110,8 @@ Vue.component('city_potential_ranking',{ } }, - abolish:function(city,event){ - axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + abolish:function(city,event,type){ + axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){ $(event.target).parent().children().removeClass("dn"); $(event.target).addClass("dn"); reloadMyFocus() diff --git a/fangija-zsyf/views/component/myFocusComponent.js b/fangija-zsyf/views/component/myFocusComponent.js index a52a058..2bdc26a 100644 --- a/fangija-zsyf/views/component/myFocusComponent.js +++ b/fangija-zsyf/views/component/myFocusComponent.js @@ -75,6 +75,7 @@ function reloadMyFocus(){ $("#myFocusFirstPage").hide(); $("#myFocus").hide(); }else{ + myFocusDatas.myFocusList = response.data.data; } }).catch(function(error){ diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 2f09d3f..481b4cc 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -43,7 +43,7 @@
-
+
@@ -128,35 +128,6 @@
- - -