From 991feb953f8ffd735ff4a9a35b22f7fa2ce7fc71 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Thu, 3 Jun 2021 14:52:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=BC=80=E6=AD=8C?=
 =?UTF-8?q?=E5=8D=95=E5=A4=B1=E8=B4=A5=E6=97=B6=E4=BC=9A=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=B4=A9=E6=BA=83=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/screens/SonglistDetail/Failed.js |  8 ++++++--
 src/screens/SonglistDetail/List.js   | 27 ++++++++++++++-------------
 src/store/modules/songList/action.js | 10 +++++++---
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/screens/SonglistDetail/Failed.js b/src/screens/SonglistDetail/Failed.js
index 81b4073..38fd6e0 100644
--- a/src/screens/SonglistDetail/Failed.js
+++ b/src/screens/SonglistDetail/Failed.js
@@ -14,7 +14,7 @@ const Header = memo(() => {
   }
 
   return (
-    <View style={{ ...styles.container }}>
+    <View style={{ ...styles.container, backgroundColor: theme.primary }}>
       <Text style={{ ...styles.text, color: theme.normal20 }}>{t('load_failed')}</Text>
       <Button onPress={back} style={{ ...styles.controlBtn, backgroundColor: theme.secondary40 }}>
         <Text style={{ ...styles.controlBtnText, color: theme.secondary }}>{t('back')}</Text>
@@ -25,7 +25,11 @@ const Header = memo(() => {
 
 const styles = StyleSheet.create({
   container: {
-    flex: 1,
+    position: 'absolute',
+    left: 0,
+    top: 0,
+    height: '100%',
+    width: '100%',
     alignItems: 'center',
     justifyContent: 'center',
   },
diff --git a/src/screens/SonglistDetail/List.js b/src/screens/SonglistDetail/List.js
index 2f3c8f3..c153208 100644
--- a/src/screens/SonglistDetail/List.js
+++ b/src/screens/SonglistDetail/List.js
@@ -16,7 +16,6 @@ export default ({ animatePlayed }) => {
   const getListDetail = useDispatch('songList', 'getListDetail')
 
   const handleListLoadMore = useCallback(() => {
-    // console.log(listDetailData)
     if (listDetailData.isLoading || listDetailData.isEnd) return
     getListDetail({ id: selectListInfoRef.current.id, page: listDetailData.page + 1 })
   }, [getListDetail, listDetailData])
@@ -29,17 +28,19 @@ export default ({ animatePlayed }) => {
   }, [getListDetail])
 
   return (
-    isGetListDetailFailed
-      ? <Failed />
-      : <OnlineList
-          list={animatePlayed ? listDetailData.list : []}
-          page={-1}
-            // isEnd={listDetailData.isEnd}
-          isListRefreshing={isListRefreshing}
-          onRefresh={handleListRefresh}
-          onLoadMore={handleListLoadMore}
-          isLoading={listDetailData.isLoading}
-          ListHeaderComponent={<ListDetailHeader />}
-    />
+    <>
+      <OnlineList
+        list={animatePlayed ? listDetailData.list : []}
+        page={-1}
+          // isEnd={listDetailData.isEnd}
+        isListRefreshing={isListRefreshing}
+        onRefresh={handleListRefresh}
+        onLoadMore={handleListLoadMore}
+        isLoading={listDetailData.isLoading}
+        ListHeaderComponent={<ListDetailHeader />}
+      />
+
+      { isGetListDetailFailed ? <Failed /> : null }
+    </>
   )
 }
diff --git a/src/store/modules/songList/action.js b/src/store/modules/songList/action.js
index 198bd54..09954c8 100644
--- a/src/store/modules/songList/action.js
+++ b/src/store/modules/songList/action.js
@@ -16,6 +16,7 @@ export const TYPES = {
   setListEnd: null,
   setListDetailEnd: null,
   setGetListDetailFailed: null,
+  clearListDetail: null,
 }
 
 for (const key of Object.keys(TYPES)) {
@@ -169,11 +170,14 @@ export const setVisibleListDetail = isShow => {
     payload: isShow,
   }
 }
-export const setSelectListInfo = info => {
-  return {
+export const setSelectListInfo = info => (dispatch, getState) => {
+  dispatch({
     type: TYPES.setSelectListInfo,
     payload: info,
-  }
+  })
+  dispatch({
+    type: TYPES.clearListDetail,
+  })
 }
 export const setGetListDetailFailed = isFailed => {
   return {