From edd881f85a705b8d489eca0e54623ee6f2f03e25 Mon Sep 17 00:00:00 2001 From: gongjin Date: Mon, 16 Apr 2018 17:50:33 +0800 Subject: [PATCH 1/4] 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 2/4] =?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 3/4] 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 4/4] 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); } })