Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into onigin/ysl_a

app/controllers/shixuns_controller.rb

@@ -128,7 +128,7 @@ class ShixunsController < ApplicationController
 
 		page  = params[:page]  || 1
 		limit = params[:limit] || 10
-		offset = (page.to_i - 1) * limit
+		offset = (page.to_i - 1) * (limit.to_i)
 		order = params[:order] || "desc"
 		## 搜索关键字创建者、实训名称、院校名称
 		keyword = params[:search]

public/react/src/modules/courses/Index.js

@@ -296,10 +296,11 @@ class CoursesIndex extends Component{
 
     componentDidMount(){
         // this.updataleftNav()
-        this.historyArray = []
+        this.historyArray = [location.pathname];
+
         this.props.history.listen( location =>  {
-			console.log(location)
+			console.log(location);
-            this.historyArray.unshift(location.pathname)
+            this.historyArray.unshift(location.pathname);
             this.historyArray.length = 2;
 			//Do your stuff here
 		});