v3.5.3版本更新1

apps/h5-shop/src/components/WeakNetFallbackPanel.tsx

@@ -1,6 +1,7 @@
 import { useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { request } from '../lib/api';
+import { toastError, toastSuccess } from '../lib/toast';
 import { uploadRedeemPendingPhoto } from '../lib/upload';
 import { isWechatEnv, weixinSdk } from '../lib/weixin';
 import type { RedeemPendingSubmitResult } from '@dukang/shared-types';
@@ -18,25 +19,22 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)
   const [previewUrl, setPreviewUrl] = useState('');
   const [photoResourceId, setPhotoResourceId] = useState('');
   const [result, setResult] = useState<RedeemPendingSubmitResult | null>(null);
-  const [msg, setMsg] = useState('');
   const [showAlbumFallback, setShowAlbumFallback] = useState(false);
 
   async function handleFile(file: File) {
     setUploading(true);
-    setMsg('');
     try {
       const registered = await uploadRedeemPendingPhoto(file);
       setPhotoResourceId(registered.id);
       setPreviewUrl(registered.url);
     } catch (e) {
-      setMsg(e instanceof Error ? e.message : '上传失败');
+      toastError(e instanceof Error ? e.message : '上传失败');
     } finally {
       setUploading(false);
     }
   }
 
   async function pickPhoto() {
-    setMsg('');
     if (isWechatEnv()) {
       try {
         setUploading(true);
@@ -51,7 +49,7 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)
       } catch (e) {
         const text = e instanceof Error ? e.message : '选图失败';
         if (!/cancel/i.test(text)) {
-          setMsg(`${text}，可改从系统相册选择`);
+          toastError(`${text}，可改从系统相册选择`);
           setShowAlbumFallback(true);
           inputRef.current?.click();
         }
@@ -65,11 +63,10 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)
 
   async function submitPending() {
     if (!photoResourceId) {
-      setMsg('请先拍摄或上传核销码照片');
+      toastError('请先拍摄或上传核销码照片');
       return;
     }
     setSubmitting(true);
-    setMsg('');
     try {
       const res = await request<RedeemPendingSubmitResult>('SHOP_H5', '/shop/redeem/pending', {
         method: 'POST',
@@ -81,7 +78,7 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)
       });
       setResult(res);
     } catch (e) {
-      setMsg(e instanceof Error ? e.message : '提交失败');
+      toastError(e instanceof Error ? e.message : '提交失败');
     } finally {
       setSubmitting(false);
     }
@@ -89,8 +86,8 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)
 
   function copyText(text: string) {
     void navigator.clipboard?.writeText(text).then(
-      () => setMsg('已复制'),
-      () => setMsg('复制失败，请手动长按复制'),
+      () => toastSuccess('已复制'),
+      () => toastError('复制失败，请手动长按复制'),
     );
   }
 
@@ -169,8 +166,6 @@ export default function WeakNetFallbackPanel({ redeemToken, failCount }: Props)
           </div>
         </>
       )}
-
-      {msg && <p className="shop-redeem-error" style={{ marginTop: 12 }}>{msg}</p>}
     </section>
   );
 }