Merge remote-tracking branch 'origin/new_partner_dashboard' into new_partner_dashboard

src/main/ui/static/dashboard/templates/partner_dashboard.html

@@ -339,7 +339,7 @@
     <div class="row">
         <div class="col-md-8 col-sm-8 col-xs-12" >
             <div class="card m-b-30">
-                <div class="card-body" style="height: 500px">
+                <div class="card-body">
                     <h4 class="mt-0 m-b-15 header-title">
                         Settlement Logs
                         <a style="float: right" role="button" ui-sref="settlementlogs">+ more</a>
@@ -385,7 +385,7 @@
                 <div class="card-body">
                     <h4 class="mt-0 header-title">交易类型分布-交易量</h4>
 
-                    <div class="chart" style="height: 445px" echarts="trade_type_chart"
+                    <div class="chart" style="height: 400px" echarts="trade_type_chart"
                          ng-class="{nodata:trade_type_chart.nodata}"></div>
                 </div>
             </div>