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

This commit is contained in:
2018-04-17 17:22:20 +08:00
20 changed files with 5748 additions and 73 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
/**服务端地址**/
//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.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.161:8084";
+15 -11
View File
@@ -2,7 +2,6 @@
/* CSS Document */
/* 公用 */
[v-cloak]{display:none;}
*{font-size:16px;font-family:arial,"华文细黑";}
ul li{list-style:none;}
img{display:block;}
@@ -506,9 +505,9 @@ input::-webkit-input-placeholder{
.cardInfo02{padding:0.25rem 0;}
.cardInfo02 img{width:6.5rem;height:5.2rem;}
.cardInfo02 .item-content{padding:0;}
.cardInfo02 .item-title{font-size:0.85rem;}
.cardInfo02 .item-title span{text-align: right}
.cardInfo02 .item-subtitle font{font-size:0.7rem;white-space:normal;text-align:justify;display:block;margin:0.3rem 0;}
.cardInfo02 .item-title{font-size:0.85rem;white-space:normal;-webkit-line-clamp:2;-webkit-box-orient:vertical;display:-webkit-box;}
.cardInfo02 .item-title span{text-align:right;}
.cardInfo02 .item-subtitle font{font-size:0.7rem;white-space:normal;-webkit-line-clamp:2;-webkit-box-orient:vertical;display:-webkit-box;margin:0.3rem 0;}
.cardInfo02 .item-subtitle span{font-size:0.6rem;color:#666;max-width:100%;}
.cardInfo02 .item-subtitle small{font-size:0.7rem;color:#999;}
.cardInfo02 .item-subtitle em{font-size:0.7rem;color:#EB5F34;}
@@ -558,7 +557,7 @@ input::-webkit-input-placeholder{
.list-block.commentList .item-media{padding-top:0;margin-top:-1rem;}
.list-block.commentList .item-media img{width:2.3rem;height:2.3rem;}
.list-block.commentList .item-after font{color:#999;}
.list-block.commentList .item-text{height:auto;min-height:1.5rem;}
.list-block.commentList .item-text{height:auto;min-height:1.5rem;color:#333;}
.commentBox{height:66px;background:#fff;position:absolute;right:0;left:0;bottom:0;z-index:10;}
.commentBox .searchbar{padding:0.75rem 0.5rem;padding-left:0;margin:0;height:66px;background:#fff;border-top:solid 1px #e7e7e7;position:absolute;right:0;left:0;bottom:0;z-index:10;}
@@ -849,7 +848,7 @@ input::-webkit-input-placeholder{
.topic .topicContent .topicContent_bottom01 label em{color:#EB5F34;margin-left:0.1rem;}
/* 广告 */
.ad{display:block;border-top:solid 0.5rem #f3f3f3;border-bottom:solid 0.5rem #f3f3f3;}
.ad{display:block;border-bottom:solid 0.5rem #f3f3f3;}
.ad img{width:100%;}
/* 图表 */
@@ -1300,14 +1299,15 @@ input[type=range]::-webkit-slider-thumb {
/* 引导页 */
.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 img{margin:0 auto;margin-top:7rem;}
.swiper-slide img.guideImg01{width:90%;}
.swiper-slide img.guideImg02{width:85%;}
.swiper-slide img.guideImg03{width:55%;}
.swiper-slide div{position:absolute;bottom:5rem;width:100%;}
.swiper-slide p{text-align:center;}
.swiper-slide p{text-align:center;padding:0 1rem;}
.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{bottom:0.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;}
@@ -1386,6 +1386,7 @@ 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;}
@@ -1405,6 +1406,9 @@ input[type=range]::-webkit-slider-thumb {
@media(min-height:750px){
.bar-tab{bottom:1.7rem;}
.bar-tab ~ .content{bottom:4.2rem;}
.swiper-slide div{bottom:12rem;}
.swiper-slide div.content-block{bottom:5rem;}
.swiper-container-horizontal>.swiper-pagination{bottom:4rem;}
}
@media only screen and (-webkit-min-device-pixel-ratio:2){
.list-block .item-inner:after{-webkit-transform:scaleY(1);transform:scaleY(1);}
File diff suppressed because it is too large Load Diff
+2
View File
@@ -231,6 +231,7 @@ html:not(.watch-active-state) .theme label.label-radio:active,
.priceRecovery .col-50 .button.theme{background:none;border-color:#F18D00;color:#F18D00;}
.page > header.bar.theme{background:#F18D00;}
.bar .button-nav:active{color:#F18D00;}
.bar-nav.theme .icon.icon-left{color:#fff;}
.bar .button-link.theme{background:none;color:#F18D00;}
@@ -243,6 +244,7 @@ html:not(.watch-active-state) .theme label.label-radio:active,
.buttons-row.theme{background:none;}
.buttons-row.theme .button{border-color:#D7D7D7;color:#999;}
.buttons-row.theme .button.active{background:none;border-color:#F18D00;color:#F18D00;}
.buttons-row01.theme .button{color:#333;}
.selectBox div.theme{background:none;}
.selectBox div.theme.active{color:#F18D00;}
File diff suppressed because one or more lines are too long
+12 -3
View File
@@ -1,6 +1,6 @@
axios.defaults.baseURL = BASE_PATH;
axios.defaults.headers.post['Content-Type'] = 'application/json';
axios.defaults.timeout = 10000;
axios.defaults.timeout = 15000;
// 添加请求拦截器
axios.interceptors.request.use(function (config) {
@@ -11,18 +11,27 @@ axios.interceptors.request.use(function (config) {
return Promise.reject(error);
});
var showTimeOutTime = 0;
// 添加响应拦截器
axios.interceptors.response.use(function (response) {
plus.nativeUI.closeWaiting();
return response;
}, function (error) {
if(error=="Error: Network Error"){
if (error.toString().indexOf('timeout') > -1) {
var curTime = new Date();
if (curTime - showTimeOutTime > 5000) {
plus.nativeUI.alert("请求超时");
showTimeOutTime = new Date();
}
plus.nativeUI.closeWaiting();
}else if(error=="Error: Network Error"){
if(plus.webview.getWebviewById('error.html')==null){
clicked('error.html',true,false,{},{},function(){
window.location.reload();
})
}else{
$(".loadingBg").hide();
plus.nativeUI.closeWaiting();
plus.nativeUI.closeWaiting();
plus.webview.getWebviewById("error.html").show();
}
}
+3 -4
View File
@@ -29,11 +29,11 @@ function shareAction(sb,bh) {
if(sharehrefTitle&&sharehrefTitle!=""){
msg.title=sharehrefTitle;
}
if(sharehrefDes&&sharehrefDes!=""){
if(sharehrefTitle&&sharehrefTitle!=""){
if(sb.title=="新浪微博"){
msg.content=shareUrl+sharehrefDes;
msg.content=shareUrl+"\t"+sharehrefTitle;
}else{
msg.content=sharehrefDes;
msg.content=sharehrefTitle;
}
}
msg.thumbs=[picUrl];
@@ -47,7 +47,6 @@ function shareAction(sb,bh) {
if ( sb.s.authenticated ) {
shareMessage(msg,sb.s);
} else {
plus.nativeUI.alert("---未授权---");
sb.s.authorize( function(){
shareMessage(msg,sb.s);
},function(e){
+2 -2
View File
@@ -8,7 +8,7 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="css/mui.min.css">
<link rel="stylesheet" href="css/mui.css">
<link rel="stylesheet" href="css/main.css">
<style>
.mui-bar-tab{background:#fff;box-shadow:none;}
@@ -58,7 +58,7 @@
}
//document.getElementById("quotations").setAttribute("href", BASE_PATH + '/quotations/index');
//document.getElementById("selfInfo").setAttribute("href", BASE_PATH + '/selfInfo/index');
//mui初始化
//mui初始化
mui.init();
var subpages = ['yfindex.html', 'views/house/houseDetail.html', 'views/house/houseManageList.html', 'views/user/userInfo.html'];
var subpage_style = {
+28 -3
View File
@@ -1546,7 +1546,8 @@
"views/rent/rent.html",
"views/district/detail.html",
"views/house/houseList.html",
"views/house/cityDetail.html"
"views/house/cityDetail.html",
"views/intelligentHouse/index.html"
],
"priority": 0
},
@@ -1570,7 +1571,8 @@
"/views/user/bindingMobile.html"
],
"refer": [
"views/user/passLogin.html"
"views/user/passLogin.html",
"views/user/bindingMobile.html"
],
"priority": 0
},
@@ -1710,7 +1712,8 @@
"views/house/cityDetail.html": {
"resources": [],
"refer": [
"views/user/codeSms.html"
"views/user/codeSms.html",
"views/district/detail.html"
],
"priority": 0
},
@@ -1735,6 +1738,28 @@
"views/setting/agreement.html"
],
"priority": 0
},
"views/intelligentHouse/index.html": {
"resources": [],
"refer": [
"views/intelligentHouse/mapDetail.html"
],
"priority": 0
},
"views/intelligentHouse/mapDetail.html": {
"resources": [],
"refer": [
"views/intelligentHouse/aroundDetail.html"
],
"priority": 0
},
"views/house/detail.html": {
"resources": [],
"refer": [
"views/rent/rentManager.html",
"views/loan/loanInfo.html"
],
"priority": 0
}
},
"idle": {
+1 -1
View File
@@ -150,7 +150,7 @@
</div>
<div id="baseInfo" class="list-block">
<div id="baseInfo" class="list-block mb05">
<base-info-component></base-info-component>
</div>
@@ -15,10 +15,8 @@
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=0a7eM0lkIvpKGPiq1bMCfeH7"></script>
<style>
.list-block ul:before{height:0;}
.priceRecovery + .list-block ul:after{height:0;}
.theme {
background-color: #F18D00;
}
</style>
</head>
@@ -27,7 +25,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>
@@ -89,7 +87,7 @@
<div class="col-50"><a class="button" v-on:click="feedback(0,$event)">低了</a></div>
</div>
</div>
<div class="list-block media-list">
<div class="list-block media-list mb05">
<ul>
<li>
<div class="item-content">
+22 -3
View File
@@ -1267,7 +1267,23 @@ function onPlusReady(){
$("#input_city").val("上海");
$(".nowCity").text("上海");
}
getRequestId();
}
// 生成请求ID,防止重复提交
var requestId = "";
function getRequestId() {
axios.get("/rest/index/id")
.then(function (response) {
if(response.data.status){
requestId = response.data.data;
}
})
.catch(function (error) {
console.log(error);
});
}
/* 弹出城市选择页面 */
$(document).on("click",".open-about01", function () {
$.popup(".popup-about01");
@@ -1828,7 +1844,7 @@ function checkIsLogin(){
function addEvaluation(){
var data={};
if(type==0){
data={cityDisplay: $("#input_city").val(),
data={id:requestId,cityDisplay: $("#input_city").val(),
region:$("input[name=region]").val(),
district:$("#input_address").val(),
address:$("input[name=address]").val(),
@@ -1844,7 +1860,7 @@ function addEvaluation(){
lastRentDate:$("#input_time03").val(),
houseStatus:0}
}else{
data={cityDisplay: $("#input_city").val(),
data={id:requestId,cityDisplay: $("#input_city").val(),
region:$("input[name=region]").val(),
district:$("#input_address").val(),
address:$("input[name=address]").val(),
@@ -1863,7 +1879,9 @@ function addEvaluation(){
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})
clicked('/views/evaluate/evaluateReport.html',true,false,{},{hid:id},function(){
getRequestId();
})
}else{
$("#evaluation_btn").removeAttr("disabled");
$.toast(response.data.message);
@@ -1874,6 +1892,7 @@ function addEvaluation(){
});
}
/* 信息输入弹窗 */
$(document).on('click','.open-modal', function () {
$.modal({
+1 -1
View File
@@ -9,7 +9,7 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="http://g.alicdn.com/msui/sm/0.6.2/css/sm.css">
<link rel="stylesheet" href="../../css/sm.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/city.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
+1 -1
View File
@@ -57,7 +57,7 @@
<h1 class="title">我的房产</h1>
</header>
<div class="content infinite-scroll infinite-scroll-bottom" data-distance="50">
<div class="card cardPrice cardPrice01" id="houseInfo">
<div class="card cardPrice cardPrice01" id="houseInfo" v-cloak>
<div class="card-header">
<span>房产总值</span>
<a class="button theme" href="#" onclick="gotoAddHouse()">添加房产</a>
@@ -144,16 +144,17 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script>
/*var lat = 31.2221;
var lng = 121.359204;
var city = "上海";
var address="广顺小区";
var travelTime=20;
var minAvgPrice=50000;
var maxAvgPrice=80000;
/*var lat = 39.946147;
var lng = 116.107604;
var city = "北京";
var address="门头沟区";
var travelTime=30;
var minAvgPrice=54545;
var maxAvgPrice=66666;
var areaTag=3;
var tag="近地铁_公交多_买菜做饭_商超便利_爱逛街_在外面吃_近医疗_近幼儿园_近小学_近中学";
var orderBy=0;*/
var orderBy=0;
init();*/
var lat;
var lng;
var city;
@@ -503,7 +504,7 @@ function addItems(number, lastIndex) {
}
}
html += '<li onclick="openDistWindow(\''+dataObj[i].city+'\',\''+dataObj[i].district+'\',\''+dataObj[i].name+'\')">'+
'<a class=external item-content>'+
'<a class="external item-content">'+
'<div class="item-inner">'+
'<div class="item-title-row"><div class="item-title">'+dataObj[i].name+'</div><div class="item-after"><em>¥'+dataObj[i].avgPrice+'元/㎡</em></div></div>'+
'<div class="item-title-row"><div class="item-title"><i class="icon icon-address03"></i><small>'+dataObj[i].city+dataObj[i].district+dataObj[i].address+'</small></div>'+
+3 -3
View File
@@ -9,7 +9,7 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="http://g.alicdn.com/msui/sm/0.6.2/css/sm.css">
<link rel="stylesheet" href="../../css/sm.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=0a7eM0lkIvpKGPiq1bMCfeH7"></script>
@@ -151,8 +151,8 @@
</div>
</div>
<script type="text/javascript" src="http://g.alicdn.com/sj/lib/zepto/zepto.js" charset="utf-8"></script>
<script type="text/javascript" src="http://api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js "></script>
<script type="text/javascript" src="../../js/zepto.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/RichMarker_min.js "></script>
<script>
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
+2 -2
View File
@@ -9,7 +9,7 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="http://g.alicdn.com/msui/sm/0.6.2/css/sm.css">
<link rel="stylesheet" href="../../css/sm.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/city.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
@@ -104,7 +104,7 @@
</div>
</div>
<script type="text/javascript" src="http://g.alicdn.com/sj/lib/zepto/zepto.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/zepto.js" charset="utf-8"></script>
<script>
+16 -13
View File
@@ -12,7 +12,9 @@
<link rel="stylesheet" href="../../css/sm.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
<style>
html,body{height:auto;}
</style>
</head>
<body>
@@ -120,18 +122,19 @@ function openView() {
clicked(BASE_PATH + '/user/agreement',true)
}
var originalHeight=document.documentElement.clientHeight || document.body.clientHeight;
window.onresize=function(){
//软键盘弹起与隐藏 都会引起窗口的高度发生变化
var resizeHeight=document.documentElement.clientHeight || document.body.clientHeight;
if(resizeHeight*1<originalHeight*1){ //resizeHeight<originalHeight证明窗口被挤压了
if(window.viewsPage=="codeSms"){
plus.webview.currentWebview().setStyle({
height:originalHeight
});
}
}
}
/* 防止软键盘弹出所引起的定位问题 */
var winHeight = $(window).height(); // 获取当前页面高度
$(window).resize(function(){
var thisHeight = $(this).height();
if(winHeight - thisHeight > 50){
//当软键盘弹出,在这里面操作
$(".loginMode").hide();
}else{
//当软键盘收起,在此处操作
$(".loginMode").show();
}
});
</script>
</body>
+12 -10
View File
@@ -162,17 +162,19 @@ new Vue({
}
});
var originalHeight=document.documentElement.clientHeight || document.body.clientHeight;
window.onresize=function(){
//软键盘弹起与隐藏 都会引起窗口的高度发生变化
var resizeHeight=document.documentElement.clientHeight || document.body.clientHeight;
if(resizeHeight*1<originalHeight*1){ //resizeHeight<originalHeight证明窗口被挤压了
plus.webview.currentWebview().setStyle({
height:originalHeight
});
/* 防止软键盘弹出所引起的定位问题 */
var winHeight = $(window).height(); // 获取当前页面高度
$(window).resize(function(){
var thisHeight = $(this).height();
if(winHeight - thisHeight > 50){
//当软键盘弹出,在这里面操作
$(".loginMode").hide();
}else{
//当软键盘收起,在此处操作
$(".loginMode").show();
}
});
}
}
</script>
</body>
+1 -1
View File
@@ -142,7 +142,7 @@
</div>
</div>
</div>
<div class="buttons-tab fixed-tab theme" data-offset="44" id="tab">
<div class="buttons-tab fixed-tab theme" data-offset="44" id="tab" v-cloak>
<a href="#tabList1" class="tab-link button active">房产({{mh_num}})</a>
<a href="#tabList2" class="tab-link button">关注({{mf_num}})</a>
<a href="#tabList3" class="tab-link button">收藏({{mc_num}})</a>