Explorar el Código

update: 修改关闭前的成功toast

xyh hace 2 años
padre
commit
08109381ab

+ 1 - 0
src/hooks/index.js

@@ -1,3 +1,4 @@
 export * from './use-scan-order';
 export * from './use-navigate';
 export * from './use-infinite-fetch';
+export * from './use-success-toast';

+ 20 - 0
src/hooks/use-success-toast/index.js

@@ -0,0 +1,20 @@
+import {useState, useCallback} from 'react';
+import {useNavigate} from '@hooks';
+import {showToast} from '@tarojs/taro';
+import {useTimeout} from 'ahooks';
+
+export function useSuccessToast(title) {
+  const [delay, setDelay] = useState(void 0);
+  const {pop} = useNavigate();
+
+  useTimeout(pop, delay);
+
+  return useCallback(
+    function () {
+      showToast({title, delay: 2000, icon: 'success', mask: true});
+
+      setDelay(2000);
+    },
+    [title],
+  );
+}

+ 3 - 6
src/pages/deliver/hooks.js

@@ -3,7 +3,7 @@ import {useMutation, useQuery} from '@tanstack/react-query';
 import dayjs from 'dayjs';
 import {useEffect, useState, useMemo} from 'react';
 import {showLoading, hideLoading, showToast, showModal} from '@tarojs/taro';
-import {useNavigate} from '@hooks';
+import {useSuccessToast} from '@hooks';
 
 export function useDate(customerNo) {
   const [date, setDate] = useState('');
@@ -45,15 +45,12 @@ export function useSubmit({goodsList, customerNo, truckNo, date}) {
     },
     [goodsList],
   );
+  const successPop = useSuccessToast('上传成功');
 
-  const {pop} = useNavigate();
   const {isLoading, mutate} = useMutation({
     mutationFn: addDeliver,
     onSuccess({code}) {
-      if (code === '200') {
-        pop();
-        showToast({title: '上传成功', icon: 'success'});
-      }
+      code === '200' && successPop();
     },
   });
 

+ 4 - 4
src/pages/list/index.jsx

@@ -20,10 +20,10 @@ export default function List() {
     fn: getList,
     limit: 5,
     params: {
-      arrivalTime: fields.startTime,
-      arrivalTimes: fields.endTime,
-      finalTime: fields.startTime2,
-      finalTimes: fields.endTime2,
+      agoScrq: fields.startTime,
+      endScrq: fields.endTime,
+      agoFinalTime: fields.startTime2,
+      endFinalTime: fields.endTime2,
       customer: fields.custom,
       truckNo: fields.track,
       anomaly: fields.anomaly ? '1' : '',

+ 4 - 6
src/pages/receive/hooks.js

@@ -9,7 +9,7 @@ import {
 import {useMutation, useQuery} from '@tanstack/react-query';
 import {confirmDeliver, getInfo, uploadImg} from '@apis';
 import {useBoolean} from 'ahooks';
-import {useNavigate} from '@hooks';
+import {useSuccessToast} from '@hooks';
 
 export function useUpload() {
   const [files, setFiles] = useState([]);
@@ -77,14 +77,12 @@ export function useAnomaly() {
 }
 
 export function useSubmit({customerNo, truckNo, anomaly, note, imgs}) {
-  const {pop} = useNavigate();
+  const successPop = useSuccessToast('收货成功');
+
   const {mutate, isLoading} = useMutation({
     mutationFn: confirmDeliver,
     onSuccess({code}) {
-      if (code === '200') {
-        pop();
-        showToast({title: '收货成功', icon: 'success', mask: true});
-      }
+      code === '200' && successPop('收货成功');
     },
   });