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

src/components/order/index.js

@@ -297,7 +297,7 @@ class Order extends Component {
         if(orderInfo.data.errno === 200) {
           newData = Object.assign({}, orderInfo.data.data, {course: []});
         }else{
-          Toast.info(courseInfo.data.msg, 2);
+          Toast.info(orderInfo.data.msg, 2);
           return;
         }
         if(courseInfo.data.code === 200) {

src/components/scholarship/index.js

@@ -257,7 +257,7 @@ class _Scholarship extends Component {
                             </>
                         ) : (
                                 <>
-                                    <Flex justify='center' align='baseline' style={{ height: '20px', lineHeight: '20px' }}>
+                                    <Flex justify='center' align='baseline' className={"drawCash"} >
                                         <span className={'common-ft-25'}>{account}</span>
                                         <span className={'common-ft-15'}>元</span>
                                     </Flex>

src/components/scholarship/scholarship.scss

@@ -40,6 +40,10 @@
       line-height: 30px;
       text-align: center;
     }
+    .drawCash {
+      height: 24px;
+      line-height: 24px;
+    }
   }
   .runtimeList {
       height: 30px;