Commit 2d8a8b33 by maolipeng

Merge branch 'dev' of…

Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
parents 3fa5b7d1 fcb2e688
...@@ -283,7 +283,7 @@ class Home extends React.Component { ...@@ -283,7 +283,7 @@ class Home extends React.Component {
<div className='data-footer'> <div className='data-footer'>
<span className='footer-word'>本月新增</span> <span className='footer-word'>本月新增</span>
{incCustomerNum > 0 && <span className='icon iconfont'>&#xe635;</span>} {incCustomerNum > 0 && <span className='icon iconfont'>&#xe635;</span>}
<span className='footer-number'>{incCustomerNum}</span> <span className='footer-number'>{incCustomerNum > 0 ? incCustomerNum : 0}</span>
</div> </div>
</div> </div>
<div className='data-item'> <div className='data-item'>
...@@ -294,8 +294,9 @@ class Home extends React.Component { ...@@ -294,8 +294,9 @@ class Home extends React.Component {
<div className='data-number'>{weekVisitCustomerNum || 0}</div> <div className='data-number'>{weekVisitCustomerNum || 0}</div>
<div className='data-footer'> <div className='data-footer'>
<span className='footer-word'>本月新增</span> <span className='footer-word'>本月新增</span>
{incWeekVisitCustomerNum > 0 && <span className='icon iconfont'>&#xe635;</span>} {incWeekVisitCustomerNum > 0 && <span className='icon iconfont'>&#xe635;</span>}
<span className='footer-number'>{incWeekVisitCustomerNum || 0}</span> <span className='footer-number'>{incWeekVisitCustomerNum > 0 ? incWeekVisitCustomerNum : 0}</span>
</div> </div>
</div> </div>
...@@ -309,7 +310,7 @@ class Home extends React.Component { ...@@ -309,7 +310,7 @@ class Home extends React.Component {
<div className='data-footer'> <div className='data-footer'>
<span className='footer-word'>本月新增</span> <span className='footer-word'>本月新增</span>
{incCustomerNum > 0 && <span className='icon iconfont'>&#xe635;</span>} {incCustomerNum > 0 && <span className='icon iconfont'>&#xe635;</span>}
<span className='footer-number'>{incCustomerNum}</span> <span className='footer-number'>{incCustomerNum > 0 ? incCustomerNum : 0}</span>
</div> </div>
<div className='course-box'> <div className='course-box'>
<div className='course-item'> <div className='course-item'>
...@@ -317,7 +318,7 @@ class Home extends React.Component { ...@@ -317,7 +318,7 @@ class Home extends React.Component {
<div className='data'> <div className='data'>
<span className='course-number'>{liveCourseNum}</span> <span className='course-number'>{liveCourseNum}</span>
{incLiveCourseNum > 0 && <span className='icon iconfont'>&#xe635;</span>} {incLiveCourseNum > 0 && <span className='icon iconfont'>&#xe635;</span>}
<span className='add-number'>{incLiveCourseNum}</span> <span className='add-number'>{incLiveCourseNum > 0 ? incLiveCourseNum : 0}</span>
</div> </div>
</div> </div>
<div className='course-item'> <div className='course-item'>
...@@ -325,7 +326,7 @@ class Home extends React.Component { ...@@ -325,7 +326,7 @@ class Home extends React.Component {
<div className='data'> <div className='data'>
<span className='course-number'>{videoCourseNum}</span> <span className='course-number'>{videoCourseNum}</span>
{incVideoCourseNum > 0 && <span className='icon iconfont'>&#xe635;</span>} {incVideoCourseNum > 0 && <span className='icon iconfont'>&#xe635;</span>}
<span className='add-number'>{incVideoCourseNum}</span> <span className='add-number'>{incVideoCourseNum > 0 ? incVideoCourseNum : 0}</span>
</div> </div>
</div> </div>
<div className='course-item'> <div className='course-item'>
...@@ -333,7 +334,7 @@ class Home extends React.Component { ...@@ -333,7 +334,7 @@ class Home extends React.Component {
<div className='data'> <div className='data'>
<span className='course-number'>{pictureCourseNum}</span> <span className='course-number'>{pictureCourseNum}</span>
{incPictureCourseNum > 0 && <span className='icon iconfont'>&#xe635;</span>} {incPictureCourseNum > 0 && <span className='icon iconfont'>&#xe635;</span>}
<span className='add-number'>{incPictureCourseNum}</span> <span className='add-number'>{incPictureCourseNum > 0 ? incPictureCourseNum : 0}</span>
</div> </div>
</div> </div>
<div className='course-item'> <div className='course-item'>
...@@ -341,7 +342,7 @@ class Home extends React.Component { ...@@ -341,7 +342,7 @@ class Home extends React.Component {
<div className='data'> <div className='data'>
<span className='course-number'>{offlineCourseNum}</span> <span className='course-number'>{offlineCourseNum}</span>
{incOfflineCourseNum > 0 && <span className='icon iconfont'>&#xe635;</span>} {incOfflineCourseNum > 0 && <span className='icon iconfont'>&#xe635;</span>}
<span className='add-number'>{incOfflineCourseNum}</span> <span className='add-number'>{incOfflineCourseNum > 0 ? incOfflineCourseNum : 0}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -355,7 +356,7 @@ class Home extends React.Component { ...@@ -355,7 +356,7 @@ class Home extends React.Component {
<div className='data-footer'> <div className='data-footer'>
<span className='footer-word'>本月新增</span> <span className='footer-word'>本月新增</span>
{incTrainingPlanNum > 0 && <span className='icon iconfont'>&#xe635;</span>} {incTrainingPlanNum > 0 && <span className='icon iconfont'>&#xe635;</span>}
<span className='footer-number'>{incTrainingPlanNum}</span> <span className='footer-number'>{incTrainingPlanNum > 0 ? incTrainingPlanNum : 0}</span>
</div> </div>
</div> </div>
...@@ -368,7 +369,7 @@ class Home extends React.Component { ...@@ -368,7 +369,7 @@ class Home extends React.Component {
<div className='data-footer'> <div className='data-footer'>
<span className='footer-word'>本月新增</span> <span className='footer-word'>本月新增</span>
{incExamNum > 0 && <span className='icon iconfont'>&#xe635;</span>} {incExamNum > 0 && <span className='icon iconfont'>&#xe635;</span>}
<span className='footer-number'>{incExamNum}</span> <span className='footer-number'>{incExamNum > 0 ? incExamNum : 0}</span>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment