Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1

Conflicts:
	fangija-zsyf/views/house/cityDetail.html
This commit is contained in:
2018-04-16 17:48:12 +08:00
9 changed files with 97 additions and 31 deletions
+2 -2
View File
@@ -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;
+25 -7
View File
@@ -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;}
+3 -1
View File
@@ -11,7 +11,9 @@
<link rel="stylesheet" href="css/mui.min.css">
<link rel="stylesheet" href="css/main.css">
<style>
.mui-bar-tab .mui-tab-item .mui-icon{color:#C3C0BC;}
.mui-bar-tab{background:#fff;box-shadow:none;}
.mui-bar-tab .mui-tab-item{border-top:solid 1px #e7e7e7;}
.mui-bar-tab .mui-tab-item .mui-icon{font-size:1.4rem;color:#C3C0BC;}
.mui-bar-tab .mui-tab-item.mui-active .mui-icon{color:#F18D00;}
.mui-bar-tab .mui-tab-item .mui-icon~.mui-tab-label{color:#C3C0BC;}
.mui-bar-tab .mui-tab-item.mui-active .mui-icon~.mui-tab-label{color:#F18D00;}
+16 -1
View File
@@ -1576,7 +1576,8 @@
"views/district/detail.html": {
"resources": [],
"refer": [
"views/district/arround.html"
"views/district/arround.html",
"views/user/codeSms.html"
],
"priority": 0
},
@@ -1703,6 +1704,20 @@
"views/house/add.html"
],
"priority": 0
},
"views/house/cityDetail.html": {
"resources": [],
"refer": [
"views/user/codeSms.html"
],
"priority": 0
},
"views/setting/setting.html": {
"resources": [],
"refer": [
"views/setting/about.html"
],
"priority": 0
}
},
"idle": {
@@ -13,7 +13,8 @@
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
<style type="text/css">
.page > header.bar {background: #F18D00;}
.list-block{border-bottom:solid 0.5rem #f3f3f3;}
.list-block ul:after{height:0;}
</style>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=9E99D3540e4dafb7894f7b9fe27fa6b5"></script>
</head>
@@ -22,7 +23,7 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav theme">
<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>
+1 -2
View File
@@ -27,7 +27,6 @@
line-height: 24px;
background: url(../../images/dw.png) no-repeat;
}
.page > header.bar {background: #F18D00;}
</style>
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=9E99D3540e4dafb7894f7b9fe27fa6b5"></script>
</head>
@@ -36,7 +35,7 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav theme">
<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>
@@ -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
}
}
+29
View File
@@ -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()<nowDay){
$.hidePreloader();
$.toast("到期日期不能早于今天");
return false;
}
var g = $("#input_rent").val();
if($("#input_rent").isBlank()){
$.hidePreloader();
$.toast("请输入每期租金")
return false;
}
if(Number(g)<100 || Number(g)>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()<i){
$.hidePreloader();
$.toast("下次收租日期不能早于今天");
return false;
}
@@ -1746,15 +1768,18 @@ $("#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();
$.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);
}
})
+14 -15
View File
@@ -15,20 +15,10 @@
<link rel="stylesheet" href="css/theme-orange.css">
<style>
.bar{background:#fff;}
.selectBox{border-top:solid 0.5rem #f3f3f3;border-bottom:solid 1px #e5e5e5;}
.selectContent .topic{border-bottom:solid 1px #e5e5e5;}
.selectContent .list-block .item-title{font-size:0.7rem;}
.buttons-row.theme .button{border:solid 1px #D7D7D7;color:#333;}
.buttons-row.theme .button.active{background:none;color:#F18D00;}
.content-block01 .row{margin-left:0;}
.content-block01 .row .col-50 .button.button-fill{height:2rem;line-height:2rem;}
.content-block01 .row .col-50 .button.button-fill.reset_btn{background:#fff;border:none;border-top:solid 1px #e5e5e5;}
.content-block01 .row .col-50 .button.button-fill.confirm_btn{background:#F18D00;border:solid 1px #F18D00;}
.selectBox{border-top:solid 0.5rem #f3f3f3;}
.cardInfo:first-child{border-top:none;}
.info-container input{float:none;width:100%;}
.picker-item{padding:0 5rem;font-size:18px;}
.loadingBg{width:100%;height:100%;background:#fff;overflow:hidden;position:absolute;top:71px;left:0;z-index:100;}
.loadingBg .infinite-scroll-preloader{margin-top:60%;}
</style>
</head>
@@ -1581,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("票",""));
@@ -1594,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;
@@ -1856,7 +1846,7 @@ function addItems(number, lastIndex) {
html += '<div class="card cardInfo cardInfo03"><div class="card-header">'+dataObj[i].title+
'</div><div class="card-content"><div class="card-content-inner row"><div class="vote01 col-50">'+
'<i class="icon icon-light-red" data-val="'+dataObj[i].id+'"></i><span>'+dataObj[i].voteFavorText+'</span>'+
'<i class="icon icon-light-grey" data-val="'+dataObj[i].id+'"></i><span>'+dataObj[i].voteFavorText+'</span>'+
'<font style="width:'+voteFavorCountRate+'%;" id="voteFavorCountRate_'+dataObj[i].id+'"></font><label id="voteFavorCount_'+dataObj[i].id+'">'+voteFavorCount+'票&nbsp;&nbsp;'+voteFavorCountRate+'%</label></div>'+
'<div class="vote02 col-50"><i class="icon icon-light-grey" data-val="'+dataObj[i].id+'"></i><span>'+dataObj[i].voteNoFavorText+'</span>'+
'<font style="width:'+voteNoFavorCountRate+'%;" id="voteNoFavorCountRate'+dataObj[i].id+'"></font><label id="voteNoFavorCount_'+dataObj[i].id+'">'+voteNoFavorCount+'票&nbsp;&nbsp;'+voteNoFavorCountRate+'%</label></div><em>V.S</em></div></div></div>';
@@ -2639,6 +2629,15 @@ function openDistWindow(city, region, name){
}
});*/
/* 投票 */
$("body").delegate(".vote01 .icon-light-grey", "click", function () {
$(".vote01 .icon-light-grey").addClass("icon-light-red");
$(".vote02 .icon-light-grey").removeClass("icon-light-blue");
});
$("body").delegate(".vote02 .icon-light-grey", "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");