diff --git a/app/services/homeworks_service.rb b/app/services/homeworks_service.rb
index 59bd5dad4..a21614efc 100644
--- a/app/services/homeworks_service.rb
+++ b/app/services/homeworks_service.rb
@@ -328,10 +328,13 @@ class HomeworksService
       work.late_penalty = work.work_status == 2 ? homework.late_penalty : 0
       work.commit_time = myshixun.created_at > setting_time.publish_time ? setting_time.publish_time : myshixun.created_at
       work.myshixun_id = myshixun.id
-      work.update_time = if myshixun_endtime.present?
-                           myshixun_endtime > homework_end_or_late_time ? homework_end_or_late_time : myshixun_endtime
+      work.update_time = if myshixun_endtime.present? && myshixun_endtime <= homework_end_or_late_time
+                           myshixun_endtime
+                         elsif myshixun.updated_at > homework_end_or_late_time
+                           last_pass_time = games.select{|game| game.status == 2 && game.end_time < homework_end_or_late_time}.map(&:end_time).max
+                           last_pass_time.present? ? last_pass_time : myshixun.created_at
                          else
-                           myshixun.updated_at > homework_end_or_late_time ? homework_end_or_late_time : myshixun.updated_at
+                           myshixun.updated_at
                          end
 
       work.final_score = final_score
diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
index b453d0075..2870c5d12 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
@@ -461,11 +461,7 @@ class Selectsetting extends Component{
 						</ul>
 
 
-
-						<div className="pl20 pr20"
-								 style={{"Height":"204px"}}>
-
-							<style>{`
+						<style>{`
                    .color-grey-9a{color: #9A9A9A !important;}
                    .datastyle{
                       width: 120px;
@@ -480,7 +476,12 @@ class Selectsetting extends Component{
 									    display: inline-block;
 									    float: left;
 							     }
+							     .settingbox{
+							         max-height: 123px;
+												overflow-y: auto;
+							     }
                 `}</style>
+						<div className="pl20 pr20 settingbox">
 							<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE">
 								<li className="fl" style={{width: '241px'}}>
 									<span className={"isabox"} title={datalist&&datalist.title}> {datalist&&datalist.title} </span>
@@ -632,7 +633,7 @@ class Selectsetting extends Component{
 
 							{this.state.newfileListtypes===true?<p className={"color-red"}>请先上传资源</p>:""}
 
-							<p className={"winth540"}>
+							<p className={this.state.fileListtype===true?"mt15":""}>
 								<style>{`
                 .ant-checkbox-wrapper{
                   margin-left:0px !important;
@@ -640,19 +641,19 @@ class Selectsetting extends Component{
                 }
               `}</style>
 
-								<div className={this.state.fileListtype===true?"mt30":""}>
-									<Checkbox
-										checked={is_public}
-										onChange={this.onChangepublics}>
-										<span className={"font-14"}>勾选后所有用户可见，否则仅课堂成员可见</span>
-									</Checkbox>
-								</div>
+								{/*<div className={this.state.fileListtype===true?"mt30":""}>*/}
+									{/*<Checkbox*/}
+										{/*checked={is_public}*/}
+										{/*onChange={this.onChangepublics}>*/}
+										{/*<span className={"font-14"}>勾选后所有用户可见，否则仅课堂成员可见</span>*/}
+									{/*</Checkbox>*/}
+								{/*</div>*/}
 								{/*{this.props.has_course_groups&&this.props.has_course_groups===true?:""}*/}
-								{/*{this.state.course_groupss&&this.state.course_groupss.length>0?<Checkbox*/}
-								{/*checked={unified_setting}*/}
-								{/*onChange={this.onChangesettings}>*/}
-								{/*<span>统一设置</span><span className={"font-14 color-grey-9"}>(选中则所有分班使用相同的发布设置，否则各个单独设置)</span>*/}
-								{/*</Checkbox>:""}*/}
+								{this.state.course_groupss&&this.state.course_groupss.length>0?<Checkbox
+								checked={unified_setting}
+								onChange={this.onChangesettings}>
+								<span>统一设置</span><span className={"font-14 color-grey-9"}>(选中则所有分班使用相同的发布设置，否则各个单独设置)</span>
+								</Checkbox>:""}
 
 								<style>
 									{`
@@ -744,6 +745,7 @@ class Selectsetting extends Component{
 							{/*{this.state.course_group_idtypes===true?<p className={"color-red"}>请选择分班</p>:""}*/}
 
 							{/*{course_group_publish_timestype===true?<p className={"color-red mt10"}>请填写完整</p>:""}*/}
+
 							<textarea  placeholder="请输入资源描述，最大限制100个字符" className={"mt10"} value={description} onInput={this.settextarea} style={{
 								width: '100%',
 								height:'120px',
diff --git a/public/react/src/modules/courses/coursesPublic/sendResource.js b/public/react/src/modules/courses/coursesPublic/sendResource.js
index 576c9b514..64e8093d1 100644
--- a/public/react/src/modules/courses/coursesPublic/sendResource.js
+++ b/public/react/src/modules/courses/coursesPublic/sendResource.js
@@ -469,7 +469,7 @@ class Sendresource extends Component{
 
 						{newfileListtype===true&&this.state.fileListtype===false?<p className={"color-red"}>请先上传资源</p>:""}
 
-						<p className={"winth540"}>
+						<p className={this.state.fileListtype===true?"mt25":""}>
 							<style>{`
                 .ant-checkbox-wrapper{
                   margin-left:0px !important;
@@ -477,13 +477,13 @@ class Sendresource extends Component{
                 }
               `}</style>
 
-							<div className={this.state.fileListtype===true?"mt30":""}></div><Checkbox checked={is_public} onChange={this.onChangepublic}>
-							<span className={"font-14"}>勾选后所有用户可见，否则仅课堂成员可见</span>
-						</Checkbox>
+							{/*<div className={this.state.fileListtype===true?"mt30":""}></div><Checkbox checked={is_public} onChange={this.onChangepublic}>*/}
+							{/*<span className={"font-14"}>勾选后所有用户可见，否则仅课堂成员可见</span>*/}
+						{/*</Checkbox>*/}
 
-							{/*{this.state.course_groups_count&&this.state.course_groups_count>0?<Checkbox  checked={is_unified_setting} onChange={this.onChangesetting}>*/}
-							{/*<span>统一设置</span><span className={"font-14 color-grey-9"}>(选中则所有分班使用相同的发布设置，否则各个单独设置)</span>*/}
-							{/*</Checkbox>:""}*/}
+							{this.state.course_groups_count&&this.state.course_groups_count>0?<Checkbox  checked={is_unified_setting} onChange={this.onChangesetting}>
+							<span>统一设置</span><span className={"font-14 color-grey-9"}>(选中则所有分班使用相同的发布设置，否则各个单独设置)</span>
+							</Checkbox>:""}
 							<style>{`
                 .Selectleft20{
                    margin-left: 20px !important;