From d40478423354ae1950abd5b7133c345b040bcaec Mon Sep 17 00:00:00 2001
From: sunlizhou <296190577@qq.com>
Date: Sat, 19 Aug 2023 15:51:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=89=8C=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/brand.ts                    | 22 +++++++++++++++
 src/api/index.ts                    |  1 +
 src/pages/brand/list/list.config.ts |  2 +-
 src/pages/brand/list/list.tsx       | 42 +++++++++++++++--------------
 4 files changed, 46 insertions(+), 21 deletions(-)
 create mode 100644 src/api/brand.ts

diff --git a/src/api/brand.ts b/src/api/brand.ts
new file mode 100644
index 0000000..d33b2e1
--- /dev/null
+++ b/src/api/brand.ts
@@ -0,0 +1,22 @@
+import {request} from "@/api/request";
+
+export type BrandRecord = {
+  id: number
+  introductory_video: string[]
+  brand_album: string[]
+  graphic_introduction: string
+  disabled: number
+}
+
+export const brandApi = {
+  list(page: number , page_size: number) {
+    return request<{
+      data: BrandRecord[],
+      total: number
+    }>(`/api/v1/department/index?page=${page}&page_size=${page_size}` , "GET")
+  },
+  /** 学习记录 */
+  info(id: number) {
+    return request<BrandRecord>(`/api/v1/user/record/${id}`, "GET")
+  },
+}
diff --git a/src/api/index.ts b/src/api/index.ts
index 341ea63..295c27f 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -5,4 +5,5 @@ export * from './meeting'
 export * from './public'
 export * from './manage'
 export * from './course'
+export * from './brand'
 export * from './home'
diff --git a/src/pages/brand/list/list.config.ts b/src/pages/brand/list/list.config.ts
index 8617280..89c2e86 100644
--- a/src/pages/brand/list/list.config.ts
+++ b/src/pages/brand/list/list.config.ts
@@ -1,4 +1,4 @@
 export default definePageConfig({
-  navigationBarTitleText: '见面会记录',
+  navigationBarTitleText: '品牌列表',
   onReachBottomDistance: 30
 })
diff --git a/src/pages/brand/list/list.tsx b/src/pages/brand/list/list.tsx
index bbd5b0d..c7d5a9a 100644
--- a/src/pages/brand/list/list.tsx
+++ b/src/pages/brand/list/list.tsx
@@ -1,24 +1,28 @@
 import {FC, useCallback, useEffect, useState} from "react";
 import {View} from "@tarojs/components";
-import {Meeting, meetingAPi} from "@/api";
-import styles from './meetings.module.scss'
+import {brandApi, BrandRecord, Meeting} from "@/api";
+import styles from './list.module.scss'
 import Taro, {useReachBottom} from "@tarojs/taro";
 import Empty from "@/components/empty/empty";
 import {formatDate} from "@/utils/time";
+import brandView from "@/pages/brand/list/components/BrandView";
 
 const MeetingsConfig: FC = () => {
   const [page, setPage] = useState(1)
-  const [meeting, setMeeting] = useState<Meeting[]>([])
+  const [brands, setBrands] = useState<BrandRecord[]>([])
   const [total, setTotal] = useState(0)
 
-  const getData = useCallback(async () => {
+  useEffect(() => {
+    getData()
+  }, [page])
+
+  const getData = useCallback( async () => {
     try {
-      const res = await meetingAPi.setList(1, 10)
-      setTotal(res.total)
-      setMeeting([
-        ...(meeting || []),
-        ...res.data
-      ])
+      // const res = await brandApi.list(1, 10)
+      // setTotal(res.total)
+      // setBrands([
+      //   ...res.data
+      // ])
     } catch (e) {
     }
   }, [page])
@@ -31,9 +35,9 @@ const MeetingsConfig: FC = () => {
           if (confirm) {
             await meetingAPi.del(id)
 
-            const oldMeeting: Meeting[] = JSON.parse(JSON.stringify(meeting))
+            const oldMeeting: Meeting[] = JSON.parse(JSON.stringify(brandView))
             oldMeeting.splice(index, 1)
-            setMeeting(oldMeeting)
+            setBrands(oldMeeting)
           }
         }
       })
@@ -49,21 +53,19 @@ const MeetingsConfig: FC = () => {
   }
 
   useReachBottom(useCallback(() => {
-    if (meeting?.length < total) {
+    if (brands?.length < total) {
       setPage(page + 1)
     }
-  }, [total, meeting]))
+  }, [total, brands]))
+
 
-  useEffect(() => {
-    getData()
-  }, [page])
 
   return (
     <View className='p-2'>
 
       {
-        meeting.length ?
-          meeting.map((d, index) => <View className={styles.meeting} key={d.id}>
+        brands.length ?
+          brands.map((d, index) => <View className={styles.meeting} key={d.id}>
             <View className={styles.title} onClick={() => jumpInfo(d)}>
               <View className='font-weight mb-1'>{d.name}</View>
               <View>{formatDate(new Date(d.estimate_start_time), "MM-dd")} 至 {formatDate(new Date(d.estimate_start_time), "MM-dd")}</View>
@@ -75,7 +77,7 @@ const MeetingsConfig: FC = () => {
             </View>
             <View className={styles.del} onClick={() => del(d.id, index)}>删除</View>
           </View>)
-          : <Empty name='无历史记录'/>
+          : <Empty name='空空如也'/>
       }
     </View>
   )