From a6ae7e3f475f63b7a6af4e8cd4a1cd63761b7c02 Mon Sep 17 00:00:00 2001
From: adddna <zzaadddna@live.com>
Date: Thu, 16 Jan 2020 22:24:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B9=B4=E5=BA=A6=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 部分文案修改
- 校对了所有标点
- 取消了所有单位的样式
---
 .../CC98.Forum/Pages/AnnualReview/page1.tsx   | 15 +++---
 .../CC98.Forum/Pages/AnnualReview/page2.tsx   | 41 +++++++++++------
 .../CC98.Forum/Pages/AnnualReview/page3.tsx   | 46 ++++++++++++-------
 .../CC98.Forum/Pages/AnnualReview/page4.tsx   |  2 +-
 .../CC98.Forum/Pages/AnnualReview/page5.tsx   |  2 +-
 5 files changed, 66 insertions(+), 40 deletions(-)

diff --git a/CC98.Forum/CC98.Forum/Pages/AnnualReview/page1.tsx b/CC98.Forum/CC98.Forum/Pages/AnnualReview/page1.tsx
index bc88e916..308a7a1b 100644
--- a/CC98.Forum/CC98.Forum/Pages/AnnualReview/page1.tsx
+++ b/CC98.Forum/CC98.Forum/Pages/AnnualReview/page1.tsx
@@ -17,8 +17,9 @@ export default class extends React.Component<{ data }> {
         <div>
           在过去的2019年里，你有
           <span className="annual-review-page2-topicCount">
-            {data.postDay}天
+            {data.postDay}
           </span>
+          天
         </div>
 
         <div>在CC98论坛上留下了痕迹。</div>
@@ -26,24 +27,24 @@ export default class extends React.Component<{ data }> {
         <div style={{ marginTop: '1rem' }}>
           你发表了
           <span className="annual-review-page2-topicCount">
-            {data.topicCount}个
+            {data.topicCount}
           </span>
-          主题帖，
+          个主题帖，
         </div>
         <div>
           进行了
           <span className="annual-review-page2-replyCount">
-            {data.replyCount}次
+            {data.replyCount}
           </span>
-          回复，
+          次回复，
         </div>
         {data.hotTopicCount !== 0 && (
           <div>
             上了
             <span className="annual-review-page2-hotTopicCount">
-              {data.hotTopicCount}次
+              {data.hotTopicCount}
             </span>
-            十大热门话题。
+            次十大热门话题。
           </div>
         )}
         {data.hotTopicCount === 0 && (
diff --git a/CC98.Forum/CC98.Forum/Pages/AnnualReview/page2.tsx b/CC98.Forum/CC98.Forum/Pages/AnnualReview/page2.tsx
index f6a2c7da..c03cce25 100644
--- a/CC98.Forum/CC98.Forum/Pages/AnnualReview/page2.tsx
+++ b/CC98.Forum/CC98.Forum/Pages/AnnualReview/page2.tsx
@@ -8,50 +8,63 @@ export default class extends React.Component<{ data }> {
         <div style={{ marginTop: "1rem" }}>
           你送出了
           <span className="annual-review-page2-topicCount">
-            {data.sendLikeCount}个
+            {data.sendLikeCount}
           </span>
-          赞，
+          个赞，
         </div>
         <div>
           收到他人给你的
           <span className="annual-review-page2-replyCount">
-            {data.receiveLikeCount}个
+            {data.receiveLikeCount}
           </span>
-          赞。
+          个赞。
         </div>
 
         <div style={{ marginTop: "1.5rem" }}>
           你给他人评分
           <span className="annual-review-page2-topicCount">
-            {data.sendRateCount}次，
+            {data.sendRateCount}
           </span>
+          次，
         </div>
         <div>
           收到了他人给你的
           <span className="annual-review-page2-replyCount">
-            {data.receiveRateCount}次
+            {data.receiveRateCount}
           </span>
-          评分。
+          次评分。
         </div>
 
-        {data.sofaCount > 0 && (
+        {data.sofaCount > 20 && (
           <>
-            <div style={{ marginTop: '1.5rem' }}>你眼疾手快,</div>
+            <div style={{ marginTop: '1.5rem' }}>你眼疾手快，</div>
             <div>
               抢到了
               <span className="annual-review-page2-replyCount">
-                {data.sofaCount}次
+                {data.sofaCount}
               </span>
-              沙发。
+              次沙发。
+            </div>
+          </>
+        )}
+
+        {data.sofaCount <= 20 && data.sofaCount > 0 &&(
+          <>
+            <div style={{ marginTop: '1.5rem' }}>你手速尚可，</div>
+            <div>
+              抢到了
+              <span className="annual-review-page2-replyCount">
+                {data.sofaCount}
+              </span>
+              次沙发。
             </div>
           </>
         )}
 
         {data.sofaCount === 0 && (
           <>
-            <div style={{ marginTop: '1.5rem' }}>你从未抢到过沙发。</div>
-            <div>2020年，给自己一个目标：</div>
-            <div>抢到一次沙发！</div>
+            <div style={{ marginTop: '1.5rem' }}>你佛系水帖，</div>
+            <div>从未抢到过沙发。</div>
           </>
         )}
       </div>
diff --git a/CC98.Forum/CC98.Forum/Pages/AnnualReview/page3.tsx b/CC98.Forum/CC98.Forum/Pages/AnnualReview/page3.tsx
index e8eeb60b..c591eecd 100644
--- a/CC98.Forum/CC98.Forum/Pages/AnnualReview/page3.tsx
+++ b/CC98.Forum/CC98.Forum/Pages/AnnualReview/page3.tsx
@@ -7,48 +7,60 @@ export default class extends React.Component<{ data }> {
       return (
         <div className="annual-review-page">
           在过去的一年里，你还没有发过主题帖...
-              </div>
+        </div>
       );
     }
     return <div className="annual-review-page">
       <div>在你一年发表的主题帖中，</div>
       {data.mostReplyTopicCount && (
-        <div>
+        <>
           <div>
             收到最多回复的一次，
           </div>
           <div>
             共有
             <span className="annual-review-page2-topicCount">
-              {data.mostReplyTopicCount}个
+              {data.mostReplyTopicCount}
             </span>
-            回复；
+            个回复；
           </div>
-        </div>
-      )
-      }
+        </>
+      )}
+
       {
         data.mostViewTopicCount && (
-          <div>
+          <>
             <div>
               点击量最多的一次，
             </div>
             <div>
               共有
              <span className="annual-review-page2-replyCount">
-                {data.mostViewTopicCount}次
-             </span>
-              点击。
+                {data.mostViewTopicCount}
+              </span>
+              次点击。
               </div>
-          </div>
+          </>
         )
       }
 
-      {data.mostReceiveLikePostCount !== 0 && <div style={{ marginTop: '2rem' }}>你收获他人点赞最多的一个发言，</div>}
-      {data.mostReceiveLikePostCount !== 0 && <div>共收到了<span className="annual-review-page2-hotTopicCount">{data.mostReceiveLikePostCount}个</span>赞。</div>}
-
-
-    </div >
+      {
+        data.mostReceiveLikePostCount !== 0 && (
+          <div style={{ marginTop: '2rem' }}>
+            你收获他人点赞最多的一个发言，
+        </div>
+        )}
+      {
+        data.mostReceiveLikePostCount !== 0 && (
+          <div>
+            共收到了
+          <span className="annual-review-page2-hotTopicCount">
+              {data.mostReceiveLikePostCount}
+            </span>
+            个赞。
+        </div>
+        )}
+    </div>
   }
 
 }
\ No newline at end of file
diff --git a/CC98.Forum/CC98.Forum/Pages/AnnualReview/page4.tsx b/CC98.Forum/CC98.Forum/Pages/AnnualReview/page4.tsx
index a449f28e..7ad44cfa 100644
--- a/CC98.Forum/CC98.Forum/Pages/AnnualReview/page4.tsx
+++ b/CC98.Forum/CC98.Forum/Pages/AnnualReview/page4.tsx
@@ -74,7 +74,7 @@ export default class extends React.Component<{ data }> {
           <div>
             {" "}
             <span className="annual-review-page2-topicCount">
-              {moment(data.latestPostTime).format("a h [点] mm [分]")}
+              {moment(data.latestPostTime).format("a hh [:] mm")}
             </span>
             还在98发言。
           </div>
diff --git a/CC98.Forum/CC98.Forum/Pages/AnnualReview/page5.tsx b/CC98.Forum/CC98.Forum/Pages/AnnualReview/page5.tsx
index 974f1758..bb5bcadf 100644
--- a/CC98.Forum/CC98.Forum/Pages/AnnualReview/page5.tsx
+++ b/CC98.Forum/CC98.Forum/Pages/AnnualReview/page5.tsx
@@ -62,7 +62,7 @@ export default class extends React.Component<{ data }> {
         )}
 
         <div style={{ marginTop: "3rem" }}>
-          你发言的时间段统计如下:
+          你发言的时间段统计如下：
         </div>
 
         <div style={{ marginTop: "1rem", marginRight: "2rem" }}>