Merge branch 'master' of https://github.com/sanyuan0704/cloud-music

Author: sanyuan0704

src/application/Rank/index.js

@@ -44,9 +44,9 @@ function Rank(props) {
     return (
       <List globalRank={global}>
        {
-        list.map((item) => {
+        list.map((item, index) => {
           return (
-            <ListItem key={item.coverImgId} tracks={item.tracks} onClick={() => enterDetail(item)}>
+            <ListItem key={`${item.coverImgId}${index}`} tracks={item.tracks} onClick={() => enterDetail(item)}>
               <div className="img_wrapper">
                 <img src={item.coverImgUrl} alt=""/>
                 <div className="decorate"></div>

src/application/Singers/index.js

@@ -9,7 +9,7 @@ import {
   EnterLoading
 } from "./style";
 import { connect } from 'react-redux';
-import { getSingerList, changeCategory, changeAlpha, getHotSingerList, changeEnterLoading, changePageCount, refreshMoreSingerList, changePullUpLoading,changePullDownLoading, refreshMoreHotSingerList } from './store/actionCreators';
+import { getSingerList, changeCategory, changeAlpha, getHotSingerList, changeEnterLoading, changeListOffset, refreshMoreSingerList, changePullUpLoading,changePullDownLoading, refreshMoreHotSingerList } from './store/actionCreators';
 import Scroll from "../../baseUI/scroll/index";
 import  LazyLoad, {forceCheck} from 'react-lazyload';
 import Loading from '../../baseUI/loading/index';
@@ -117,20 +117,19 @@ const mapDispatchToProps = (dispatch) => {
     },
     updateCategory(newVal) {
       dispatch(changeCategory(newVal));
-      dispatch(changePageCount(0));
+      dispatch(changeListOffset(0));
       dispatch(changeEnterLoading(true));
       dispatch(getSingerList());
     },
     updateAlpha(newVal) {
       dispatch(changeAlpha(newVal));
-      dispatch(changePageCount(0));
+      dispatch(changeListOffset(0));
       dispatch(changeEnterLoading(true));
       dispatch(getSingerList());
     },
     // 滑到最底部刷新部分的处理
     pullUpRefresh(hot, count) {
       dispatch(changePullUpLoading(true));
-      dispatch(changePageCount(count+1));
       if(hot){
         dispatch(refreshMoreHotSingerList());
       } else {
@@ -140,7 +139,7 @@ const mapDispatchToProps = (dispatch) => {
     //顶部下拉刷新
     pullDownRefresh(category, alpha) {
       dispatch(changePullDownLoading(true));
-      dispatch(changePageCount(0));
+      dispatch(changeListOffset(0));
       if(category === '' && alpha === ''){
         dispatch(getHotSingerList());
       } else {

src/application/Singers/store/actionCreators.js

@@ -6,7 +6,7 @@ import {
   CHANGE_SINGER_LIST,
   CHANGE_CATOGORY,
   CHANGE_ALPHA,
-  CHANGE_PAGE_COUNT,
+  CHANGE_LIST_OFFSET,
   CHANGE_PULLUP_LOADING,
   CHANGE_PULLDOWN_LOADING,
   CHANGE_ENTER_LOADING
@@ -30,8 +30,8 @@ const changeSingerList = (data) => ({
   data: fromJS(data)
 });
 
-export const changePageCount = (data) => ({
-  type: CHANGE_PAGE_COUNT,
+export const changeListOffset = (data) => ({
+  type: CHANGE_LIST_OFFSET,
   data
 });
 
@@ -61,19 +61,21 @@ export const getHotSingerList = () => {
       dispatch(changeSingerList(data));
       dispatch(changeEnterLoading(false));
       dispatch(changePullDownLoading(false));
+      dispatch(changeListOffset(data.length));
     }).catch(() => {
       console.log('热门歌手数据获取失败');
     })
   }
 };
 export const refreshMoreHotSingerList = () => {
   return (dispatch, getState) => {
-    const pageCount = getState().getIn(['singers', 'pageCount']);
+    const offset = getState().getIn(['singers', 'listOffset']);
     const singerList = getState().getIn(['singers', 'singerList']).toJS();
-    getHotSingerListRequest(pageCount).then(res => {
+    getHotSingerListRequest(offset).then(res => {
       const data = [...singerList, ...res.artists];
       dispatch(changeSingerList(data));
       dispatch(changePullUpLoading(false));
+      dispatch(changeListOffset(data.length));
     }).catch(() => {
       console.log('热门歌手数据获取失败');
     });
@@ -84,13 +86,15 @@ export const refreshMoreHotSingerList = () => {
 
 export const getSingerList = () => {
   return (dispatch, getState) => {
+    const offset = getState().getIn(['singers', 'listOffset']);
     const category = getState().getIn(['singers', 'category']);
     const alpha = getState().getIn(['singers', 'alpha']);
-    getSingerListRequest(category, alpha, 0).then(res => {
+    getSingerListRequest(category, alpha, offset).then(res => {
       const data = res.artists;
       dispatch(changeSingerList(data));
       dispatch(changeEnterLoading(false));
       dispatch(changePullDownLoading(false));
+      dispatch(changeListOffset(data.length));
     }).catch(() => {
       console.log('歌手数据获取失败');
     });
@@ -101,12 +105,13 @@ export const refreshMoreSingerList = () => {
   return (dispatch, getState) => {
     const category = getState().getIn(['singers', 'category']);
     const alpha = getState().getIn(['singers', 'alpha']);
-    const pageCount = getState().getIn(['singers', 'pageCount']);
+    const offset = getState().getIn(['singers', 'listOffset']);
     const singerList = getState().getIn(['singers', 'singerList']).toJS();
-    getSingerListRequest(category, alpha, pageCount).then(res => {
+    getSingerListRequest(category, alpha, offset).then(res => {
       const data = [...singerList, ...res.artists];
       dispatch(changeSingerList(data));
       dispatch(changePullUpLoading(false));
+      dispatch(changeListOffset(data.length));
     }).catch(() => {
       console.log('歌手数据获取失败');
     });

src/application/Singers/store/constants.js

@@ -1,7 +1,7 @@
 export const CHANGE_CATOGORY = 'home/singers/CHANGE_CATEGORY';
 export const CHANGE_ALPHA = 'home/singers/CHANGE_ALPHA';
 export const CHANGE_SINGER_LIST = 'home/singers/CHANGE_SINGER_LIST';
-export const CHANGE_PAGE_COUNT = 'home/singers/PAGE_COUNT';
+export const CHANGE_LIST_OFFSET = 'home/singers/CHANGE_LIST_OFFSET';
 export const CHANGE_ENTER_LOADING = 'home/singers/ENTER_LOADING';
 export const CHANGE_PULLUP_LOADING = 'home/singers/PULLUP_LOADING';
 export const CHANGE_PULLDOWN_LOADING = 'home/singers/PULLDOWN_LOADING';

src/application/Singers/store/reducer.js

@@ -8,7 +8,7 @@ const defaultState = fromJS({
   enterLoading: true,
   pullUpLoading: false,
   pullDownLoading: false,
-  pageCount: 0
+  listOffset: 0, // 请求列表的偏移不是page，是个数
 })
 
 export default (state = defaultState, action) => {
@@ -19,8 +19,8 @@ export default (state = defaultState, action) => {
       return state.set('category', action.data);
     case actionTypes.CHANGE_SINGER_LIST:
       return state.set('singerList', action.data);
-    case actionTypes.CHANGE_PAGE_COUNT:
-      return state.set('pageCount', action.data);
+    case actionTypes.CHANGE_LIST_OFFSET:
+      return state.set('listOffset', action.data);
     case actionTypes.CHANGE_ENTER_LOADING:
       return state.set('enterLoading', action.data);
     case actionTypes.CHANGE_PULLUP_LOADING: