tianyunperfect 4 лет назад
Родитель
Сommit
6ddc7735f3
2 измененных файлов с 18 добавлено и 9 удалено
  1. 2 2
      src/pages/Memory/index.tsx
  2. 16 7
      src/utils/utils.ts

+ 2 - 2
src/pages/Memory/index.tsx

@@ -8,7 +8,7 @@ import {TableListItem} from '../MemoryList/data.d';
 import service from './service';
 import styles from './index.less';
 import {ExclamationCircleOutlined} from '@ant-design/icons/lib';
-import {getTextFromHtml} from "@/utils/utils";
+import {getRandom, getTextFromHtml} from "@/utils/utils";
 
 enum Step {
   MAIN = 0,
@@ -98,7 +98,7 @@ const TableList: React.FC<{}> = () => {
 
   const memorySuccess = async (factorInt: number) => {
     setBtnDisable(true);
-    memoryRes(await service.memorySuccess({id: memory.id, factor: factorInt}));
+    memoryRes(await service.memorySuccess({id: memory.id, factor: factorInt * getRandom()}));
   };
 
 

+ 16 - 7
src/utils/utils.ts

@@ -69,18 +69,18 @@ export const getRouteAuthority = (path: string, routeData: Route[]) => {
  * @param minutes
  */
 export const minuteToDay = (minutes: number) => {
-  const day = parseInt(String(minutes / 60 / 24),10);
-  const hour = parseInt(String(minutes / 60 % 24),10);
-  const min = parseInt(String(minutes % 60),10);
+  const day = parseInt(String(minutes / 60 / 24), 10);
+  const hour = parseInt(String(minutes / 60 % 24), 10);
+  const min = parseInt(String(minutes % 60), 10);
   let StatusMinuteStr = "";
   if (day > 0) {
-    StatusMinuteStr = `${day  }天`;
+    StatusMinuteStr = `${day}天`;
   }
   if (hour > 0) {
-    StatusMinuteStr += `${hour  }小时`;
+    StatusMinuteStr += `${hour}小时`;
   }
   if (min > 0) {
-    StatusMinuteStr += `${parseFloat(String(min))  }分钟`;
+    StatusMinuteStr += `${parseFloat(String(min))}分钟`;
   }
   return StatusMinuteStr;
 }
@@ -91,5 +91,14 @@ export const minuteToDay = (minutes: number) => {
  */
 export const getTextFromHtml = (html: string) => {
   const regExp = /<\/?.+?\/?>/g;
-  return html.replace(regExp, '').replace(/&nbsp;/g,'')
+  return html.replace(regExp, '').replace(/&nbsp;/g, '')
+}
+
+/**
+ * 0.80-1.00之间的随机数
+ */
+export const getRandom = () => {
+  const max = 100;
+  const min = 80;
+  return Math.floor(Math.random() * (max - min + 1) + min) / 100;
 }