瀏覽代碼

feat: 修改

year 3 月之前
父節點
當前提交
013279bdec

+ 5 - 5
src/api/activity.ts

@@ -163,7 +163,7 @@ export interface PromoterInfo {
     tally_time: number;
     is_op: boolean;
     remark: string;
-    list: { count: number; conf: PromoterItem[]; condition: PromoterCondition };
+    list: { count: number; conf: PromoterItem[]; condition: PromoterCondition; total: number };
 }
 
 export interface PromoterCondition {
@@ -207,9 +207,9 @@ export interface ChildItem {
 }
 
 export const getPromoteList = async () => {
-    return (await import("@/mock/activety")).getPromotChild();
+    // return (await import("@/mock/activety")).getPromotChild();
 
-    // return server.post<ChildItem[]>({
-    //     url: "/v1/api/user/activity/childPromoterList",
-    // });
+    return server.post<ChildItem[]>({
+        url: "/v1/api/user/activity/childPromoterList",
+    });
 };

+ 2 - 1
src/app/[locale]/(doings)/continuous/page.module.scss

@@ -104,6 +104,7 @@
         height: 1.1rem;
         background-size: 100% 100%;
         position: relative;
+        z-index: 1;
     }
     .boxItemTop {
         height: 0.29rem;
@@ -233,7 +234,7 @@
             top: 60%;
             right: 0;
             height: 6px;
-            background-color: rgb(255, 255, 255, 0.3);
+            background-color: rgb(255, 255, 255, 0.2);
             border-radius: 4px;
         }
     }

+ 1 - 1
src/app/[locale]/(doings)/continuous/page.tsx

@@ -238,7 +238,7 @@ const Page = () => {
             // }
             result.push(item);
         });
-        return result;
+        return result.sort((a, b) => a.days - b.days);
     }, [data?.list?.config_list]);
 
     const goDeposit = () => {

+ 5 - 2
src/app/[locale]/(doings)/fission/(locale)/page.tsx

@@ -144,7 +144,10 @@ const Page: React.FC = () => {
     };
 
     const list = React.useMemo<PromoterItem[]>(() => {
-        return data?.list?.conf || [];
+        if (!data?.list?.conf) return [];
+        return data.list.conf.sort((a, b) => {
+            return a.id - b.id;
+        });
     }, [data?.list]);
 
     const doClaim = async (data: PromoterItem) => {
@@ -247,7 +250,7 @@ const Page: React.FC = () => {
                             <div>Meus subordinados diretos</div>
                             <div>
                                 <span className="text-[#ffae00]">
-                                    {data?.list?.count || 0}Pessoa{" "}
+                                    {data?.list?.total || 0}Pessoa{" "}
                                 </span>
                                 (Válido{" "}
                                 <span className="text-[#ffae00]">

+ 3 - 3
src/app/[locale]/(doings)/fission/detail/page.tsx

@@ -16,7 +16,7 @@ const InfiniteScrollContent = ({ hasMore }: { hasMore?: boolean }) => {
                     <DotLoading />
                 </>
             ) : (
-                <span>--- 我是有底线的 ---</span>
+                <span>Não mais</span>
             )}
         </>
     );
@@ -24,10 +24,10 @@ const InfiniteScrollContent = ({ hasMore }: { hasMore?: boolean }) => {
 
 const Detail = () => {
     const [data, setData] = useState<ChildItem[]>([]);
-    const [hasMore, setHasMore] = useState(true);
+    const [hasMore, setHasMore] = useState(false);
     async function loadMore() {
         getData();
-        setHasMore(true);
+        // setHasMore(true);
     }
 
     React.useEffect(() => {