Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
Conflicts: fangija-zsyf/views/house/cityDetail.html fangija-zsyf/views/house/houseDetail.html
This commit is contained in:
@@ -1066,6 +1066,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;}
|
||||
|
||||
|
||||
@@ -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+"\"失败 !");
|
||||
|
||||
} );
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@
|
||||
|
||||
<div class="item-after">
|
||||
<a class="button theme collection collection01" onclick="doAddCollect()">关注</a>
|
||||
<a class="button theme collection collection02 dn" onclick="removeCollect()">取消</a>
|
||||
<a class="button collection collection02 dn" onclick="removeCollect()">取消关注</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item-subtitle">
|
||||
|
||||
@@ -197,7 +197,7 @@
|
||||
</ul>
|
||||
</div>
|
||||
<div class="content-block">
|
||||
<p><a id="evaluation_btn" class="button button-big button-fill theme" id="evaluation_btn">提交评估</a></p>
|
||||
<p><button id="evaluation_btn" class="button button-big button-fill theme" id="evaluation_btn" style="width:100%">提交评估</button></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -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()<nowDay){
|
||||
$.hidePreloader();
|
||||
$("#evaluation_btn").removeAttr("disabled");
|
||||
$.toast("到期日期不能早于今天");
|
||||
return false;
|
||||
}
|
||||
var g = $("#input_rent").val();
|
||||
if($("#input_rent").isBlank()){
|
||||
$.hidePreloader();
|
||||
$("#evaluation_btn").removeAttr("disabled");
|
||||
$.toast("请输入每期租金")
|
||||
return false;
|
||||
}
|
||||
|
||||
if(Number(g)<100 || Number(g)>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()<i){
|
||||
$.hidePreloader();
|
||||
$("#evaluation_btn").removeAttr("disabled");
|
||||
$.toast("下次收租日期不能早于今天");
|
||||
return false;
|
||||
}
|
||||
@@ -1768,14 +1768,14 @@ $("#evaluation_btn").on("click", function () {
|
||||
if(c && c.indexOf("别墅")<0){
|
||||
var num = e.replace(/第/g,"").replace(/层/g,"").replace(/共/g,"").split(" ");
|
||||
if(parseInt(num[0])>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);
|
||||
}
|
||||
})
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
|
||||
<div class="card-header">
|
||||
<label>{{myCityMap.city}}</label>
|
||||
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city, 1)">取消</a>
|
||||
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city, 1)">取消关注</a>
|
||||
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city, 0)">关注</a>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -172,7 +172,7 @@
|
||||
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
|
||||
<div class="card-header">
|
||||
<label>{{myCityMap.city}}</label>
|
||||
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city, 1)">取消</a>
|
||||
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city, 1)">取消关注</a>
|
||||
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city, 0)">关注</a>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
|
||||
<div class="item-after">
|
||||
<a class="button theme collection collection01" onclick="doAddCollect()">关注</a>
|
||||
<a class="button theme collection collection02 dn" onclick="removeCollect()">取消</a>
|
||||
<a class="button collection collection02 dn" onclick="removeCollect()">取消关注</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item-subtitle">
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
<div class="page-group">
|
||||
<div class="page page-current">
|
||||
<header class="bar bar-nav">
|
||||
<header class="bar bar-nav barBorder">
|
||||
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
|
||||
<span class="icon icon-left"></span>
|
||||
</button>
|
||||
|
||||
Reference in New Issue
Block a user