Merge branch 'develop'

src/pages/dataDashboards/components/joinInfo/index.scss

@@ -18,7 +18,13 @@ $design_height:856;
         font-weight: bold;
         color: #FFFFFF;
         line-height: 6.08rem;
+        .text{
+          font-size: 3rem;
+          font-weight: bold;
+          color: #FFFFFF;
+        }
         &:after{
+          display: none;
           content: '家';
           font-size: 3rem;
           font-weight: bold;

src/pages/dataDashboards/components/joinInfo/index.tsx

@@ -109,10 +109,11 @@ const JoinInfo = () => {
   return (
     <div className='join-info'>
       <div className='join-info-card-1'>
-        <div className='join-count'>{joinReportDataType?.companyAuthCount}</div>
-        <div className='join-meta'>
-          已认证企业总数（入驻{joinReportDataType?.joinStoreCount}家）
+        <div className='join-count'>
+          <span className='num'>{joinReportDataType?.companyAuthCount}</span>
+          <span className='text'>家（入驻{joinReportDataType?.joinStoreCount}家）</span>
         </div>
+        <div className='join-meta'>已认证企业总数</div>
       </div>
       <div className='join-info-card-2'>
         <div className='card-header'>

src/pages/dataDashboards/components/tradeInfo/index.scss

@@ -56,6 +56,7 @@ $design_height:856;
       }
     }
     .card-echarts{
+      //transform: translateX(5%);
       width: 100%;
       height: toVh(300,1080);
     }

src/pages/dataDashboards/components/tradeInfo/index.tsx

@@ -37,7 +37,12 @@ const TradeInfo = () => {
           fontSize: 15,
         },
       },
-      yAxis: {},
+      yAxis: {
+        axisLabel: {
+          color: '#000',
+          fontSize: 10,
+        },
+      },
       series: [
         {
           name: '总交易额',