Merge branch '2020-717-formal' into dev

src/components/activity/2020-717/activity/index.js

@@ -517,7 +517,7 @@ class Anniversary2020 extends Component {
         if (code === 200) {
           this.setState((state, props) => {
             return {
-              bulletScreenList: state.bulletScreenList.concat(data),
+              bulletScreenList: state.bulletScreenList.concat(Array.isArray(data) ? data : []),
             }
           });
 

src/components/activity/2020-717/activity/index.scss

@@ -1106,6 +1106,8 @@
   }
 
   .content {
+    max-height: 244px;
+    overflow: auto;
     font-size: 14px;
     color: #525C65;
     white-space: pre-line;