Merge branch 'student-register'

src/components/college/index.js

@@ -23,11 +23,6 @@ class CollegePage extends Component {
       ],
       schoolList: [
         {
-          id: 1,
-          name: '中科大软件学院（苏州）',
-          logo: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/college-plan/zkd_logo.png'
-        },
-        {
           id: null,
           name: '东华理工大学软件学院',
           logo: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/college-plan/dhlg_logo.png'
@@ -37,16 +32,17 @@ class CollegePage extends Component {
   }
 
   componentDidMount() {
-    // this.fetchSchoolList();
+    this.fetchSchoolList();
     document.title = `免费提供在线教学系统 助力全国高校在线教学 - 七月在线`
   }
 
   fetchSchoolList = () => {
+    const { schoolList } = this.state;
     http.get(`${API['home']}/sys/school/list`).then(res => {
       const { code, data } = res.data;
       if(code === 200) {
         this.setState({
-          schoolList: data,
+          schoolList: data.concat(schoolList),
         });
       }
     });