Merge branch 'intelligent-recommend' into dev

src/components/intelligent-recommend/index.js

@@ -31,10 +31,7 @@ class IntelligentRecommend extends Component {
   }
 
   componentDidMount() {
-    const {user, intelligentRecommend, history, reselect} = this.props
-    if (user.hasError) {
-      return history.push('/passport')
-    }
+    const {intelligentRecommend, reselect} = this.props
     if (isEmpty(intelligentRecommend.result)) {
       reselect()
       this.getMessage()
@@ -100,6 +97,12 @@ class IntelligentRecommend extends Component {
     })
   }
 
+  displayPrice = (price) => {
+    let _price = price.toString()
+    let decimal = _price.split('.')
+    return parseInt(decimal[1]) === 0 ? decimal[0] : price
+  }
+
   goBack = () => {
     const {state} = this.props.location
     if (browser.isWeixin && getParam('code') && getParam('state')) {
@@ -208,8 +211,8 @@ class IntelligentRecommend extends Component {
                           {
                             item.c_type === 1 && <React.Fragment key={item.course_id}>
                               <div className="prices">
-                                <span className={'price'}>￥{item.price_sale}</span>
-                                <span className={'old-price'}>￥{item.price_original}</span>
+                                <span className={'price'}>￥{this.displayPrice(item.price_sale)}</span>
+                                <span className={'old-price'}>￥{this.displayPrice(item.price_original)}</span>
                               </div>
                               <Link className={'register'} to={`/detail?id=${item.course_id}`}>{item.second_btn}</Link>
                             </React.Fragment>

src/components/intelligent-recommend/index.scss

@@ -216,6 +216,7 @@
       font-size: 18px;
       line-height: 36px;
       font-weight: 600;
+      white-space: pre-line;
 
       &.project {
         font-size: 14px;

src/router/route-middle-page.js

@@ -19,7 +19,6 @@ function RouteMiddlePage(props) {
             } else {
                 let {data} = user || {data: {}}
                 if (data && Object.values(data).every(item => !!item)) {
-                    history.push(location.pathname)
                     setLoadingState(false)
                 } else {
                     history.push('/passport', {from: location})

src/router/router-config.js

@@ -338,6 +338,7 @@ export default [
   //智能选课
   {
     path: '/intelligent-recommend',
+    isPrivate: true,
     component: loadable(() => import(/* webpackChunkName: 'intelligent-recommend' */'@/components/intelligent-recommend')),
   },
 ]