fix: 表情包路由评分数量

ZJU-CC98 · Dec 19, 2018 · c818d38 · c818d38
1 parent 103e596
commit c818d38
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/pages/Editor/Editor/ToolBox/StickerBox.tsx b/src/pages/Editor/Editor/ToolBox/StickerBox.tsx
@@ -37,7 +37,7 @@ const BaseUrl = 'https://www.cc98.org/static/images'
 function getStickerReactNode(type: StickerType, handleFunc: Function) {
   const stickerArr = []
 
-  const suffix = type === 'em' ? 'gif' : 'png'
+  const suffix = type === 'em' ? 'gif' : type === 'ac' ? 'jpg' : 'png'
   let start = 1
   let end = 54
 
@@ -50,7 +50,12 @@ function getStickerReactNode(type: StickerType, handleFunc: Function) {
 
   for (let i = start; i <= end; i++) {
     const number = i < 10 ? `0${i}` : `${i}`
-    const url = type === 'ac' ? `${type}-mini/${number}` : `${type}-mini/${type}${number}`
+    const url =
+      type === 'ac'
+        ? `${type}-mini/${number}`
+        : type === 'em'
+        ? `${type}/${type}${number}`
+        : `${type}-mini/${type}${number}`
 
     stickerArr.push(
       <Img src={`${BaseUrl}/${url}.${suffix}`} onClick={handleFunc(`${type}${number}`)} />

diff --git a/src/pages/Topic/PostItem/Awards.tsx b/src/pages/Topic/PostItem/Awards.tsx
@@ -64,7 +64,7 @@ const Awards = ({ awards }: Props) => {
       {showExpanded && !expanded && (
         <TableRowS>
           <CellShowMore colSpan={SHOW_AWARDS_NUM} onClick={() => setExpanded(true)}>
-            展开剩余{awards ? awards.length : 0 - SHOW_AWARDS_NUM}个评分
+            展开剩余{awards ? awards.length - SHOW_AWARDS_NUM : 0}个评分
           </CellShowMore>
         </TableRowS>
       )}