Merge branch '2020-717-formal' into dev

fc90edc7 · zhanghaozhe · 8f5c34c7 · 979ed9ac · fc90edc7
Commit fc90edc7 authored Jul 14, 2020 by zhanghaozhe
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/App.js
+1 -1

No files found.
--- a/src/App.js
+++ b/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}>