Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/discusses_controller.rb

@@ -81,8 +81,7 @@ class DiscussesController < ApplicationController
     begin
       @discuss = Discuss.create!(:dis_id => params[:container_id], :dis_type => params[:container_type],
                                  :content => params[:content].gsub("&nbsp\;", "").strip, :user_id => current_user.id,
-                                 :praise_count => 0, :position => params[:position], :challenge_id => params[:challenge_id],
-                                 :hidden => !current_user.admin?) # 管理员回复的能够显示
+                                 :praise_count => 0, :position => params[:position], :challenge_id => params[:challenge_id])
     rescue Exception => e
       uid_logger_error("create discuss failed : #{e.message}")
       raise Educoder::TipException.new("评论异常，原因：#{e.message}")

db/migrate/20200304062256_modidy_hidden_default_for_discusses.rb

@@ -0,0 +1,5 @@
+class ModidyHiddenDefaultForDiscusses < ActiveRecord::Migration[5.2]
+  def change
+    change_column :discusses, :hidden, :boolean, :default => false
+  end
+end

public/react/src/App.js

@@ -793,37 +793,37 @@ class App extends Component {
 											 render={
 												 (props) => (<Paperreview  {...this.props} {...props} {...this.state} />)
 											 }/>
-								<Route path="/paperlibrary/edit/:id"
-											 render={
-												 (props) => (<Paperlibraryeditid  {...this.props} {...props} {...this.state} />)
-											 }/>
+								{/*<Route path="/paperlibrary/edit/:id"*/}
+								{/*			 render={*/}
+								{/*				 (props) => (<Paperlibraryeditid  {...this.props} {...props} {...this.state} />)*/}
+								{/*			 }/>*/}
 
-								<Route path="/paperlibrary/see/:id"
-											 render={
-												 (props) => (<Paperlibraryseeid  {...this.props} {...props} {...this.state} />)
-											 }/>
+								{/*<Route path="/paperlibrary/see/:id"*/}
+								{/*			 render={*/}
+								{/*				 (props) => (<Paperlibraryseeid  {...this.props} {...props} {...this.state} />)*/}
+								{/*			 }/>*/}
 
 								<Route path="/myproblems/:id/:tab?"
 											 render={
 												 (props) => (<StudentStudy  {...this.props} {...props} {...this.state} />)
 											 } />
-								<Route path="/question/edit/:id"
-											 render={
-												 (props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)
-											 } />
-
-								<Route path="/question/newitem"
-											 render={
-												 (props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)
-											 } />
-								<Route path="/question/:type"
-											 render={
-												 (props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
-											 } />
-								<Route path="/paperlibrary"
-											 render={
-												 (props) => (<Testpaperlibrary  {...this.props} {...props} {...this.state} />)
-											 }/>
+								{/*<Route path="/question/edit/:id"*/}
+								{/*			 render={*/}
+								{/*				 (props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)*/}
+								{/*			 } />*/}
+
+								{/*<Route path="/question/newitem"*/}
+								{/*			 render={*/}
+								{/*				 (props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)*/}
+								{/*			 } />*/}
+								{/*<Route path="/question/:type"*/}
+								{/*			 render={*/}
+								{/*				 (props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)*/}
+								{/*			 } />*/}
+								{/*<Route path="/paperlibrary"*/}
+								{/*			 render={*/}
+								{/*				 (props) => (<Testpaperlibrary  {...this.props} {...props} {...this.state} />)*/}
+								{/*			 }/>*/}
 
 								<Route path="/Integeneration"
 											 render={
@@ -835,15 +835,19 @@ class App extends Component {
 												 (props) => (<Developer  {...this.props} {...props} {...this.state} />)
 											 }/>
 
-								<Route path="/question"
-											 render={
-												 (props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
-											 }/>
+								{/*<Route path="/question"*/}
+								{/*			 render={*/}
+								{/*				 (props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)*/}
+								{/*			 }/>*/}
+
+
+
 								{/*<Route path="/wxcode/:identifier?" component={WXCode}*/}
 								{/*	render={*/}
 								{/*		(props)=>(<WXCode {...this.props} {...props} {...this.state}></WXCode>)*/}
 								{/*	}*/}
 								{/*/>*/}
+
 								<Route exact path="/"
 											// component={ShixunsHome}
 											render={

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -525,7 +525,6 @@ class Coursesleftnav extends Component{
   }
 
   saveNavmodapost=(url,value,positiontype,coursesId)=>{
-    debugger;
     axios.post(url,
       {name:value}).then((result)=>{
       	if(result!=undefined){

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

@@ -228,7 +228,7 @@ class GraduateTopicDetailTable extends Component{
         </Modal>
         <Modal
           visible={visible}
-          title="新建分班2"
+          title="新建分班"
           closable={false}
           footer={null}
           destroyOnClose={true}

public/react/src/modules/courses/members/CourseGroupListTable.js

@@ -66,7 +66,7 @@ function CourseGroupListTable(props) {
             className:"color-grey-6",
             render: (name, record, index) => {
                 return <WordsBtn title={name.length > 11 ? name : ''} onClick={() => onGoDetail(record)} style={''}
-                    className="overflowHidden1" style2={{maxWidth: '180px', verticalAlign: 'bottom'}}>
+                    className="overflowHidden1 color-dark" style2={{maxWidth: '180px', verticalAlign: 'bottom'}}>
                 {name}</WordsBtn>
             }
         },
@@ -154,7 +154,7 @@ function CourseGroupListTable(props) {
                     {!isCourseEnd && isAdmin && <WordsBtn style2={{ marginRight: '12px' }} onClick={() => onDelete(record)} style={'grey'}>删除分班</WordsBtn>}
                       
                     {isStudent && <WordsBtn style2={{ marginRight: '12px' }} onClick={() => addToDir(record)} style={''}>加入分班</WordsBtn>}        
-                    <WordsBtn  onClick={() => onGoDetail(record)} style={''}>查看</WordsBtn>              
+                    <WordsBtn  onClick={() => onGoDetail(record)} style={''} className="color-dark">查看</WordsBtn>              
                 </React.Fragment>
             }
         })

public/react/src/modules/tpm/shixuns/ShixunsIndex.js

@@ -396,7 +396,7 @@ class ShixunsIndex extends Component {
                     }
 										.myshixin-head{
 												width: 100%;
-												height: 300px;
+												height: 240px;
 												background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.shixun_banner_url === null ?`images/educoder/courses/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.shixun_banner_url)});
 											  background-color: #081C4B;
 												background-position: center;