myCourses

src/components/study/myCourses/actions.js

@@ -26,11 +26,11 @@ export const getMyCourses = payload => dispatch => {
     return http.get(`${API.home}/m/my_course/${payload.page}/${payload.num}`)
         .then(res => {
             const {data, code, msg} = res.data
-            if (data.length === 0) {
+            if (code == 200 && data.length === 0) {
                 dispatch(nomoreCourse())
                 return
             }
-            if (data.length % 10 !== 0) {
+            if (code == 200 && data.length % 10 !== 0) {
                 dispatch(nomoreCourse())
             }
             dispatch(receiveMyCourses({

src/components/study/myCourses/index.js

@@ -99,15 +99,15 @@ class MyCourses extends PureComponent {
     }, 200)
 
     render() {
-        let list = this.props.courseList
+        let {courseList, user} = this.props
 
         return <Loading isLoading={this.props.isLoading}>
             {
-                list && list.length !== 0
+                courseList && courseList.length !== 0
                     ?
                     <>
                         <div className="my-course-uid">
-                            {`加群请备注您的学号：${this.props.user.data.uid}`}
+                            {`加群请备注您的学号：${!user.hasError && this.props.user.data.uid}`}
                         </div>
                         <InfiniteScroll
                             pageStart={0}
@@ -117,7 +117,7 @@ class MyCourses extends PureComponent {
                         >
                             <ul ref={el => this.list = el}>
                                 {
-                                    list.map((item, index) => {
+                                    courseList.map((item, index) => {
 
                                         const Info = (
                                             <div className="info">
@@ -159,7 +159,7 @@ class MyCourses extends PureComponent {
                             </ul>
                         </InfiniteScroll>
                         {
-                            list.length % 10 !== 0 ?
+                            courseList.length % 10 !== 0 ?
                                 <AddCourse addCourseClick={this.addCourseClick}/>
                                 : null
                         }

src/components/study/myCourses/reducers.js

@@ -4,6 +4,7 @@ import {
     NOMORE_COURSE,
     START_FETCHING_COURSES
 } from './actions'
+import { SET_CURRENT_USER } from '@/store/userAction'
 
 const initialState = {
     switchTab: false,
@@ -31,6 +32,8 @@ export default function myCourses(state = initialState, action) {
             return {...state, switchTab: action.payload}
         case NOMORE_COURSE:
             return {...state, noMore: true}
+        case SET_CURRENT_USER:
+            return action.payload.hasError ? initialState : {...state, page: 0}
         default:
             return state
     }