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

This commit is contained in:
2018-05-17 15:26:12 +08:00
4 changed files with 18 additions and 17 deletions
+7 -13
View File
@@ -516,7 +516,7 @@ input::-webkit-input-placeholder{
.cardInfo02 .item-content{padding: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 font{font-size:0.7rem;white-space:normal;-webkit-line-clamp:2;-webkit-box-orient:vertical;display:-webkit-box;margin:0.2rem 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;}
@@ -868,19 +868,13 @@ input::-webkit-input-placeholder{
/* 图表 */
.chart{width:100%;height:250px;}
.chart tspan{font-size:0.6rem;text-shadow:none;}
.chart01Box{height:270px;position:relative;}
#chart01a{height:270px;position:absolute;z-index:1;}
#chart01{height:270px;position:absolute;z-index:-1;}
.topic .topicTitle > div.icon01Box{overflow:hidden;float:none;display:inline-block;vertical-align:middle;}
.icon-chart01a{width:0.9rem;height:0.8rem;background:url(../images/icon-chart01a.png) no-repeat center center;background-size:100%;float:left;}
.icon-chart01{width:0.9rem;height:0.8rem;background:url(../images/icon-chart01.png) no-repeat center center;background-size:100%;float:left;}
.chart01Box{height:270px;}
#chart01{height:270px;}
#chart01a{height:270px;}
.topic .topicTitle > div.icon01Box{overflow:hidden;float:none;display:inline-block;vertical-align:middle;margin-left:-0.5rem;}
.icon-chart01a{width:1.1rem;height:1rem;background:url(../images/icon-chart01a.png) no-repeat center center;background-size:45%;float:left;padding:0 1rem;}
.icon-chart01{width:1.1rem;height:1rem;background:url(../images/icon-chart01.png) no-repeat center center;background-size:45%;float:left;padding:0 1rem;}
/*
#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;}
+8 -4
View File
@@ -118,18 +118,22 @@ function lineChart() {
mode = "kLine"
$(".icon-chart01a").hide();
$(".icon-chart01").show();
$("#chart01a").css("z-index","-1");
$("#chart01").css("z-index","1");
//$("#chart01a").css("z-index","-1");
//$("#chart01").css("z-index","1");
var type = $("#trendDiv1 a.active").attr("t-v");
$("#chart01a").hide();
$("#chart01").show();
loadKLineData(city, region, name, type);
}
function kLineChart() {
mode = "line"
$(".icon-chart01").hide();
$(".icon-chart01a").show();
$("#chart01").css("z-index","-1");
$("#chart01a").css("z-index","1");
//$("#chart01").css("z-index","-1");
//$("#chart01a").css("z-index","1");
var type = $("#trendDiv1 a.active").attr("t-v");
$("#chart01a").show();
$("#chart01").hide();
loadLineData(city, region, name, type);
};
+1
View File
@@ -291,6 +291,7 @@ $.config = {router: false}
var sharehrefDes = "小区详情介绍!";
var shareId='';
var picUrl = '_www/images/default_share.png';
// baseInfo = new Vue({
// el: '#districtBaseInfo',
@@ -1810,6 +1810,8 @@ function share(){
shareHref();
}
</script>