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

This commit is contained in:
尹吉欢
2018-04-19 13:14:28 +08:00
6 changed files with 40 additions and 27 deletions
+1
View File
@@ -6,6 +6,7 @@
ul li{list-style:none;}
img{display:block;}
a{color:#F18D00;}
a:active{color:#F18D00;}
em{font-style:normal;color:#333;}
/*
em.up{color:#EB5F34;}
+4 -2
View File
@@ -1499,7 +1499,8 @@
},
"error.html": {
"resources": [
"yfindex.html"
"yfindex.html",
"views/house/houseDetail.html"
],
"refer": [],
"priority": 0
@@ -1716,7 +1717,8 @@
"resources": [],
"refer": [
"views/user/codeSms.html",
"views/district/detail.html"
"views/district/detail.html",
"views/house/regions.html"
],
"priority": 0
},
+1 -1
View File
@@ -1415,7 +1415,7 @@ function loadAllCityData(){
allCityVue.avgUownRate = response.data.data.avgUownRate;
})
.catch(function (error) {
alert("error:"+error)
//alert("error:"+error)
console.log(error);
});
+4
View File
@@ -12,6 +12,10 @@
<link rel="stylesheet" href="http://g.alicdn.com/msui/sm/0.6.2/css/sm.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
<style>
.card-content-inner{padding:0;}
</style>
</head>
+14 -12
View File
@@ -13,7 +13,9 @@
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
<style>
html,body{height:auto;}
@media(max-height:400px) {
.loginMode{display:none;}
}
</style>
</head>
@@ -123,17 +125,17 @@ function openView() {
}
/* 防止软键盘弹出所引起的定位问题 */
var winHeight = $(window).height(); // 获取当前页面高度
$(window).resize(function(){
var thisHeight = $(this).height();
if(winHeight - thisHeight > 50){
//当软键盘弹出,在这里面操作
$(".loginMode").hide();
}else{
//当软键盘收起,在此处操作
$(".loginMode").show();
}
});
//var winHeight = $(window).height(); // 获取当前页面高度
//$(window).resize(function(){
// var thisHeight = $(this).height();
// if(winHeight - thisHeight > 50){
// //当软键盘弹出,在这里面操作
// $(".loginMode").hide();
// }else{
// //当软键盘收起,在此处操作
// $(".loginMode").show();
// }
//});
</script>
+16 -12
View File
@@ -13,7 +13,11 @@
<link rel="stylesheet" href="../../css/sm.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/theme-orange.css">
<style>
@media(max-height:400px) {
.loginMode{display:none;}
}
</style>
</head>
<body>
@@ -163,17 +167,17 @@ new Vue({
});
/* 防止软键盘弹出所引起的定位问题 */
var winHeight = $(window).height(); // 获取当前页面高度
$(window).resize(function(){
var thisHeight = $(this).height();
if(winHeight - thisHeight > 50){
//当软键盘弹出,在这里面操作
$(".loginMode").hide();
}else{
//当软键盘收起,在此处操作
$(".loginMode").show();
}
});
//var winHeight = $(window).height(); // 获取当前页面高度
//$(window).resize(function(){
// var thisHeight = $(this).height();
// if(winHeight - thisHeight > 50){
// //当软键盘弹出,在这里面操作
// $(".loginMode").hide();
// }else{
// //当软键盘收起,在此处操作
// $(".loginMode").show();
// }
//});
</script>