浏览代码

feat: 修改判断

year 3 月之前
父节点
当前提交
be4f4e6260
共有 2 个文件被更改,包括 11 次插入7 次删除
  1. 6 3
      src/app/[locale]/(doings)/jackpot/page.tsx
  2. 5 4
      src/app/[locale]/(doings)/signin/page.tsx

+ 6 - 3
src/app/[locale]/(doings)/jackpot/page.tsx

@@ -149,20 +149,23 @@ const Jackpot: React.FC = () => {
                 id: curTabData.id,
             });
             if (res.code === 200 && res?.data?.code === 1) {
+                const amountObj: any = {};
                 if (res?.data?.reward) {
-                    const amountObj: any = {};
                     res?.data?.reward.forEach((item: any) => {
                         amountObj[`coin_${item.coin_type}`] = formatAmount(item.amount);
                     });
-                    res?.data?.reward.forEach((item: any) => {
+                    //extra_reward
+                }
+                if (res?.data?.extra_reward) {
+                    res?.data?.extra_reward.forEach((item: any) => {
                         amountObj[`coin_${item.coin_type}`] = formatAmount(
                             new BigNumber(amountObj[`coin_${item.coin_type}`] || 0)
                                 .plus(item.amount)
                                 .toString()
                         );
                     });
-                    setAmount(amountObj);
                 }
+                setAmount(amountObj);
                 setVisible(true);
                 getInfoData();
             } else {

+ 5 - 4
src/app/[locale]/(doings)/signin/page.tsx

@@ -65,22 +65,23 @@ const SignIn: FC = () => {
             });
             if (res.code === 200 && res?.data?.code === 1) {
                 getSignData({ activity_id });
+                const amountObj: any = {};
                 if (res?.data?.reward) {
-                    const amountObj: any = {};
                     res?.data?.reward.forEach((item: any) => {
                         amountObj[`coin_${item.coin_type}`] = formatAmount(item.amount);
                     });
                     //extra_reward
-                    res?.data?.reward.forEach((item: any) => {
+                }
+                if (res?.data?.extra_reward) {
+                    res?.data?.extra_reward.forEach((item: any) => {
                         amountObj[`coin_${item.coin_type}`] = formatAmount(
                             new BigNumber(amountObj[`coin_${item.coin_type}`] || 0)
                                 .plus(item.amount)
                                 .toString()
                         );
                     });
-                    setAmount(amountObj);
                 }
-
+                setAmount(amountObj);
                 setVisible(true);
             } else {
                 throw new Error(tCode(`code.400`));