Merge branch '2020-717-formal' into dev

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

@@ -582,7 +582,7 @@ class Anniversary2020 extends Component {
 
     const _auditions = auditionShowAll && auditions.length ? auditions : auditions.slice(0, 4)
     const _group = groupShowAll && group.length ? group : group.slice(0, 4)
-    const _rankList = isShowAllRankList ? rankList : rankList.slice(0, 10)
+    const _rankList = Array.isArray(rankList) ? isShowAllRankList ? rankList : rankList.slice(0, 10) : []
 
     return (
       <div className={'anniversary-2020'}>
@@ -927,7 +927,7 @@ class Anniversary2020 extends Component {
                 </ul>
               </div>
               {
-                prizeData.stage !== 1 && <table>
+                !!_rankList.length && prizeData.stage !== 1 && <table>
                   <thead>
                   <tr>
                     <th>名次</th>
@@ -938,7 +938,7 @@ class Anniversary2020 extends Component {
                   </thead>
                   <tbody>
                   {
-                    !!_rankList.length && _rankList.map((item, index) => {
+                     _rankList.map((item, index) => {
                       return <tr key={index}>
                         <td>
                           {

src/components/detail/group/index.js

@@ -116,7 +116,7 @@ class Group extends Component {
             day = `${parseInt(date / (3600000 * 24))}`.padStart(2, 0)
             hours = `${parseInt((date - day * 3600000 * 24) / 3600000)}`.padStart(2, 0)
             minutes = `${parseInt((date - day * 3600000 * 24 - hours * 3600000) / 60000)}`.padStart(2, 0)
-            return `${day}:${hours}:${minutes}`;
+            return `${day}天${hours}时${minutes}分`;
         } else {
             hours = `${parseInt(date / (60 * 60 * 1000))}`.padStart(2, 0);
             minutes = `${parseInt((date - hours * 3600000) / 60000)}`.padStart(2, 0);

src/components/detail/group/togroup.js

@@ -76,7 +76,7 @@ class ToGroup extends Component {
                         hours = `${parseInt((date - day * 3600000 * 24) / 3600000)}`.padStart(2, 0)
                         minutes = `${parseInt((date - day * 3600000 * 24 - hours * 3600000) / 60000)}`.padStart(2, 0)
                         this.setState({
-                            countdown: `${day}:${hours}:${minutes}`
+                            countdown: `${day}天${hours}时${minutes}分`
                         })
                     } else {
                         hours = `${parseInt(date / (60 * 60 * 1000))}`.padStart(2, 0)

src/components/detail/index.js

@@ -426,7 +426,7 @@ class Detail extends Component {
                                     // seconds = `${parseInt((date - day * 3600000 * 24 - hours * 3600000 - minutes * 60000) / 1000)}`.padStart(2, 0);
 
                                     this.setState({
-                                        countdown: `${day}:${hours}:${minutes}`
+                                        countdown: `${day}天${hours}时${minutes}分`
                                     })
                                 } else {
                                     hours = `${parseInt(date / (60 * 60 * 1000))}`.padStart(2, 0)