Merge branch 'master' of gitlab.julyedu.com:baiguangyao/mr-julyedu

src/common/HeaderBar/index.js

-import React from 'react'
-import './index.scss'
+import React, {Component} from 'react'
+import './index.scss';
 
-const HeaderBar = (props) => {
-    return (
-        <div className="detail-header">
-            <i className={'iconfont iconiconfront-68 return'}></i>
-            <span className='herder'>{props.title}</span>
-            <i className={'iconfont icongouwuche shopping-cart'}></i>
-        </div>
-    );
+class HeaderBar extends Component {
+    constructor(props) {
+        super(props);
+    }
+    goBack = () => {
+        window.history.go(-1);
+    }
+    goShop = () => {
+        location.replace('/shopcart');
+    }
+    render() {
+        return (
+            <div className="detail-header" style={{...this.props.style}}>
+                <i className={`iconfont ${this.props.arrow ? 'iconiconfront-68' : ''} return`} onClick={this.goBack}></i>
+                <span className='herder'>{this.props.title}</span>
+                <i className={`iconfont ${this.props.cart ? 'icongouwuche-xianxing' : ''} shopping-cart`} onClick={this.goShop}></i>
+            </div>
+        );
+    }
 };
 
 export default HeaderBar;

src/components/order/orderinfo.js

@@ -79,7 +79,7 @@ const MyForm = withFormik({
                 return;
             }
             Toast.info('保存成功！', undefined, undefined, false);
-            FormBag.props.history.push({
+            FormBag.props.history.replace({
                 pathname: '/order',
                 state: values
             });

src/components/scholarship/CategoryItem/CategoryItem.js

@@ -10,7 +10,7 @@ export default class CategoryItem extends Component {
         const {course_title, price1, price0, first_level_tip, image_name, upgrade, upgradeImg} = this.props;
         return (
             <WingBlank>
-                <div className={'category'}>
+                <div className={'scholarship-category'}>
                     <div className={'imageContainer'}>
                         <img className={'image'} src={image_name}></img>
                         {

src/components/scholarship/CategoryItem/CategoryItem.scss

-.category {
+.scholarship-category {
   display: flex;
   align-items: flex-start;
   height: 90px;