From a7bdf1085dcf6cd1c2faba561cb75a156dc22273 Mon Sep 17 00:00:00 2001
From: jiannibang <271381693@qq.com>
Date: Wed, 23 Aug 2023 14:30:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201005=20=E6=B4=BB=E5=8A=A8=E9=87=8C?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE2=E6=AC=A1=E9=A2=86=E5=88=B8=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0=E3=80=82=E9=A2=86=E5=8F=96=E5=AE=8C=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=BD=AE=E7=81=B0=E6=97=A0=E6=B3=95=E5=86=8D?=
 =?UTF-8?q?=E6=AC=A1=E9=A2=86=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Activities/Activities.js   | 19 ++++++++-----------
 src/pages/Activities/Activities.scss |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/pages/Activities/Activities.js b/src/pages/Activities/Activities.js
index 09272ab..f80fd45 100644
--- a/src/pages/Activities/Activities.js
+++ b/src/pages/Activities/Activities.js
@@ -35,18 +35,15 @@ const Activities = ({
   const receive = async (activity) => {
     setReceiving(true);
     try {
-      const { code, data, msg } = await post(
-        "/api/ar/v1/applet/CouponReceive",
-        {
-          activityCode: activity.code,
-          memberID,
-        }
-      );
+      const { code, msg } = await post("/api/ar/v1/applet/CouponReceive", {
+        activityCode: activity.code,
+        memberID,
+      });
       window.weui.toast(msg, {
         className: "toast",
       });
-      if (code === 200) {
-        activity.isReceived = true;
+      if (code !== 200) {
+        activity.isAllReceived = true;
       }
     } catch (error) {
       console.warn(error);
@@ -121,10 +118,10 @@ const Activities = ({
                   <div className="meta">活动奖励</div>
                   <div
                     onClick={() =>
-                      !activity.isReceived && !receiving && receive(activity)
+                      !activity.isAllReceived && !receiving && receive(activity)
                     }
                     className={`btn ${
-                      activity.isReceived || receiving ? "disabled" : ""
+                      activity.isAllReceived || receiving ? "disabled" : ""
                     }`}
                   >
                     领取奖励
diff --git a/src/pages/Activities/Activities.scss b/src/pages/Activities/Activities.scss
index 1b23e30..65d2aa0 100644
--- a/src/pages/Activities/Activities.scss
+++ b/src/pages/Activities/Activities.scss
@@ -163,7 +163,7 @@
         top: 97px;
         left: 10px;
         right: 10px;
-        height: 184px;
+        bottom: 0;
         font-family: "PingFang SC";
         font-style: normal;
         font-weight: 400;