From c06855e63631b7930512d120df77e2c84d7f147b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 6 Mar 2020 21:51:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/tpm/TPMIndexHOC.js | 108 ++++++++++++++------
 1 file changed, 76 insertions(+), 32 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 95318673a..3325e3255 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -598,38 +598,82 @@ export default function TPMIndexHOC(WrappedComponent) {
 				MdifHasAnchorJustScorll: this.MdifHasAnchorJustScorll,
 				scrollToAnchor: this.scrollToAnchor
 
-			};
-			var mypath = this.props && this.props.match && this.props.match.path;
-			return (
-				<div className="indexHOC">
-					{isRender === true ? <LoginDialog
-						Modifyloginvalue={() => this.hideLoginDialog()}
-						{...this.props}
-						{...this.state}
-					/> : ""}
-					{/* AccountProfile 也用作职业认证 */}
-					{AccountProfiletype === true ? <AccountProfile
-						hideAccountProfile={() => this.hideAccountProfile()}
-						{...this.props}
-						{...this.state}
-						{...this.dialogObj}
-					/> : ""}
-					{/*验证是否注册手机邮箱*/}
-					{AccountPhoneemailtype === true ? <AccountPhoneemail
-						hideAccountProfile={() => this.hideAccountPhoneemailtype()}
-						{...this.props}
-						{...this.state}
-						{...this.dialogObj}
-					/> : ""}
-					{
-						mypath && mypath === "/question" ?
-							""
-							:
-							<SiderBar
-								{...this.props}
-								{...this.state}
-								Headertop={Headertop} />
-					}
+	  	render() {
+          let{Headertop,Footerdown, isRender, AccountProfiletype,AccountPhoneemailtype}=this.state;
+          const common = {
+            isSuperAdmin:this.isSuperAdmin,
+            isAdminOrCreator:this.isAdminOrCreator,
+						isClassManagement:this.isClassManagement,
+						isCourseAdmin:this.isCourseAdmin,
+
+            isAdmin: this.isAdmin,
+            isAdminOrTeacher: this.isAdminOrTeacher,
+            isStudent: this.isStudent,
+            isAdminOrStudent: this.isAdminOrStudent,
+            isNotMember: this.isNotMember,
+            isCourseEnd: this.isCourseEnd,
+
+            isUserid:this.state.coursedata&&this.state.coursedata.userid,
+            fetchUser: this.fetchUser,
+
+            showLoginDialog: this.showLoginDialog,
+            checkIfLogin: this.checkIfLogin,
+            showProfileCompleteDialog: this.showProfileCompleteDialog,
+						showhideAccountPhoneemailDialog:this.showhideAccountPhoneemailDialog,
+            checkIfProfileCompleted: this.checkIfProfileCompleted,
+						showaccountprofileDialog:this.showaccountprofileDialog,
+            checkIfProfessionalCertification: this.checkIfProfessionalCertification,
+            showProfessionalCertificationDialog: this.showProfessionalCertificationDialog,
+
+						ShowOnlinePdf:(url)=>this.ShowOnlinePdf(url),
+						DownloadFileA:(title,url)=>this.DownloadFileA(title,url),
+						DownloadOpenPdf:(type,url)=>this.DownloadOpenPdf(type,url),
+
+            slowDownload: this.slowDownload,
+            showGlobalLoading: this.showGlobalLoading,
+            hideGlobalLoading: this.hideGlobalLoading,
+						yslslowCheckresults:this.yslslowCheckresults,
+						yslslowCheckresultsNo:this.yslslowCheckresultsNo,
+						MdifHasAnchorJustScorll:this.MdifHasAnchorJustScorll,
+						scrollToAnchor:this.scrollToAnchor
+
+          };
+          // console.log("this.props.mygetHelmetapi");
+          // console.log(this.props.mygetHelmetapi);
+				// console.log("WrappedComponent");
+				// console.log(this.props);
+				// console.log(this.props.match.path);
+				var mypath= this.props&&this.props.match&&this.props.match.path;
+		    return (
+		    	<div className="indexHOC">
+						{isRender===true ? <LoginDialog
+              Modifyloginvalue={()=>this.hideLoginDialog()}
+              {...this.props}
+              {...this.state}
+            /> : ""}
+            {/* AccountProfile 也用作职业认证 */}
+            {AccountProfiletype===true ? <AccountProfile
+              hideAccountProfile={()=>this.hideAccountProfile()}
+              {...this.props}
+              {...this.state}
+              {...this.dialogObj}
+            />:""}
+            {/*验证是否注册手机邮箱*/}
+						{AccountPhoneemailtype===true?<AccountPhoneemail
+							hideAccountProfile={()=>this.hideAccountPhoneemailtype()}
+							{...this.props}
+							{...this.state}
+							{...this.dialogObj}
+						/>:""}
+						{
+							mypath&&mypath==="/problemset"?
+                  ""
+								:
+								<SiderBar
+									{...this.props}
+									{...this.state}
+									Headertop={Headertop}/>
+						}
 
 
 					{/* 注释掉了1440 影响到了手机屏幕的展示 */}