Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js

public/react/config/webpack.config.prod.js

@@ -58,8 +58,8 @@ module.exports = {
   bail: true,
   // We generate sourcemaps in production. This is slow but gives good results.
   // You can exclude the *.map files from the build during deployment.
-   devtool: shouldUseSourceMap ? 'nosources-source-map' : false,  //正式版
+  //  devtool: shouldUseSourceMap ? 'nosources-source-map' : false,  //正式版
-	//devtool: shouldUseSourceMap ? 'source-map' : false,//测试版
+	devtool: shouldUseSourceMap ? 'source-map' : false,//测试版
   // In production, we only want to load the polyfills and the app code.
   entry: [require.resolve('./polyfills'), paths.appIndexJs],
   output: {

public/react/src/modules/courses/Resource/Fileslistitem.js

@@ -215,13 +215,9 @@ class Fileslistitem extends Component{
                       }
 
                         {
-                       this.props.isNotMember ? discussMessage.is_lock === true ?
+                       this.props.isNotMember ?
                                 <span className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</span>
-                                :
+                                :""
-                                <a
-                                    onClick={this.showfiles}
-                                    // href={"/courses/" + coursesId + "/graduation/graduation_tasks/" + categoryid + "/" + taskid + "/list"}
-                                    className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.title}</a> :""
                         }
 
 

public/react/src/modules/courses/exercise/ExerciseListItem.js

@@ -107,11 +107,9 @@ class ExerciseListItem extends Component{
 												}
 
                         {
-                        this.props.isNotMember()? item.lock_status === 0 ?
+                        this.props.isNotMember()?
                                 <span className="fl mt3 font-16 font-bd color-dark comnonwidth580" title={item.exercise_name}>{item.exercise_name}</span>
-                                :
+                                :""
-
-                                <a  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name} href={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</a>:""
                         }
 
                         {

public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js

@@ -229,12 +229,9 @@ class GraduateTaskItem extends Component{
               }
 
               {
-            this.props.isNotMember?this.props.discussMessage.private_icon===true?
+            this.props.isNotMember?
                   <span className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}</span>
-                  :
+             :""
-                  <a href={"/courses/"+coursesId+"/graduation_tasks/"+categoryid+"/"+taskid+"/list"}
-										 title={discussMessage.name}
-                     className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
 
 

public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js

@@ -70,15 +70,17 @@ class GraduateTopicItem extends Component{
           `}</style>
             <h6>
               {
-                isNotMember && discussMessage.private_icon===true ?
+                isNotMember?
-                  <a className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:
+                  <a className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
-                  <a onClick={() => this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>
+
               }
               {
                 isStudent?<a onClick={() => this.toDetailPage(`${discussMessage.id}`)}
                              className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
               }
-
+							{
+								isAdmin?<a onClick={() => this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
+							}
               {
                discussMessage.private_icon===true?
                   <Tooltip  title={ this.props.isNotMember()===true?"私有属性，非课堂成员不能访问":"私有属性"}  placement="bottom">

public/react/src/modules/courses/shixunHomework/Listofworks.js

@@ -1515,7 +1515,7 @@ class Listofworks extends Component {
 							typelist={teacherdata === undefined ? [""] : teacherdata.homework_status}
 						/>
 						<a className="color-grey-9 fr font-16  summaryname  ml20 mr20"
-							 href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id}`}>返回</a>
+							 href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? ""  : jobsettingsdata.data.category.category_id===undefined?"": jobsettingsdata.data.category.category_id}`}>返回</a>
 						<a className="color-grey-9 fr font-16 mr20"
 							 href={`/shixuns/${teacherdata === undefined ? "" : teacherdata.shixun_identifier}/challenges`}
 							 target={"_blank"}>实训详情</a>

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -1005,7 +1005,7 @@ class Listofworksstudentone extends Component {
 								<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 								<ActionBtn
 									className=" fl "
-									to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name}</ActionBtn>
+									to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id === undefined ? "" : jobsettingsdata.data.category.category_id}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name}</ActionBtn>
 								<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 								<WordsBtn className="fl">作业详情</WordsBtn>
 							</p>

public/react/src/modules/login/LoginDialog.js

@@ -317,10 +317,13 @@ class LoginDialog extends Component {
         });
     }
     handleDialogClose() {
-      this.setState({
+      if(this.props.match.path==="/"){
-        isRender: false
+        this.setState({
-      })
+          isRender: false
-        // window.location.href="/";
+        })
+      }else{
+      window.location.href="/";
+      }
     }
 
     loginEDU=()=>{

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

@@ -613,6 +613,7 @@ submittojoinclass=(value)=>{
         {/*  isRender&& isRender === true?*/}
               <LoginDialog
                   {...this.state}
+                  {...this.props}
               />
         {/*      :""*/}
         {/*}*/}