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

This commit is contained in:
2018-05-21 10:10:42 +08:00
4 changed files with 29 additions and 31 deletions
+24 -27
View File
@@ -7,6 +7,7 @@ ul li{list-style:none;}
img{display:block;}
a{color:#F18D00;}
a:active{color:#F18D00;}
input{line-height:inherit;}
em{font-style:normal;color:#333;}
/*
em.up{color:#EB5F34;}
@@ -490,10 +491,11 @@ input::-webkit-input-placeholder{
.cardInfo01{color:#333;}
.cardInfo01 > img{width:100%;}
.cardInfo01 span{font-size:0.6rem;color:#666;}
.cardInfo01 .card-header{padding:0;font-size:0.85rem;}
.cardInfo01 .card-content-inner{padding:0;}
.cardInfo01 .card-footer{padding:0;}
.cardInfo01 .card-header{padding:0.5rem 0;font-size:0.85rem;}
.cardInfo01 .card-content-inner{padding:0.5rem 0;}
.cardInfo01 .card-footer{padding:0.5rem 0;}
.cardInfo01a .card-content-inner{padding:0;}
.cardInfo01a .card-content-inner .tag{display:block;margin-bottom:0.5rem;}
.cardInfo01a .card-content-inner .tag small{margin-left:0;margin-right:0.2rem;}
.cardInfo01a .card-footer span{font-size:0.7rem;color:#999;text-align:left;width:50%;}
@@ -501,13 +503,6 @@ input::-webkit-input-placeholder{
.cardInfo01a .card-footer span strong{font-size:0.75rem;color:#333;font-weight:normal;}
.tag small{height:0.9rem;border:solid 1px #FFD038;border-radius:2px;padding:0 5px;font-size:80%;color:#F5A100;line-height:0.9rem;margin-left:0.2rem;display:inline-block;}
/*
.tag small:nth-child(1){background:#E7F2FF;color:#76A5DD;margin-left:0;}
.tag small:nth-child(2){background:#E6F9E6;color:#6FBA6F;}
.tag small:nth-child(3){background:#FDF3DD;color:#E8AF27;}
.tag small:nth-child(4){background:#FDE9E2;color:#DD7B57;}
.tag small:nth-child(5){background:#F5EFFF;color:#A585D6;}
*/
.cardInfo01b .card-footer span{font-size:0.7rem;color:#999;display:inline-block;width:100%;word-wrap:break-word;white-space:normal;}
@@ -553,7 +548,7 @@ input::-webkit-input-placeholder{
/* 资讯 */
.content-padded{margin:0.75rem;}
.content-padded h1{font-size:1.1rem;line-height:1.6rem;letter-spacing:0.11rem;}
.content-padded p{font-size:0.8rem;line-height:1.5rem;letter-spacing:0.06rem;text-align:justify;clear:both;overflow:hidden;}
.content-padded p{font-size:0.8rem;color:#333;line-height:1.5rem;letter-spacing:0.06rem;text-align:justify;clear:both;overflow:hidden;}
.content-padded p span{margin-left:1rem;}
.content-padded p small{font-size:0.65rem;color:#999;line-height:0.9rem;letter-spacing:0.07rem;float:left;}
.content-padded img{width:100%;}
@@ -620,14 +615,14 @@ input::-webkit-input-placeholder{
.top{width:100%;padding:0.75rem 0.5rem;border-bottom:solid 1px #e7e7e7;overflow:hidden;position:absolute;top:0;z-index:10;}
.top.bar{height:auto;}
.top.bar ~ .content{top:66px;}
.top .searchBox{background:#EFEFEF;border-radius:0.25rem;overflow:hidden;padding:0.3rem 0;}
.top .searchBox .cityChoice{float:left;margin-left:0.5rem;margin-right:0.5rem;}
.top .searchBox .cityChoice a{color:#333;display:inline-block;}
.top .searchBox .cityChoice i{width:10px;height:5px;background:url(../images/arrow_select.png) no-repeat center center;background-size:100%;display:inline-block;vertical-align:middle;margin-left:0.2rem;}
.top .searchBox span{float:left;border-left:solid 1px #e0e0e0;overflow:hidden;}
.top .searchBox span input{width:85%;background:none;padding-left:0.25rem;display:inline-block;vertical-align:text-bottom;border:none;font-size:0.7rem;}
.top .searchBox span i{width:16px;height:16px;background:url(../images/search.png) no-repeat left center;background-size:100%;display:inline-block;vertical-align:text-bottom;margin-left:0.3rem;}
.top .searchBox .cancel{float:right;color:#2db0fc;}
.top .icon{color:#b4b4b4;padding:0;}
.top .searchBox{background:#EFEFEF;border-radius:0.25rem;padding:0.3rem 0;position:relative;}
.top .searchBox .cityChoice{width:24%;margin-left:0.5rem;border-right:solid 1px #e0e0e0;position:absolute;left:0;top:0.3rem;z-index:100;}
.top .searchBox .cityChoice a{color:#333;display:inline-block;vertical-align:middle;max-width:70px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
.top .searchBox .cityChoice i{font-size:0.5rem;right:-0.3rem;}
.top .searchBox span{width:100%;display:block;position:relative;}
.top .searchBox span i{font-size:0.9rem;left:34%;padding-left:0.2rem;}
.top .searchBox span input{width:90%;background:none;border:none;padding-left:35%;display:inline-block;vertical-align:middle;}
.top01{background:#fff;border-bottom:solid 1px #e7e7e7;padding:0 0.5rem;}
.top01 .searchBox{background:none;}
@@ -1025,19 +1020,12 @@ input::-webkit-input-placeholder{
.cardRankingBox01 .cardRanking{width:33.33%;border:none;border-radius:0;margin:0;}
.cardRankingBox01 .cardRanking:last-child{border-right:none;}
.cardRankingBox01 .cardRanking .card-header:first-child{border-right:none;padding:0;padding-top:0.5rem;padding-bottom:0.5rem;font-size:0.75rem;}
.cardRankingBox01 .cardRanking .card-header{border-right:solid 1px #e7e7e7;padding-top:0;}
.cardRankingBox01 .cardRanking .card-header{border-right:solid 1px #e7e7e7;padding-top:0;color:#333;}
.cardRankingBox01 .cardRanking .card-header em{font-size:0.85rem;color:#F18D00;margin-right:0.2rem;}
.cardRankingBox01 .cardRanking .card-content-inner{color:#999;border-right:solid 1px #e7e7e7;}
.cardRankingBox01 .cardRanking .card-footer{padding:0;border-right:solid 1px #e7e7e7;}
.cardRankingBox01 .cardRanking .card-footer em{color:#EB5F34;}
/*
.swiper-container{height:auto;padding-bottom:0;}
.swiper-pagination-bullet{background:none;border:solid 1px #d7d7d7;opacity:1;}
.swiper-pagination-bullet-active{background:#F18D00;border:solid 1px #F18D00;}
.swiper-container-horizontal > .swiper-pagination{top:11.2rem;bottom:inherit;}
*/
/* 贷款 */
.banner{width:100%;height:80px;background:url(../images/banner.png);background-size:100%;margin-bottom:0.5rem;}
.banner .content-block{padding:0 2rem;padding-top:1rem;}
@@ -1412,6 +1400,9 @@ input[type=range]::-webkit-slider-thumb {
/* 自适应 */
@media(max-width:414px){
.top .searchBox .cityChoice{width:24%;}
.top .searchBox span i{left:28%;}
.top .searchBox span input{padding-left:29%;}
.list-block .item-title span.c3a{max-width:220px;}
.textAlignLeft{left:88px;}
.textAlignLeft01{left:110px;}
@@ -1430,6 +1421,9 @@ input[type=range]::-webkit-slider-thumb {
.guideBox02 .link{margin-top:17.7rem;}
}
@media(max-width:375px){
.top .searchBox .cityChoice{width:26%;}
.top .searchBox span i{left:29%;}
.top .searchBox span input{padding-left:30%;}
.list-block .item-title span.c3a{max-width:180px;}
label.spacing01{margin-right:11px;}
label.spacing02{margin-right:12px;}
@@ -1442,6 +1436,9 @@ input[type=range]::-webkit-slider-thumb {
.rangeNote span.span05{margin-right:13%;}
}
@media(max-width:320px){
.top .searchBox .cityChoice{width:30%;}
.top .searchBox span i{left:34%;}
.top .searchBox span input{padding-left:35%;}
.topic .topicTitle{font-size:0.75rem;}
.list-block .item-title span.c3a{max-width:112px;}
.list-block .item-title label{max-width:100px;}
+1 -1
View File
@@ -13,7 +13,7 @@
<style>
.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-icon{font-size:1.1rem;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;}
+1 -1
View File
@@ -31,7 +31,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="mui-icon mui-icon mui-icon-arrowleft"></span>
</button>
+3 -2
View File
@@ -37,8 +37,8 @@
</div>
<div class="bar top">
<div class="searchBox">
<div class="cityChoice open-about01"><a id="input_city"></a><i></i></div>
<span class="open-about02"><i></i><input type="text" id="input_address" placeholder="搜索小区" readonly="readonly"></span>
<div class="cityChoice open-about01"><a id="input_city"></a><i class="icon icon-down"></i></div>
<span class="open-about02"><i class="icon icon-search"></i><input type="text" id="input_address" placeholder="搜索小区" readonly="readonly"></span>
<input name ="region" type="text" style="display:none;"/>
<input name ="cityAddress" id="cityAddress" type="text" style="display:none;"/>
<input id="address" name = "address" type="hidden"/>
@@ -1195,6 +1195,7 @@ $.config = {router: false}
<script type="text/javascript" src="js/city.js" ></script>
<script>
function openHangQing(city,id){
var eventType = "newsClick";
var dataMap = {};