Merge branch 'dev' of https://github.com/ZJU-CC98/Forum into dev

KingPan · Jan 21, 2020 · a2a8715 · a2a8715
2 parents 9507041 + b554c22
commit a2a8715
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/CC98.Forum/CC98.Forum/Pages/AnnualReview/page5.tsx b/CC98.Forum/CC98.Forum/Pages/AnnualReview/page5.tsx
@@ -16,7 +16,6 @@ import {
 } from "bizcharts";
 
 export default class extends React.Component<{ data }> {
-
   getBoardUrlById(boardId) {
     return "/board/" + boardId;
   }
@@ -29,13 +28,25 @@ export default class extends React.Component<{ data }> {
     if (data.postCount06 > 0) {
       during = "深夜";
     }
-    if (data.postCount612 > data.postCount06) {
+    if (
+      data.postCount612 > data.postCount06 &&
+      data.postCount612 > data.postCount1218 &&
+      data.postCount612 > data.postCount1824
+    ) {
       during = "上午";
     }
-    if (data.postCount1218 > data.postCount612) {
+    if (
+      data.postCount1218 > data.postCount06 &&
+      data.postCount1218 > data.postCount612 &&
+      data.postCount1218 > data.postCount1824
+    ) {
       during = "下午";
     }
-    if (data.postCount1824 > data.postCount1218) {
+    if (
+      data.postCount1824 > data.postCount06 &&
+      data.postCount1824 > data.postCount1218 &&
+      data.postCount1824 > data.postCount612
+    ) {
       during = "晚上";
     }
 
@@ -53,17 +64,15 @@ export default class extends React.Component<{ data }> {
     };
     return (
       <div className="annual-review-page">
-
         {during && (
           <div style={{ marginTop: "7rem", marginBottom: "-2rem" }}>
-            你最喜欢在<span className="annual-review-page1-during">{during}</span>
+            你最喜欢在
+            <span className="annual-review-page1-during">{during}</span>
             水98。
           </div>
         )}
 
-        <div style={{ marginTop: "3rem" }}>
-          你发言的时间段统计如下：
-        </div>
+        <div style={{ marginTop: "3rem" }}>你发言的时间段统计如下：</div>
 
         <div style={{ marginTop: "1rem", marginRight: "2rem" }}>
           <Chart

diff --git a/CC98.Forum/CC98.Forum/Pages/AnnualReview/page6.tsx b/CC98.Forum/CC98.Forum/Pages/AnnualReview/page6.tsx
@@ -8,10 +8,10 @@ export default class extends React.Component<{ data }> {
     return (
       <div className="annual-review-page">
         <div>你获得了以下成就：</div>
-        <div style={{ display: "flex", justifyContent: "space-around",marginTop:"0.5rem" }}>
+        <div style={{ display: "flex", justifyContent: "space-around",marginTop:"0.5rem" ,marginLeft: '1rem', marginRight: '1rem', flexWrap: 'wrap'}}>
           {achievements.map((item, index) => (
             <Tag
-              style={{ fontSize: "2vh", height: "3vh", lineHeight: "2.5vh" }}
+              style={{ fontSize: "2vh", height: "3vh", lineHeight: "2.5vh", marginBottom: '0.5rem' }}
               color={colors[index % 4]}
             >
               {item}