Merge branch '2020-717-formal'

src/App.js

@@ -331,7 +331,7 @@ class App extends Component {
     return <>
       <Routes/>
       {
-        isShowActivityEntry &&
+        !!isShowActivityEntry &&
         <div className="year19-index">
           <i className={'iconfont iconiconfront-2'} onClick={this.closeGlobalEntry}></i>
           <a href={jumpUrl}>

src/components/preferential/index.scss

@@ -151,7 +151,6 @@
 
   .notdata{
     width: 100%;
-    padding: 0 35px;
     text-align: center;
     margin-top: 100px;
     color: #666;