Merge branch 'dev_hjm_a' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_hjm_a

app/controllers/users/base_controller.rb

@@ -37,7 +37,7 @@ class Users::BaseController < ApplicationController
   end
 
   def per_page_value
-    params[:per_page].to_i > 0 && params[:per_page].to_i < 50 ? params[:per_page].to_i : 20
+    params[:per_page].to_i > 0 && params[:per_page].to_i <= 100 ? params[:per_page].to_i : 20
   end
   alias_method :limit_value, :per_page_value
 

public/react/src/modules/tpm/NewHeader.js

@@ -727,7 +727,7 @@ submittojoinclass=(value)=>{
 										 src={require('./roundedRectangle.png')}
 								/>
               </li>
-							<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}><a href={this.props.Headertop===undefined?"":this.props.Headertop.moop_cases_url}>教学案例</a></li>
+							<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}><a href={`/moop_cases`}>教学案例</a></li>
 							<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>
 								<a href={'/crowdsourcing'}>众包创新</a>
 							</li>

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -360,6 +360,10 @@ export function TPMIndexHOC(WrappedComponent) {
 				link.dispatchEvent(evt);
 				document.body.removeChild(link);
 			}
+
+			DownloadOpenPdf=(type,url)=>{
+				type===true?window.open(url):window.location.href=url;
+			}
 	  	render() {
           let{Headertop,Footerdown, isRender, AccountProfiletype}=this.state;
           const common = {
@@ -383,6 +387,7 @@ export function TPMIndexHOC(WrappedComponent) {
             
 						ShowOnlinePdf:(url)=>this.ShowOnlinePdf(url),
 						DownloadFileA:(title,url)=>this.DownloadFileA(title,url),
+						DownloadOpenPdf:(type,url)=>this.DownloadOpenPdf(type,url)
           }
 		    return (
 		    	<div>