merge student register

src/components/college/banner.js

+import React from 'react';
+import './banner.scss';
+
+export default (props) => {
+  const { banner = '' } = props;
+  const style = () => {
+    if(banner) {
+      return {
+        backgroundImage: `url(${banner})`
+      }
+    }
+    return {};
+  }
+
+  return (
+    <div className="college-banner"></div>
+  )
+}
\ No newline at end of file

src/components/college/banner.scss

+.college-banner {
+  height: 100px;
+  background-image: url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/college-plan/college-banner.png');
+  background-size: cover;
+}
\ No newline at end of file

src/components/college/courseList.js

+import React, { Component } from 'react';
+import { http } from '@/utils';
+import { HeaderBar } from "@/common";
+import CollegeBanner from './banner';
+import './courseList.scss';
+
+class CollegeCourse extends Component {
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      courseList: []
+    };
+  }
+
+  componentDidMount() {
+    this.fetchCourseList();
+  }
+
+  fetchCourseList = () => {
+    const { match } = this.props;
+    const id = match.params.id || 0;
+    http.get(`${API['home']}/sys/school/${id}`).then(res => {
+      const { code, data } = res.data;
+      if(code === 200) {
+        this.setState({
+          courseList: data
+        });
+      }
+    });
+  }
+
+  render() {
+    const { courseList = [] } = this.state;
+    return (
+      <>
+        <HeaderBar title={'助学计划'} arrow={true}/>
+        <CollegeBanner />
+        <div className="college-course__body">
+          {
+            courseList.map(item => (
+              <div className="college-course__item" key={item.course_id}>
+                <i className="college-course__cover" style={{'backgroundImage': `url(${item.image_name})`}}></i>
+                <p className="college-course__title">{item.course_title}</p>
+              </div>
+            ))
+          }
+        </div>
+      </>
+    )
+  }
+}
+
+export default CollegeCourse;
\ No newline at end of file

src/components/college/courseList.scss

+.college-course__body {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 0 7px;
+}
+
+.college-course__item {
+  width: 165px;
+  height: 162px;
+  margin: 0 7px 15px;
+  border-radius: 4px;
+  background-color: #fff;
+  box-shadow: 0px 0px 8px 0px rgba(153,153,153,0.2);
+  overflow: hidden;
+}
+
+.college-course__cover {
+  display: block;
+  height: 119px;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: auto 100%;
+}
+
+.college-course__title {
+  margin: 8px 0 0;
+  padding-left: 5px;
+  font-size: 14px;
+  color: #525C65;
+  line-height: 16px;
+  // text-overflow: ellipsis;
+  // white-space: nowrap;
+  // overflow: hidden;
+}
\ No newline at end of file

src/components/college/index.js

+import React, { Component } from 'react';
+import { http } from '@/utils';
+import { HeaderBar } from "@/common";
+import CollegeBanner from './banner';
+import './index.scss';
+
+class CollegePage extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      sectionInfo: [
+        {
+          title: '系统赞助',
+          desc: '免费提供在线直播系统(屏幕实时演示)，支持视频回放、互动答疑。',
+          icon: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/college-plan/system.png',
+        },
+        {
+          title: '内容赞助 ',
+          desc: '免费开放相关课程的视频、课件、作业、考试、项目云平台(在线编译、在线批改)。',
+          icon: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/college-plan/content.png',
+        },
+      ],
+      schoolList: [],
+    };
+  }
+
+  componentDidMount() {
+    this.fetchSchoolList();
+  }
+
+  fetchSchoolList = () => {
+    http.get(`${API['home']}/sys/school/list`).then(res => {
+      console.log(res);
+      const { code, data } = res.data;
+      if(code === 200) {
+        this.setState({
+          schoolList: data,
+        });
+      }
+    });
+  }
+
+  toCollegeCourse = (id) => {
+    const { history } = this.props;
+    history.push(`/college/${id}`);
+  }
+
+  render() {
+    const { sectionInfo = [], schoolList = [] } = this.state;
+    return (
+      <>
+        <HeaderBar title={'助学计划'} arrow={true}/>
+        <CollegeBanner />
+        <div className="college-page__banner"></div>
+        <CollegeHeader 
+          headerStyle={{
+            marginTop: '20px'
+          }}
+          title="助力高校在线教学计划，在线不停课" 
+        />
+        <p className="college-page__contact">免费入驻联系周先生：18910848502(微信同)</p>
+        {
+          sectionInfo.map(({title, desc, icon}, index) => (
+            <div className="college-page__section" key={index}>
+              <i className="section__icon" style={{'backgroundImage': `url(${icon})`}}></i>
+              <div className="section__body">
+                <h2 className="section__title">{title}</h2>
+                <p className="section__desc">{desc}</p>
+              </div>
+            </div>
+          ))
+        }
+        <CollegeHeader 
+          headerStyle={{
+            marginTop: '20px'
+          }}
+          isDecorate={false} 
+          title="入驻学院" 
+        />
+        <div className="college-page__college">
+          {
+            schoolList.map(({id, name, logo}) => (
+              <div 
+                className="college__item" 
+                onClick={() => this.toCollegeCourse(id)}
+                key={id} 
+              >
+                <i className="college__iamge" style={{'backgroundImage': `url(${logo})`}}></i>
+                <p className="college__name">{name}</p>
+              </div>
+            ))
+          }
+        </div>
+      </>
+    )
+  }
+}
+
+const CollegeHeader = (props) => {
+  const { title, isDecorate = true, headerStyle = {} } = props;
+  return (
+    <>
+      <div className="college-header" style={headerStyle}>
+        <i className="college-header__icon" data-direction="left"></i>
+        <h2 className="college-header__text">{title}</h2>
+        <i className="college-header__icon" data-direction="right"></i>
+      </div>
+      {
+        isDecorate &&
+        <i className="college-header__decorate"></i>
+      }
+    </>
+  );
+}
+
+export default CollegePage;
\ No newline at end of file

src/components/college/index.scss

+.college-page__contact {
+  margin: 5px 0 0;
+  font-size: 12px;
+  color: #0099FF;
+  text-align: center;
+  line-height: 22px;
+}
+
+.college-page__section {
+  margin: 0 15px 10px;
+  border: 1px solid #ECECEC;
+  border-radius: 1px;
+
+  .section__icon {
+    float: left;
+    width: 30px;
+    height: 34px;
+    margin: 13px 0 0 15px;
+    background-size: 100% auto;
+    background-position: center;
+    background-repeat: no-repeat;
+  }
+
+  .section__body {
+    margin-left: 60px;
+    padding: 8px 0;
+  }
+
+  .section__title {
+    margin: 0 0 4px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #0099FF;
+    line-height: 1;
+  }
+
+  .section__desc {
+    margin: 0;
+    font-size: 12px;
+    color: #333;
+    line-height: 15px;
+  }
+}
+
+.college-page__college {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 4px 10px 0;
+
+  .college__item {
+    flex: 1;
+    margin: 0 5px;
+    cursor: pointer;
+
+    &:hover {
+
+      .college__iamge {
+        border-color: #0099FF;
+      }
+
+      .college__name {
+        color: #0099ff;
+      }
+    }
+  }
+
+  .college__iamge {
+    display: block;
+    height: 60px;
+    border: 1px solid #ECECEC;
+    border-radius: 1px;
+    background-size: auto 100%;
+    background-position: center;
+    background-repeat: no-repeat;
+  }
+
+  .college__name {
+    margin: 6px 0 0;
+    font-size: 12px;
+    color: #525C65;
+    text-align: center;
+    line-height: 1;
+  }
+}
+
+.college-header {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 34px;
+}
+
+.college-header__icon {
+  width: 44px;
+  height: 8px;
+  background-size: cover;
+
+  &[data-direction="left"] {
+    background-image: url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/college-plan/icon-left.png');
+    background-position: right;
+  }
+
+  &[data-direction="right"] {
+    background-image: url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/college-plan/icon-right.png');
+    background-position: left;
+  }
+}
+
+.college-header__text {
+  margin: 0;
+  padding: 0 10px;
+  font-size: 14px;
+  font-weight: 500;
+  color: #525C65;
+  line-height: 1;
+}
+
+.college-header__decorate {
+  display: block;
+  width: 39px;
+  height: 3px;
+  margin: 0 auto;
+  border-radius: 2px;
+  background: linear-gradient(90deg,rgba(0,153,255,1) 0%,rgba(55,117,239,1) 100%);
+}
\ No newline at end of file

src/components/passport/index.js

@@ -12,6 +12,7 @@ import ForgotPasswordEmail from './forgotPasswordEmail'
 import { connect } from "react-redux"
 import { compose } from "redux"
 import { getParam } from "@/utils"
+import StudentRoot from './studentRoot';
 
 import account from './icons/account.png'
 import qq from './icons/qq.png'
@@ -103,6 +104,7 @@ class Passport extends Component {
                               from={'/passport'}
                               to={{...location, ...{pathname: '/passport/login'}}}
                     />
+                    <Route path={match.url + '/student-login'} component={StudentRoot}/>
                     <Route path={match.url + '/login'}
                            render={props => {
                                return <Login {...props} loginWays={this.state.loginWays}/>

src/components/passport/login/index.js

@@ -66,6 +66,11 @@ class Login extends Component {
         }
     }
 
+    toStudentRegister = () => {
+        const { history } = this.props;
+        history.push('/passport/student-login')
+    }
+
     render() {
         const {
             loginWays,
@@ -117,8 +122,12 @@ class Login extends Component {
                              onVerify={this.onVerify}
                     />
                     <LoginButton active={values.tel && values.veriCode && isEmpty(errors)}/>
-                </Form>
                     
+                    {/* 助学计划 */}
+                    <div className="student-root">
+                        <a className="student-root__button" onClick={this.toStudentRegister}>助学计划</a>
+                    </div>
+                </Form>
                 <LoginWays onClick={this.loginWaysClick} loginWays={loginWays}/>
             </div>
         )

src/components/passport/login/wechatLogin.scss

@@ -25,5 +25,15 @@
 
     }
 
+    .student-root {
+        padding-top: 18px;
+        text-align: right;
+    }
 
+    .student-root__button {
+        font-size: 15px;
+        color: #0099FF;
+        line-height: 1;
+        cursor: pointer;
+    }
 }
\ No newline at end of file

src/components/passport/studentRoot/index.scss

+.student-form {
+  margin-top: -27px;
+  padding: 0 35px;
+
+  .input-with-country-codes {
+    margin-bottom: 15px;
+  }
+}
+
+.student-form__code {
+  margin: 0 0 15px;
+  
+  &.input-wrapper {
+    width: 100%;
+  }
+}
+
+.student-form__item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 15px;
+}
+
+.student-form__label {
+  width: 44px;
+  font-size: 15px;
+  color: 333;
+}
+
+.student-form__input {
+  flex: 1;
+  height: 46px;
+  padding: 0 15px;
+  border: 1px solid #ccc;
+  border-radius: 3px;
+  box-sizing: border-box;
+  font-size: 15px;
+  color: #999;
+}
+
+.student-form__footer {
+  position: relative;
+  margin-top: 35px;
+}
+
+.student-form__tip {
+  position: absolute;
+  top: -25px;
+  margin: 0;
+  padding-left: 60px;
+  font-size: 12px;
+  color: #FF1717;
+  line-height: 1;
+}
+
+.student-form__submit {
+  width: 100%;
+  height: 44px;
+  padding: 0;
+  border-style: none;
+  border-radius: 3px;
+  font-size: 18px;
+  color: #fff;
+  background-color: #0099FF;
+
+  &:disabled {
+    background-color: #ccc;
+  }
+}
+
+.student-select {
+  position: relative;
+  flex: 1;
+  height: 46px;
+
+  input {
+    width: 100%;
+    height: 100%;
+    padding: 0 15px;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    box-sizing: border-box;
+    font-size: 15px;
+    color: #999;
+
+    &.active {
+      border-radius: 3px 3px 0 0;
+    }
+  }
+}
+
+.student-select__list {
+  position: absolute;
+  top: 45px;
+  width: 100%;
+  border: 1px solid #ccc;
+  border-radius: 0 0 3px 3px;
+  box-sizing: border-box;
+  background-color: #fff;
+  z-index: 99;
+}
+
+.student-select__option {
+  padding-left: 15px;
+  font-size: 14px;
+  color: #999;
+  line-height: 32px;
+
+  &:hover {
+    color: #0099FF;
+  }
+}
\ No newline at end of file

src/router/router-config.js

@@ -286,4 +286,17 @@ export default [
     path: '/wxerr',
     component: loadable(() => import(/* wx-err */ '@components/wxerr/index'))
   },
+
+  // 助学计划落地页
+  {
+    path: '/college',
+    exact: true,
+    component: loadable(() => import('@/components/college'))
+  },
+  // 助学计划落地页
+  {
+    path: '/college/:id',
+    exact: true,
+    component: loadable(() => import('@/components/college/courseList'))
+  },
 ]

src/store/userAction.js

@@ -14,6 +14,36 @@ const accountLogin = user => dispatch => {
     })
 }
 
+const studentLogin = params => dispatch => {
+    return http.post(`${API['passport-api']}/phone_reg`, {
+        challenge: params.validate,
+        phone: params.tel,
+        password: params.password,
+        code: params.code,
+        area_code: params.num,
+        school_name:  params.school,
+        college_name: params.college,
+        student_id: params.uid,
+        student_name: params.name,
+        redirect: encodeURIComponent(params.redirect),
+        type: 1,
+    }).then(res => {
+        const { errno, data } = res.data;
+        let result = {};
+        if(errno === 0) {
+            result = {
+                data: {
+                    errno: 200,
+                    data,
+                }
+            };
+        }else {
+            result = res;
+        }
+        return storeUser(result, dispatch);
+    });
+}
+
 const quickLogin = user => dispatch => {
     return http.post(`${API['passport-api']}/m/login/quickLogin`, {
         ...user,
@@ -75,6 +105,7 @@ const startFetchUser = () => ({
 
 export {
     accountLogin,
+    studentLogin,
     SET_CURRENT_USER,
     setCurrentUser,
     quickLogin,