Merge branch 'study' into examination

src/common/CategoryTag/index.js

+import React from 'react'
+
+const Tag = (props) => {
+    return (
+        <span className={`state ${props.className}`}>
+            {props.children}
+        </span>
+    )
+}
+
+export default Tag
\ No newline at end of file

src/common/CategoryTag/index.scss

+.state {
+    box-sizing: border-box;
+    border-radius: 0 10px 10px 0;
+    padding: 1px 5px;
+}
\ No newline at end of file

src/common/index.js

@@ -5,3 +5,4 @@ export { default as Course } from './Course'  //  课程状态（试听 正在
 export { default as Carousel } from './Carousel' // 横向滚动
 export { default as Topscroll } from './Topscroll' // 首页头部轮播
 export { default as Scroll } from './Scroll' // 首页正常轮播图
+export { default as Tag } from './CategoryTag'

src/components/study/free-courses/index.js

 import React from 'react'
-import { Course } from '../../../common'
+import { Course, Tag } from '../../../common'
 
 
 import './free-courses.scss'
@@ -79,14 +79,6 @@ const mockData = [
     },
 ]
 
-const Tag = (props) => {
-    return (
-        <span className={`state ${props.className}`}>
-            {props.children}
-        </span>
-    )
-}
-
 const Bottom = (props) => (
     <div className='bottom'>
         <Tag className={props.className}>{props.tagText}</Tag>