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

src/components/examination/index.js

@@ -30,10 +30,9 @@ export default class Examination extends PureComponent {
     }
 
     render() {
-        // let {ques, type_id, options, analysis} = this.state.questionData
         let {
             questionData: {
-                ques, type_id, options, analysis
+                ques, type_id, options, analysis, category
             },
             isShowAnswer
         } = this.state
@@ -41,7 +40,7 @@ export default class Examination extends PureComponent {
             <div className='examination'>
                 <div className="question-container">
                     <div className="topic">
-                        <Tag className='category-tag'>深度学习</Tag>
+                        <Tag className='category-tag'>{category}</Tag>
                         {ques}
                     </div>
                     {

src/utils/index.js

@@ -50,4 +50,11 @@ export const isPhone = ($poneInput) => {
     } else {
         return false;
     }
-} 
\ No newline at end of file
+}
+
+export const getParam = (key, str) => {
+    const _s = str ? str : location.href;
+    const re = new RegExp(`(?:\\?|#|&)(${key})=([^=&#\\?]+)`, 'ig');
+    let found;
+    return (found = re.exec(_s)) ? found[2] : null;
+}
\ No newline at end of file