Merge branch 'intelligent-recommend' into dev

src/App.js

@@ -69,8 +69,7 @@ class App extends Component {
     this.getUser()
     this.utm()
 
-    const {history, location} = this.props
-    this.records.push(location)
+    const {history} = this.props
 
     this.setNavigationRecord(this.props.location, this.props.history.action)
     this.setPreviousLocation()
@@ -142,13 +141,12 @@ class App extends Component {
     const {pathname, search, hash} = location
     let isLastRecord = location.pathname === (this.records.length && this.records[this.records.length - 1].pathname)
     let needHistoryMutation = location.pathname !== this.previousLocation.pathname
-
     switch (action) {
       case 'POP':
         if (needHistoryMutation) {
           this.firstLoad ? this.records.push({pathname, search, hash}) : this.records.pop()
         } else {
-          this.records[this.records.length - 1] = location
+          this.records.length ? (this.records[this.records.length - 1] = location) : this.records = [location]
         }
         break
       case 'REPLACE':
@@ -160,8 +158,10 @@ class App extends Component {
 
     location.state && location.state.records
       ? (location.state.records = this.records)
-      : location.state ? location.state = {...location.state, records: this.records}
-      : (location.state = {records: this.records})
+      : location.state ? location.state = {
+        ...location.state,
+        records: this.records,
+      } : (location.state = {records: this.records})
   }
 
 

src/components/intelligent-recommend/index.js

@@ -202,7 +202,8 @@ class IntelligentRecommend extends Component {
                              alt=""/>
                       </div>
                       <div className="info">
-                        <div className={'title'}>{item.recmd_title}</div>
+                        {/*<div className={'title'}>{item.recmd_title}</div>*/}
+                        <div className={'title'}>Python数据分析 升级版[超6K，都if就饿哦今晚i哦减肥i哦</div>
                         <div className={'des'}>{item.recmd_desc}</div>
                         <div className="bar">
                           {

src/components/intelligent-recommend/index.scss

 #intelligent-recommend {
   background: linear-gradient(to right, #F1F0F6, #EBF4F9);
   padding: 59px 10px 18px;
-  height: 100%;
+  min-height: 100%;
 
   .clearfix {
     &::after {
@@ -267,7 +267,7 @@
         }
 
         .title {
-          width: 97%;
+          width: 190px;
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;