From 200617796d01e23c981651f68b0cae8ea206ea05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 20 Aug 2019 16:07:47 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/exercise/Studentshavecompletedthelist.js      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 921834b80..3e0d5b0e3 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -1182,7 +1182,7 @@ class Studentshavecompletedthelist extends Component {
 			})
 		}
 
-		this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, pageNumber, 20);
+		this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, pageNumber, 20);
 
 	}
 	paginationonChanges = (pageNumber) => {
@@ -2423,7 +2423,7 @@ class Studentshavecompletedthelist extends Component {
 						" min-width": " 1200px",
 					}}>
 						{/*老师*/}
-						<div className="edu-back-white">
+						<div className="edu-back-white" >
 							<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>
 
 								{/*你的评阅：*/}
@@ -2588,6 +2588,7 @@ class Studentshavecompletedthelist extends Component {
 										{data === undefined ? "" : <Table
 											dataSource={data}
 											columns={columnsys}
+											className="mysjysltable1"
 											pagination={false}
 											loading={loadingstate}
 											// onChange={this.TablePaginationsy}
@@ -2683,6 +2684,7 @@ class Studentshavecompletedthelist extends Component {
 												{datas === undefined ? "" : <Table
 													dataSource={datas}
 													columns={columnss}
+													className="mysjysltable2"
 													pagination={false}
 													loading={false}
 												/>}
@@ -2716,6 +2718,7 @@ class Studentshavecompletedthelist extends Component {
 											dataSource={data}
 											columns={columnstwo}
 											// showHeader={false}
+											className="mysjysltable3"
 											pagination={false}
 											loading={false}
 
@@ -2789,6 +2792,7 @@ class Studentshavecompletedthelist extends Component {
 														dataSource={datas}
 														columns={columns}
 														pagination={false}
+														className="mysjysltable4"
 														loading={loadingstate}
 													/>}</div>
 											</div>

From 8d33105ec0c2fcbf5252e1dacf8695e617e9aeac Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 20 Aug 2019 16:10:41 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=90=8E=E6=97=A0=E6=B3=95=E7=BB=A7=E7=BB=AD?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=90=8C=E6=96=87=E4=BB=B6=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/user/usersInfo/video/AliyunUploaderManager.js   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js b/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js
index 3cd3ac43c..19d38020f 100644
--- a/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js
+++ b/public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js
@@ -43,6 +43,8 @@ function doCreateUploader (options) {
         retryDuration: $('#retryDuration').val() || 2,
         region: $('#region').val() || 'ap-southeast-1',
         userId: $('#userId').val() || 1829848226361863, // 1303984639806000,
+        // 解决取消上传后无法继续上传同文件的问题
+        // https://workorder.console.aliyun.com/console.htm#/ticket/detail/?ticketId=FLASELR
         enableUploadProgress: false,
         // 添加文件成功
         addFileSuccess: function (uploadInfo) {

From 779153cd7a2fdc1331ce4f00302dcb479646899c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 20 Aug 2019 17:32:07 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=BA=BA=E5=90=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/paths/PathDetail/DetailCardsEditAndAdd.js      | 2 +-
 .../src/modules/paths/PathDetail/DetailCardsEditAndEdit.js     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
index 6a9b53232..49b1891ef 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
@@ -449,7 +449,7 @@ class DetailCardsEditAndAdd extends Component{
 									<Spin spinning={hometypepvisible}  size="large" style={{marginTop:'15%'}}>
                   <div className="newupload_conbox">
                     <div className="clearfix mb20 shixun_work_div newshixun_tab_div cdefault" style={{"marginRight":"4px"}} id="shixun_tab_div">
-                      <li className="fl mr5 mt5"> <a onClick={()=>this.changeTag(0,`${search}`)} className={ type===0 ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a></li>
+                      <li className="fl mr5 mt5"> <a onClick={()=>this.changeTag(0,`${search}`)} className={ parseInt(type)===0 ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a></li>
                       {
                         ChooseShixunList && ChooseShixunList.tags.map((item,key)=>{
                           return(
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
index 478575564..719994fdf 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
@@ -81,6 +81,7 @@ class DetailCardsEditAndEdit extends Component{
 
   //打开选择实训弹框初始化tag标签和列表
   changeTag(id,search){
+
     this.setState({
 			ChooseShixunListshixun_list:[],
 			page:1,
@@ -481,7 +482,7 @@ class DetailCardsEditAndEdit extends Component{
 								<Spin spinning={hometypepvisible}  size="large" style={{marginTop:'15%'}}>
                 <div className="newupload_conbox">
                   <div className="clearfix mb20 shixun_work_div newshixun_tab_div cdefault" style={{"marginRight":"4px"}} id="shixun_tab_div">
-                    <li className="fl mr5 mt5"> <a onClick={()=>this.changeTag(0,`${search}`)} className={ type===0 ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a></li>
+                    <li className="fl mr5 mt5"> <a onClick={()=>this.changeTag(0,`${search}`)} className={ parseInt(type)===0 ? "active edu-filter-cir-grey font-12":"edu-filter-cir-grey font-12"}>全部</a></li>
                     {
                       ChooseShixunList && ChooseShixunList.tags.map((item,key)=>{
                         return(

From 330499331579e15bf6dad5693b0a0085cc8fed69 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 20 Aug 2019 17:46:47 +0800
Subject: [PATCH 04/11] revert

---
 app/controllers/subjects_controller.rb | 10 ++++++++++
 app/views/subjects/show.json.jbuilder  | 22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index ac5bd027f..173b1bd13 100644
--- a/app/controllers/subjects_controller.rb
+++ b/app/controllers/subjects_controller.rb
@@ -85,6 +85,16 @@ class SubjectsController < ApplicationController
     # 合作团队
     @shixuns = @subject.shixuns.published.pluck(:id)
     @courses = @subject.courses if @subject.excellent
+    @members = @subject.subject_members.includes(:user)
+
+    shixuns = @subject.shixuns.published.pluck(:id)
+    challenge_ids = Challenge.where(shixun_id: shixuns).pluck(:id)
+    # 实训路径中的所有实训标签
+    @tags = ChallengeTag.where(challenge_id: challenge_ids).pluck(:name).uniq
+    # 用户获取的实训标签
+    # @user_tags = @subject.shixuns.map(&:user_tags_name).flatten.uniq
+    @user_tags = user_shixun_tags challenge_ids, @user.id
+    @my_subject_progress = @subject.my_subject_progress
     # 访问数变更
     @subject.increment!(:visits)
   end
diff --git a/app/views/subjects/show.json.jbuilder b/app/views/subjects/show.json.jbuilder
index 53e76a96f..ec76b5a2d 100644
--- a/app/views/subjects/show.json.jbuilder
+++ b/app/views/subjects/show.json.jbuilder
@@ -23,4 +23,26 @@ if @subject.excellent
     json.course_identity @user.course_identity(course)
     json.course_status subject_course_status course
   end
+end
+
+
+json.members @members do |member|
+  json.partial! 'subject_member', locals: { user: member.user }
+  json.role member.role
+end
+
+# 技能标签
+json.tags @tags do |tag|
+  unless tag.blank?
+    json.tag_name tag
+    json.status @user_tags.include?(tag)
+  end
+end
+
+# 我的进展
+json.progress do
+  json.my_score @subject.my_subject_score
+  json.all_score @subject.all_score
+  json.learned @subject.my_subject_progress
+  json.time  @subject.my_consume_time
 end
\ No newline at end of file

From d100864739f575c28b892c438978d198be823ed2 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 20 Aug 2019 17:49:38 +0800
Subject: [PATCH 05/11] search subject shixun creator

---
 app/controllers/subjects_controller.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index 173b1bd13..156b34f25 100644
--- a/app/controllers/subjects_controller.rb
+++ b/app/controllers/subjects_controller.rb
@@ -159,7 +159,7 @@ class SubjectsController < ApplicationController
   end
 
   def choose_subject_shixun
-    @search = params[:search]
+    @search = params[:search].strip if params[:search]
     @type = params[:type]
     # 超级管理员用户显示所有未隐藏的实训、非管理员显示合作团队用户的实训（对本单位公开且未隐藏）
     if current_user.admin?
@@ -173,8 +173,9 @@ class SubjectsController < ApplicationController
     tag_ids = @shixuns.joins(:shixun_tag_repertoires).pluck(:tag_repertoire_id).uniq
     @tags = TagRepertoire.select([:id, :name]).where(id: tag_ids)
 
-    if params[:search]
-      @shixuns = @shixuns.where("name like ?", "%#{@search}%")
+    unless params[:search].blank?
+      @shixuns = @shixuns.joins(:user).where("shixuns.name like ? or concat(users.lastname, users.firstname) like ?",
+                                             "%#{@search}%", "%#{@search}%").distinct
     end
 
     unless @type.nil? || @type == "" || @type == "all"

From e1c122f081233aed4c4cdc1b2b4a13eb907611ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 20 Aug 2019 18:07:34 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/App.js                       |   3 +-
 .../react/src/images/cert/shimingrenzheng.png | Bin 0 -> 2196 bytes
 .../react/src/images/cert/zhiyerenzheng.png   | Bin 0 -> 1779 bytes
 .../courses/coursesPublic/Addcourses.js       |  12 ++-
 .../exercise/Studentshavecompletedthelist.js  |  28 +++---
 .../modules/modals/Certifiedprofessional.js   |  87 +++++++++++++-----
 public/react/src/modules/modals/certfed.css   |  44 +++++++++
 7 files changed, 135 insertions(+), 39 deletions(-)
 create mode 100644 public/react/src/images/cert/shimingrenzheng.png
 create mode 100644 public/react/src/images/cert/zhiyerenzheng.png
 create mode 100644 public/react/src/modules/modals/certfed.css

diff --git a/public/react/src/App.js b/public/react/src/App.js
index 95b2853d6..5b57428c3 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -19,6 +19,7 @@ import Trialapplicationysl from './modules/login/Trialapplicationysl';
 import Trialapplicationreview from './modules/user/Trialapplicationreview';
 import Addcourses from "./modules/courses/coursesPublic/Addcourses";
 import AccountProfile from "./modules/user/AccountProfile";
+import Certifiedprofessional from "./modules/modals/Certifiedprofessional"
 import Trialapplication from './modules/login/Trialapplication'
 
 import NotFoundPage from './NotFoundPage'
@@ -305,7 +306,7 @@ class App extends Component {
 					<Trialapplicationreview  {...this.props} {...this.state}></Trialapplicationreview>
 				  <Addcourses {...this.props} {...this.state}/>
 				  <AccountProfile {...this.props} {...this.state}/>
-
+          {/*<Certifiedprofessional {...this.props} {...this.state}/>*/}
 					<Router>
 						<Switch>
 
diff --git a/public/react/src/images/cert/shimingrenzheng.png b/public/react/src/images/cert/shimingrenzheng.png
new file mode 100644
index 0000000000000000000000000000000000000000..01ea7f1eac3a423c3d16af8ff70884fdd6ac8c91
GIT binary patch
literal 2196
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
W1(m<=_R?Db0000<MNUMnLSTXt#652S

literal 0
HcmV?d00001

diff --git a/public/react/src/images/cert/zhiyerenzheng.png b/public/react/src/images/cert/zhiyerenzheng.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b0372a4689c71faabdc25be73882b5dc5d8676a
GIT binary patch
literal 1779
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
V2f1I3ao+#{002ovPDHLkV1h=#Yasvt

literal 0
HcmV?d00001

diff --git a/public/react/src/modules/courses/coursesPublic/Addcourses.js b/public/react/src/modules/courses/coursesPublic/Addcourses.js
index 8c9709fee..1a53c1b57 100644
--- a/public/react/src/modules/courses/coursesPublic/Addcourses.js
+++ b/public/react/src/modules/courses/coursesPublic/Addcourses.js
@@ -214,6 +214,10 @@ class Addcourses extends Component{
       }
     ).then((response) => {
 			if(response  === undefined){
+				this.setState({
+					// Addcoursestype:false,
+					isSpin:false
+				});
 				return
 			}
       if(response.data.status===0){
@@ -269,14 +273,16 @@ class Addcourses extends Component{
         // })
       }
 
-      this.setState({
+			this.setState({
+				Addcoursestype:false,
 				isSpin:false
-			})
+			});
     }).catch((error) => {
       console.log(error)
 			this.setState({
+				Addcoursestype:false,
 				isSpin:false
-			})
+			});
     })
 
     // if(value===0){
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 3e0d5b0e3..145a544fb 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -2033,7 +2033,7 @@ class Studentshavecompletedthelist extends Component {
 				page:1,
 			})
 		}
-		this.Searchdatasys(this.state.order, this.state.commit_status, null, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
+		this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, null, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 	}
 	// notlimiteds = () => {
 	//     this.setState({
@@ -2160,7 +2160,7 @@ class Studentshavecompletedthelist extends Component {
 				})
 			}
 
-			this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
+			this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 		} else if (checkedValues.length === data.length) {
 			if (this.state.loadingstate === false) {
 				this.setState({
@@ -2177,7 +2177,7 @@ class Studentshavecompletedthelist extends Component {
 				})
 			}
 
-			this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
+			this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 		} else {
 			// console.log(checkedValues);
 			if (this.state.loadingstate === false) {
@@ -2195,7 +2195,7 @@ class Studentshavecompletedthelist extends Component {
 				})
 			}
 
-			this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
+			this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 
 		}
 	}
@@ -2218,7 +2218,7 @@ class Studentshavecompletedthelist extends Component {
 			})
 		}
 
-		this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, undefined, this.state.searchtext, 1, this.state.limit)
+		this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, undefined, this.state.searchtext, 1, this.state.limit)
 	}
 
 	funtaskstatustwo = (checkedValues, data) => {
@@ -2240,7 +2240,7 @@ class Studentshavecompletedthelist extends Component {
 				})
 			}
 
-			this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
+			this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
 		} else if (checkedValues.length === data.length) {
 			if (this.state.loadingstate === false) {
 				this.setState({
@@ -2257,7 +2257,7 @@ class Studentshavecompletedthelist extends Component {
 				})
 			}
 
-			this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
+			this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
 		} else {
 			// console.log(checkedValues);
 			if (this.state.loadingstate === false) {
@@ -2278,7 +2278,7 @@ class Studentshavecompletedthelist extends Component {
 
 			}
 
-			this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
+			this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
 			this.props.setcourse_groupysls(checkedValues)
 		}
 
@@ -2299,7 +2299,7 @@ class Studentshavecompletedthelist extends Component {
 				})
 			}
 
-			this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
+			this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 		}
 	};
 	//搜索学生按钮输入 老师
@@ -2316,7 +2316,7 @@ class Studentshavecompletedthelist extends Component {
 			})
 		}
 
-		this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, value, 1, this.state.limit);
+		this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, value, 1, this.state.limit);
 		// this.Startsorting(this.state.order,this.state.checkedValuesine,this.state.checkedValuesineinfo,value);
 		// console.log(value)
 
@@ -2353,6 +2353,8 @@ class Studentshavecompletedthelist extends Component {
 
 	//排序
 	funordersy = (e) => {
+		console.log(this.state.course_groupyslstwo);
+		debugger
 		if (e === "end_at") {
 			// 时间
 			// 时间排序是从小到大
@@ -2367,7 +2369,7 @@ class Studentshavecompletedthelist extends Component {
 				})
 			}
 
-			this.Searchdatasys(e, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page,this.state.limit)
+			this.Searchdatasys(e, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page,this.state.limit)
 		}
 
 		if (e === "score") {
@@ -2385,7 +2387,7 @@ class Studentshavecompletedthelist extends Component {
 
 			}
 
-			this.Searchdatasys(e, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null)
+			this.Searchdatasys(e, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null)
 		}
 
 		if (e === "student_id") {
@@ -2402,7 +2404,7 @@ class Studentshavecompletedthelist extends Component {
 				})
 			}
 
-			this.Searchdatasys(e, this.state.commit_status, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null)
+			this.Searchdatasys(e, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null)
 		}
 	}
 	setExerciseReviewAndAnswer = () => {
diff --git a/public/react/src/modules/modals/Certifiedprofessional.js b/public/react/src/modules/modals/Certifiedprofessional.js
index a7c06c31e..c1b78df7f 100644
--- a/public/react/src/modules/modals/Certifiedprofessional.js
+++ b/public/react/src/modules/modals/Certifiedprofessional.js
@@ -1,6 +1,9 @@
 import React, { Component } from 'react';
 import { Modal} from 'antd';
 import axios from 'axios';
+import shimingrenzheng from '../../../src/images/cert/shimingrenzheng.png';
+import zhiyerenzheng from '../../../src/images/cert/zhiyerenzheng.png';
+import './certfed.css';
 //认证职业
 class Certifiedprofessional extends Component {
 
@@ -21,23 +24,23 @@ class Certifiedprofessional extends Component {
 		axios.interceptors.response.use((response) => {
 			if (response != undefined)
 				if (response && response.data.status === -1) {
-            if(response.data.message==="该课堂要求成员完成实名认证"){
-            	this.setState({
-								mydisplay:true,
-								occupation:1,
-							})
+					if(response.data.message==="该课堂要求成员完成实名认证"){
+						this.setState({
+							mydisplay:true,
+							occupation:1,
+						})
 
-						}else  if(response.data.message==="该课堂要求成员完成职业认证"){
-							this.setState({
-								mydisplay:true,
-								occupation:2,
-							})
-						}else if(response.data.message==="该课堂要求成员完成实名和职业认证"){
-							this.setState({
-								mydisplay:true,
-								occupation:3,
-							})
-						}
+					}else  if(response.data.message==="该课堂要求成员完成职业认证"){
+						this.setState({
+							mydisplay:true,
+							occupation:2,
+						})
+					}else if(response.data.message==="该课堂要求成员完成实名和职业认证"){
+						this.setState({
+							mydisplay:true,
+							occupation:3,
+						})
+					}
 				}
 			return response;
 		}, (error) => {
@@ -52,7 +55,7 @@ class Certifiedprofessional extends Component {
 	};
 
 	setDownload=()=>{
-
+		window.location.href="/account/certification"
 
 	}
 
@@ -60,7 +63,8 @@ class Certifiedprofessional extends Component {
 	render() {
 		// console.log("加入金品课堂2");
 		// console.log(this.props);
-		return(
+		let{occupation} =this.state;
+			return(
 			<Modal
 				keyboard={false}
 				closable={false}
@@ -70,12 +74,51 @@ class Certifiedprofessional extends Component {
 				centered={true}
 				visible={this.state.mydisplay}
 				width="600px"
+				heigth="307px"
 			>
 				<div className="educouddiv">
-					<div className={"tabeltext-alignleft"}><p style={{fontSize: "16px",marginTop:"46px"}}>请在完成条件后重试</p></div>
-					<div className="clearfix  edu-txt-center" style={{marginTop:"98px"}}>
-						<a className="task-btn mr30" onClick={()=>this.modalCancel()}>取消</a>
-						<a className="task-btn task-btn-orange" onClick={()=>this.setDownload()}>确认</a>
+					<div className={"tabeltext-alignleft fontsizecoirlysl"}><p style={{fontSize: "16px"}}>请在完成条件后重试</p></div>
+					{
+						occupation=== 3?
+							<div className="yslcentercerlfed  edu-txt-center mt30"  >
+
+								<div className="mr55 imgysldivone">
+									<img className="yslimgwidthte"
+											 src={shimingrenzheng}
+									/>
+									<span className="fontsizecoirlysltwo mt15">未实名认证</span>
+								</div>
+								<div className="imgysldivone">
+									<img className="yslimgwidthte"
+											 src={zhiyerenzheng}
+									/>
+									<span className="fontsizecoirlysltwo mt15">未职业认证</span>
+								</div>
+							</div>
+							:occupation=== 2?
+							<div className="yslcentercerlfed  edu-txt-center mt30"  >
+								<div className="imgysldivone">
+									<img className="yslimgwidthte"
+											 src={zhiyerenzheng}
+									/>
+									<span className="fontsizecoirlysltwo mt15">未职业认证</span>
+								</div>
+							</div>
+							:
+							<div className="yslcentercerlfed  edu-txt-center mt30"  >
+								<div className=" imgysldivone">
+									<img className="yslimgwidthte"
+											 src={shimingrenzheng}
+									/>
+									<span className="fontsizecoirlysltwo mt15">未实名认证</span>
+								</div>
+							</div>
+					}
+
+					<div className="clearfix  edu-txt-center mt28">
+
+						<a className="task-btn mr60 w90" onClick={()=>this.modalCancel()}>取消</a>
+						<a className="task-btn task-btn-orange w90" onClick={()=>this.setDownload()}>立即认证</a>
 					</div>
 				</div>
 			</Modal>
diff --git a/public/react/src/modules/modals/certfed.css b/public/react/src/modules/modals/certfed.css
new file mode 100644
index 000000000..ca3000b50
--- /dev/null
+++ b/public/react/src/modules/modals/certfed.css
@@ -0,0 +1,44 @@
+.yslcenter
+{
+    display: flex;
+    justify-content:center;
+    display: flex;
+    flex-direction:column;
+}
+.yslcentercerlfed
+{    display: flex;
+    justify-content:center;
+    display: flex;
+    flex-direction:row;
+}
+.fontsizecoirlysl{
+    color: #333333;
+    font-size: 16px;
+}
+.fontsizecoirlysltwo{
+    font-size: 14px;
+    color: #979797;
+}
+
+.imgysldivone{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
+.yslimgwidthte{
+    width: 40px;
+    height: 37px;
+}
+.mr55{
+    margin-right: 55px;
+}
+.mt28{
+    margin-top: 28px;
+}
+.w90{
+    width: 90px;
+}
+.mr60{
+    margin-right: 60px;
+}
\ No newline at end of file

From 56d3f3fba73a88d4a5b20969455df0abf6ede1be Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 20 Aug 2019 18:08:36 +0800
Subject: [PATCH 07/11] clearInput()

---
 public/react/src/modules/user/usersInfo/video/VideoUploadList.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/react/src/modules/user/usersInfo/video/VideoUploadList.js b/public/react/src/modules/user/usersInfo/video/VideoUploadList.js
index 8ad7ea9c2..aff9e8496 100644
--- a/public/react/src/modules/user/usersInfo/video/VideoUploadList.js
+++ b/public/react/src/modules/user/usersInfo/video/VideoUploadList.js
@@ -70,6 +70,7 @@ function VideoUploadList (props) {
             && file.name.indexOf('.webm') == -1 
         ) {
             showNotification(`不支持的视频格式`)
+            clearInput()
             return;
         }
         if (file.size > 200 * 1024 * 1024) {

From 251f2a0bfab2794adc28aec06e54fbd7f579e3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 20 Aug 2019 18:09:19 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/coursesPublic/SelectSetting.js    | 344 +++----
 .../courses/coursesPublic/sendResource.js     | 922 +++++++++---------
 2 files changed, 633 insertions(+), 633 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
index 557cec972..b453d0075 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
@@ -7,7 +7,7 @@ import moment from 'moment';
 import Modals from '../../modals/Modals';
 
 const Option = Select.Option;
- 
+
 const dateFormat ="YYYY-MM-DD HH:mm"
 function range(start, end) {
 	const result = [];
@@ -131,7 +131,7 @@ class Selectsetting extends Component{
 
 
 
-	 getalldata=()=>{
+	getalldata=()=>{
 
 	}
 	componentDidUpdate = (prevProps) => {
@@ -139,9 +139,9 @@ class Selectsetting extends Component{
 		if ( prevProps.visible != this.props.visible ) {
 			console.log(prevProps)
 			console.log(this.props)
-     this.setState({
-	     visible:this.props.visible
-     })
+			this.setState({
+				visible:this.props.visible
+			})
 			this.getalldata()
 		}
 
@@ -205,23 +205,23 @@ class Selectsetting extends Component{
 		// 	}
 		// })
 
-   // if(unified_setting===false){
-   //
-	//    course_groups.forEach((item,key)=>{
-	// 	   if(item.course_group_id===undefined){
-	// 		   this.setState({
-	// 			   course_group_idtypes:true
-	// 		   })
-	// 		   return
-	// 	   }
-	//    })
-   //
-   // }
+		// if(unified_setting===false){
+		//
+		//    course_groups.forEach((item,key)=>{
+		// 	   if(item.course_group_id===undefined){
+		// 		   this.setState({
+		// 			   course_group_idtypes:true
+		// 		   })
+		// 		   return
+		// 	   }
+		//    })
+		//
+		// }
 
 
 		let coursesId=this.props.match.params.coursesId;
 		let attachmentId=this.props.attachmentId;
-	  let url="/files/"+this.props.discussMessageid+".json";
+		let url="/files/"+this.props.discussMessageid+".json";
 		//
 		axios.put(url,{
 			course_id:coursesId,
@@ -298,7 +298,7 @@ class Selectsetting extends Component{
 	onAttachmentRemove = (file) => {
 
 		// const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
-	  const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+		const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
 		axios.delete(url, {
 			})
 			.then((response) => {
@@ -368,7 +368,7 @@ class Selectsetting extends Component{
 		newlist.push(  {
 			course_group_id : undefined,
 			publish_time :""
-				// moment(new Date()).format('YYYY-MM-DD HH:mm')
+			// moment(new Date()).format('YYYY-MM-DD HH:mm')
 		})
 		this.setState({
 			course_groups:newlist
@@ -381,7 +381,7 @@ class Selectsetting extends Component{
 			width: 600,
 			// https://github.com/ant-design/ant-design/issues/15505
 			// showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。
-		  // showUploadList: false,
+			// showUploadList: false,
 			action: `${getUrl()}/api/attachments.json`,
 			onChange: this.handleChange,
 			onRemove: this.onAttachmentRemove,
@@ -463,7 +463,7 @@ class Selectsetting extends Component{
 
 
 						<div className="pl20 pr20"
-						     style={{"Height":"204px"}}>
+								 style={{"Height":"204px"}}>
 
 							<style>{`
                    .color-grey-9a{color: #9A9A9A !important;}
@@ -487,7 +487,7 @@ class Selectsetting extends Component{
 									{datalist&&datalist.attachment_histories.length===0?"":<span className={"newcolor-orange fl"}>当前版本</span>}
 								</li>
 								<li className="fl edu-txt-left task-hide paddingl5 "
-								    style={{width: '76px'}}> {datalist&&datalist.downloads_count} </li>
+										style={{width: '76px'}}> {datalist&&datalist.downloads_count} </li>
 								<li className="fl paddingl10 " style={{width: '100px'}}> {datalist&&datalist.quotes} </li>
 								<li className="fl paddingl10 datastyle">
 									{moment(datalist&&datalist.created_on).format('YYYY-MM-DD HH:mm')==="Invalid date"?"":moment(datalist&&datalist.created_on).format('YYYY-MM-DD HH:mm')}
@@ -495,21 +495,21 @@ class Selectsetting extends Component{
 							</div>
 
 							{datalist&&datalist.attachment_histories.map((item,key)=>{
-						     	return(
-							      <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
-								      <li className="fl" style={{width: '241px'}}>
-									      <span className={"isabox"} title={item.title}> {item.title} </span>
-									      {/*<span className={"newcolor-orange fl"}>当前版本</span>*/}
-								      </li>
-								      <li className="fl edu-txt-left task-hide paddingl5 "
-								          style={{width: '76px'}}> {item.downloads_count} </li>
-								      <li className="fl paddingl10 " style={{width: '100px'}}> {item.quotes} </li>
-								      <li className="fl paddingl10 datastyle">
-									      {moment(item.created_on).format('YYYY-MM-DD HH:mm')==="Invalid date"?"":moment(item.created_on).format('YYYY-MM-DD HH:mm')}
-								      </li>
-							      </div>
-									)
-								})}
+								return(
+									<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
+										<li className="fl" style={{width: '241px'}}>
+											<span className={"isabox"} title={item.title}> {item.title} </span>
+											{/*<span className={"newcolor-orange fl"}>当前版本</span>*/}
+										</li>
+										<li className="fl edu-txt-left task-hide paddingl5 "
+												style={{width: '76px'}}> {item.downloads_count} </li>
+										<li className="fl paddingl10 " style={{width: '100px'}}> {item.quotes} </li>
+										<li className="fl paddingl10 datastyle">
+											{moment(item.created_on).format('YYYY-MM-DD HH:mm')==="Invalid date"?"":moment(item.created_on).format('YYYY-MM-DD HH:mm')}
+										</li>
+									</div>
+								)
+							})}
 						</div>
 						<style>{`
                    .popups{
@@ -571,21 +571,21 @@ class Selectsetting extends Component{
 
 							<p className={"winth540"}>
 								{
-								 this.state.fileListtype===true?
-									 <div>
-										 <Tooltip placement="bottom" title={
-											 <pre>
+									this.state.fileListtype===true?
+										<div>
+											<Tooltip placement="bottom" title={
+												<pre>
 												 	 	每次只能上传一个资源，<br/>删除下面资源可重新上传
 											 </pre>
-										 }>
-											 <Button className="uploadBtns">
-												 更新版本
-											 </Button>
-										 </Tooltip>
-
-										 <span>(单个文件最大150M)</span>
-									 </div>
-									 :""
+											}>
+												<Button className="uploadBtns">
+													更新版本
+												</Button>
+											</Tooltip>
+
+											<span>(单个文件最大150M)</span>
+										</div>
+										:""
 								}
 
 								<Upload {...uploadProps} fileList={this.state.fileList} className="upload_1">
@@ -600,121 +600,121 @@ class Selectsetting extends Component{
 
 							</p>
 							{/*<style>*/}
-								{/*{*/}
-									{/*`*/}
-								{/*.maxwidth400{*/}
-										{/*max-width: 400px;*/}
-										{/*overflow: hidden;*/}
-										{/*text-overflow: ellipsis;*/}
-										{/*white-space: nowrap;*/}
-								{/*}*/}
-								{/*`*/}
-								{/*}*/}
+							{/*{*/}
+							{/*`*/}
+							{/*.maxwidth400{*/}
+							{/*max-width: 400px;*/}
+							{/*overflow: hidden;*/}
+							{/*text-overflow: ellipsis;*/}
+							{/*white-space: nowrap;*/}
+							{/*}*/}
+							{/*`*/}
+							{/*}*/}
 							{/*</style>*/}
 							{/*{this.state.fileList.length===0?"":this.state.fileList.map((item,key)=>{*/}
-								{/*return(*/}
-									{/*<p className="color-grey mt10" key={key}  >*/}
-										{/*<a className="color-grey fl">*/}
-											{/*<i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>*/}
-										{/*</a>*/}
-										{/*<span className="mr12 color9B9B maxwidth400 fl" length="58">*/}
-										{/*{item.name}*/}
-									{/*</span>*/}
-										{/*<span className="color656565 mt2 color-grey-6 font-12 mr8">*/}
-										{/*{item.response===undefined?"":isNaN(bytesToSize(item.filesize))?"123":bytesToSize(item.filesize)}*/}
-									{/*</span>*/}
-										{/*<i className="font-14 iconfont  icon-guanbi "*/}
-											 {/*id={item.response===undefined?"":item.response.id}*/}
-											 {/*aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.response===undefined?"":item.response.id&&item.response.id)}></i>*/}
-									{/*</p>*/}
-								{/*)*/}
+							{/*return(*/}
+							{/*<p className="color-grey mt10" key={key}  >*/}
+							{/*<a className="color-grey fl">*/}
+							{/*<i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>*/}
+							{/*</a>*/}
+							{/*<span className="mr12 color9B9B maxwidth400 fl" length="58">*/}
+							{/*{item.name}*/}
+							{/*</span>*/}
+							{/*<span className="color656565 mt2 color-grey-6 font-12 mr8">*/}
+							{/*{item.response===undefined?"":isNaN(bytesToSize(item.filesize))?"123":bytesToSize(item.filesize)}*/}
+							{/*</span>*/}
+							{/*<i className="font-14 iconfont  icon-guanbi "*/}
+							{/*id={item.response===undefined?"":item.response.id}*/}
+							{/*aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.response===undefined?"":item.response.id&&item.response.id)}></i>*/}
+							{/*</p>*/}
+							{/*)*/}
 							{/*})}*/}
 
 							{this.state.newfileListtypes===true?<p className={"color-red"}>请先上传资源</p>:""}
 
-							{/*<p className={"winth540"}>*/}
-								{/*<style>{`*/}
-                {/*.ant-checkbox-wrapper{*/}
-                  {/*margin-left:0px !important;*/}
-                  {/*margin-top:10px;*/}
-                {/*}*/}
-              {/*`}</style>*/}
-
-								{/*<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>:""}*!/*/}
-
-								{/*<style>*/}
-									{/*{`*/}
-								    {/*.Selectleft20{*/}
-									   {/*margin-left: 20px !important;*/}
-									   {/*width: 176px;*/}
-									   {/*height: 40px;  */}
-									{/*}*/}
-						 			 {/*.resourcebox{*/}
-	                   {/*max-height:150px;*/}
-	                   {/*overflow: auto;*/}
-                    {/*}*/}
-								  {/*`}*/}
-								{/*</style>*/}
-
-
-								{/*/!*this.props.has_course_groups&&this.props.has_course_groups===true?:""*!/*/}
-								{/*<div className={"resourcebox"}>*/}
-									{/*{unified_setting===false?*/}
-										{/*this.state.course_groups&&this.state.course_groups.map((item,key)=>{*/}
-											{/*return(*/}
-												{/*<div className={"mt10 "} key={key}>*/}
-
-
-													{/*<Select  placeholder="请选择分班名称"*/}
-													         {/*value={item.course_group_id}*/}
-													         {/*style={{ width: 200 }}*/}
-													         {/*onChange={(e,index)=>this.selectassigngroups(e,index,key)}*/}
-													{/*>*/}
-														{/*{	this.state.course_groupss&&this.state.course_groupss.map((item,key)=>{*/}
-															{/*return(*/}
-																{/*<Option value={item.id} key={key}>{item.name}</Option>*/}
-															{/*)*/}
-														{/*})}*/}
-													{/*</Select>*/}
-
-
-													{/*<DatePicker*/}
-														{/*showToday={false}*/}
-														{/*dropdownClassName="hideDisable"*/}
-														{/*showTime={{ format: 'HH:mm' }}*/}
-														{/*format="YYYY-MM-DD HH:mm"*/}
-														{/*locale={locale}*/}
-														{/*placeholder="请选择发布时间"*/}
-														{/*id={"startimes"}*/}
-														{/*className={"Selectleft20"}*/}
-														{/*width={"200px"}*/}
-														{/*value={item.publish_time===undefined||item.publish_time===""?"":item.publish_time===null?"":moment(item.publish_time, dateFormat)}*/}
-														{/*onChange={(e,index)=>this.onChangeTimepublishs(e,index,key)}*/}
-														{/*// onChange={ this.onChangeTimepublish }*/}
-														{/*disabledTime={disabledDateTime}*/}
-														{/*disabledDate={disabledDate}*/}
-													{/*/>*/}
-
-													{/*{key!=0?<i className="iconfont icon-shanchu color-grey-c font-14 font-n ml20" onClick={()=>this.deletegrouppublish(key)}></i>:""}*/}
-													{/*{key===course_groups.length-1?<i className="iconfont icon-tianjiafangda color-green ml15" onClick={this.addgrouppublish}></i>:""}*/}
-												{/*</div>*/}
-											{/*)*/}
-										{/*}):""}*/}
-								{/*</div>*/}
+							<p className={"winth540"}>
+								<style>{`
+                .ant-checkbox-wrapper{
+                  margin-left:0px !important;
+                  margin-top:10px;
+                }
+              `}</style>
 
-							{/*</p>*/}
+								<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>:""}*/}
+
+								<style>
+									{`
+								    .Selectleft20{
+									   margin-left: 20px !important;
+									   width: 176px;
+									   height: 40px;
+									}
+						 			 .resourcebox{
+	                   max-height:150px;
+	                   overflow: auto;
+                    }
+								  `}
+								</style>
+
+
+								{/*this.props.has_course_groups&&this.props.has_course_groups===true?:""*/}
+								<div className={"resourcebox"}>
+									{unified_setting===false?
+										this.state.course_groups&&this.state.course_groups.map((item,key)=>{
+											return(
+												<div className={"mt10 "} key={key}>
+
+
+													<Select  placeholder="请选择分班名称"
+																	 value={item.course_group_id}
+																	 style={{ width: 200 }}
+																	 onChange={(e,index)=>this.selectassigngroups(e,index,key)}
+													>
+														{	this.state.course_groupss&&this.state.course_groupss.map((item,key)=>{
+															return(
+																<Option value={item.id} key={key}>{item.name}</Option>
+															)
+														})}
+													</Select>
+
+
+													<DatePicker
+														showToday={false}
+														dropdownClassName="hideDisable"
+														showTime={{ format: 'HH:mm' }}
+														format="YYYY-MM-DD HH:mm"
+														locale={locale}
+														placeholder="请选择发布时间"
+														id={"startimes"}
+														className={"Selectleft20"}
+														width={"200px"}
+														value={item.publish_time===undefined||item.publish_time===""?"":item.publish_time===null?"":moment(item.publish_time, dateFormat)}
+														onChange={(e,index)=>this.onChangeTimepublishs(e,index,key)}
+														// onChange={ this.onChangeTimepublish }
+														disabledTime={disabledDateTime}
+														disabledDate={disabledDate}
+													/>
+
+													{key!=0?<i className="iconfont icon-shanchu color-grey-c font-14 font-n ml20" onClick={()=>this.deletegrouppublish(key)}></i>:""}
+													{key===course_groups.length-1?<i className="iconfont icon-tianjiafangda color-green ml15" onClick={this.addgrouppublish}></i>:""}
+												</div>
+											)
+										}):""}
+								</div>
+
+							</p>
 							<style>
 								{`
 							  #startime .ant-calendar-picker-icon{
@@ -723,22 +723,22 @@ class Selectsetting extends Component{
 						  `}
 							</style>
 							{unified_setting===true?
-								<p className={this.state.fileListtype===true?"mt30":""}>
+								<p className={"mt10"}>
 			              <span>
 			                 <DatePicker
-								 showToday={false}
-				                 dropdownClassName="hideDisable"
-				                 showTime={{ format: 'HH:mm' }}
-				                 format="YYYY-MM-DD HH:mm"
-				                 locale={locale}
-				                 placeholder="请选择发布时间"
-				                 id={"startime"}
-				                 width={"210px"}
-				                 value={datatime===undefined||datatime===""?"":moment(datatime, dateFormat)}
-				                 onChange={this.onChangeTimepublish}
-				                 disabledTime={disabledDateTime}
+												 showToday={false}
+												 dropdownClassName="hideDisable"
+												 showTime={{ format: 'HH:mm' }}
+												 format="YYYY-MM-DD HH:mm"
+												 locale={locale}
+												 placeholder="请选择发布时间"
+												 id={"startime"}
+												 width={"210px"}
+												 value={datatime===undefined||datatime===""?"":moment(datatime, dateFormat)}
+												 onChange={this.onChangeTimepublish}
+												 disabledTime={disabledDateTime}
 												 disabledDate={disabledDate}
-			                 />
+											 />
 			              </span>
 								</p>:""}
 							{/*{this.state.course_group_idtypes===true?<p className={"color-red"}>请选择分班</p>:""}*/}
diff --git a/public/react/src/modules/courses/coursesPublic/sendResource.js b/public/react/src/modules/courses/coursesPublic/sendResource.js
index 20f22b119..576c9b514 100644
--- a/public/react/src/modules/courses/coursesPublic/sendResource.js
+++ b/public/react/src/modules/courses/coursesPublic/sendResource.js
@@ -8,18 +8,18 @@ import moment from 'moment';
 const CheckboxGroup = Checkbox.Group;
 const Option = Select.Option;
 function range(start, end) {
-  const result = [];
-  for (let i = start; i < end; i++) {
-    result.push(i);
-  }
-  return result;
+	const result = [];
+	for (let i = start; i < end; i++) {
+		result.push(i);
+	}
+	return result;
 }
 function disabledDateTime() {
-  return {
-    // disabledHours: () => range(0, 24).splice(4, 20),
-    disabledMinutes: () => range(1, 30).concat(range(31, 60)),
-    // disabledSeconds: () => [0, 60],
-  };
+	return {
+		// disabledHours: () => range(0, 24).splice(4, 20),
+		disabledMinutes: () => range(1, 30).concat(range(31, 60)),
+		// disabledSeconds: () => [0, 60],
+	};
 }
 
 function disabledDate(current) {
@@ -29,63 +29,63 @@ function disabledDate(current) {
 
 const dateFormat="YYYY-MM-DD HH:mm";
 class Sendresource extends Component{
-  constructor(props){
-    super(props);
-    this.state={
-      group_ids:[],
-      fileList:[],
-      Modalstype:false,
-      Modalstopval:"",
-      ModalCancel:"",
-      ModalSave:"",
+	constructor(props){
+		super(props);
+		this.state={
+			group_ids:[],
+			fileList:[],
+			Modalstype:false,
+			Modalstopval:"",
+			ModalCancel:"",
+			ModalSave:"",
 			fileListtype:false,
-      loadtype:false,
-      is_unified_setting:true,
-      is_public:false,
-      datatime:undefined,
-          // moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
-      course_group_publish_times:[
-        {
-          course_group_id : undefined,
-          publish_time :""
-        }],
-      course_groups:undefined,
-      course_groups_count:undefined
-     }
-  }
-
-
-  componentDidMount() {
-
-    let coursesId=this.props.match.params.coursesId;
-    if(this.props.isAdmin()){
-      let url = `/courses/${coursesId}/all_course_groups.json`
-
-      axios.get(url, {
-        })
-        .then((response) => {
-          this.setState({
-            course_groups: response.data.course_groups,
-            course_groups_count:response.data.course_groups_count
-          })
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
-    }
-
-  }
-
-  //勾选实训
-  shixunhomeworkedit=(list)=>{
-
-    this.setState({
-      group_ids:list
-    })
-
-  }
-  // 附件相关 START
-  handleChange = (info) => {
+			loadtype:false,
+			is_unified_setting:true,
+			is_public:false,
+			datatime:undefined,
+			// moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
+			course_group_publish_times:[
+				{
+					course_group_id : undefined,
+					publish_time :""
+				}],
+			course_groups:undefined,
+			course_groups_count:undefined
+		}
+	}
+
+
+	componentDidMount() {
+
+		let coursesId=this.props.match.params.coursesId;
+		if(this.props.isAdmin()){
+			let url = `/courses/${coursesId}/all_course_groups.json`
+
+			axios.get(url, {
+				})
+				.then((response) => {
+					this.setState({
+						course_groups: response.data.course_groups,
+						course_groups_count:response.data.course_groups_count
+					})
+				})
+				.catch(function (error) {
+					console.log(error);
+				});
+		}
+
+	}
+
+	//勾选实训
+	shixunhomeworkedit=(list)=>{
+
+		this.setState({
+			group_ids:list
+		})
+
+	}
+	// 附件相关 START
+	handleChange = (info) => {
 
 		let fileList = info.fileList;
 		if(info.file.status!="removed"){
@@ -98,280 +98,280 @@ class Sendresource extends Component{
 				fileList: appendFileSizeToUploadFileAll(fileList),
 			});
 		}
-  }
+	}
 
-  // onAttachmentRemove = (file) => {
-  //
+	// onAttachmentRemove = (file) => {
+	//
 	// 	this.setState({
 	// 		fileListtype:false,
 	// 	})
-  //   // confirm({
-  //   //   title: '确定要删除这个附件吗?',
-  //   //   okText: '确定',
-  //   //   cancelText: '取消',
-  //   //   // content: 'Some descriptions',
-  //   //   onOk: () => {
-  //   //     this.deleteAttachment(file)
-  //   //   },
-  //   //   onCancel() {
-  //   //     console.log('Cancel');
-  //   //   },
-  //   // });
-  //   // return false;
+	//   // confirm({
+	//   //   title: '确定要删除这个附件吗?',
+	//   //   okText: '确定',
+	//   //   cancelText: '取消',
+	//   //   // content: 'Some descriptions',
+	//   //   onOk: () => {
+	//   //     this.deleteAttachment(file)
+	//   //   },
+	//   //   onCancel() {
+	//   //     console.log('Cancel');
+	//   //   },
+	//   // });
+	//   // return false;
 	//
-  //   // this.setState({
-  //   //   Modalstype:true,
-  //   //   Modalstopval:'确定要删除这个附件吗?',
-  //   //   ModalSave: ()=>this.deleteAttachment(file),
-  //   //   ModalCancel:this.cancelAttachment
-  //   // })
-  //   // return false;
+	//   // this.setState({
+	//   //   Modalstype:true,
+	//   //   Modalstopval:'确定要删除这个附件吗?',
+	//   //   ModalSave: ()=>this.deleteAttachment(file),
+	//   //   ModalCancel:this.cancelAttachment
+	//   // })
+	//   // return false;
 	//
-  //   this.deleteAttachment(file);
-  // }
+	//   this.deleteAttachment(file);
+	// }
 
 
 	onAttachmentRemove = (file) => {
 
-    const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
-    axios.delete(url, {
-      })
-      .then((response) => {
-        if (response.data) {
-          const { status } = response.data;
-          if (status == 0) {
+		const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+		axios.delete(url, {
+			})
+			.then((response) => {
+				if (response.data) {
+					const { status } = response.data;
+					if (status == 0) {
 						this.setState({
 							fileListtype:false,
 							fileList:[]
 						})
-          }
+					}
 
-        }
-      })
-      .catch(function (error) {
-        console.log(error);
-      });
+				}
+			})
+			.catch(function (error) {
+				console.log(error);
+			});
+		this.setState({
+			fileListtype:false,
+		})
+	}
+
+	ModalCancelModalCancel=()=>{
+		this.setState({
+			Modalstype:false,
+			Modalstopval:"",
+			ModalSave:this.ModalCancelModalCancel,
+			loadtype:false
+		})
+		this.props.Cancel()
+	}
+	Saves=()=>{
+
+		let id=this.props.categoryid;
+		let {fileList,description,is_public,is_unified_setting,datatime,course_group_publish_times} =this.state;
+
+		let newfileList=[];
+		for(var list of fileList){
+			newfileList.push(list.response.id)
+		}
+
+		if(newfileList.length===0){
 			this.setState({
-				fileListtype:false,
+				newfileListtype:true
 			})
-  }
-
-  ModalCancelModalCancel=()=>{
-    this.setState({
-      Modalstype:false,
-      Modalstopval:"",
-      ModalSave:this.ModalCancelModalCancel,
-      loadtype:false
-    })
-    this.props.Cancel()
-  }
-  Saves=()=>{
-
-    let id=this.props.categoryid;
-    let {fileList,description,is_public,is_unified_setting,datatime,course_group_publish_times} =this.state;
-
-    let newfileList=[];
-    for(var list of fileList){
-      newfileList.push(list.response.id)
-    }
-
-    if(newfileList.length===0){
-      this.setState({
-        newfileListtype:true
-      })
-      return
-    }
-    // if(is_unified_setting===false){
-    //   course_group_publish_times.forEach((item,key)=>{
-    //     if(item.course_group_id===undefined||item.publish_time===undefined){
-    //       this.setState({
-    //         course_group_publish_timestype:true
-    //       })
-    //       return
-    //     }
-    //   })
-    //
-    // }
-
-
-
-    if(description===undefined){
-
-    }else if(description.length>100){
-
-      this.setState({
-        descriptiontype:true
-      })
-      return
-    }
-
-    let coursesId=this.props.match.params.coursesId;
-    let attachmentId=this.props.attachmentId;
-    let url="/files/upload.json";
-
-
-    axios.post(url,{
-      course_id:coursesId,
-      course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
-      attachment_ids:newfileList,
-      is_public:is_public,
-      is_unified_setting:is_unified_setting,
-      publish_time:is_unified_setting===true?datatime===undefined? moment(new Date()).format('YYYY-MM-DD HH:mm'):datatime:undefined,
-      description:description,
-      course_group_publish_times:is_unified_setting===false?course_group_publish_times:undefined
-    }).then((result)=>{
-
-      if(result.data.status===0){
-        // this.setState({
-        //   Modalstype:true,
-        //   Modalstopval:result.data.message,
-        //   ModalSave:this.ModalCancelModalCancel,
-        //   loadtype:true
-        // })
-        this.ModalCancelModalCancel();
-        this.props.updataleftNavfun();
-        // this.props.showNotification(result.data.message);
-        this.props.showNotification("上传资源成功");
-        this.props.setupdate(this.props.attachmentId)
-      }
-    })
-
-
-
-  }
-
-  settextarea=(e)=>{
-    this.setState({
-      description:e.target.value
-    })
-  }
-
-  onChangesetting=(e)=>{
-
-    this.setState({
-      is_unified_setting:e.target.checked
-    })
-
-  }
-
-  onChangepublic=(e)=>{
-
-    this.setState({
-      is_public:e.target.checked
-    })
-
-  }
-
-  onChangeTimepublish= (date, dateString,key,type) => {
-    if(type===1){
-      this.setState({
-        datatime:handleDateString(dateString),
-      })
-    }else if(type===2){
-      let {course_group_publish_times}=this.state;
-      let newgroup_publish=course_group_publish_times;
-      for(var i=0; i<newgroup_publish.length; i++){
-        if(i===parseInt(key)){
-          newgroup_publish[i].publish_time=handleDateString(dateString);
-        }
-      }
-      this.setState({
-        course_group_publish_times:newgroup_publish,
-      })
-    }
-
-  }
-
-  selectassigngroups=(e,index,key)=>{
-    let {course_group_publish_times}=this.state;
-    let newgroup_publish=course_group_publish_times;
-    for(var i=0; i<newgroup_publish.length; i++){
-      if(i===parseInt(key)){
-        newgroup_publish[i].course_group_id=index.props.value;
-      }
-    }
-    this.setState({
-      course_group_publish_times:newgroup_publish,
-    })
-  }
-
-  deletegrouppublish=(key)=>{
-    let newlist=this.state.course_group_publish_times;
-    newlist.splice(key,1);
-    this.setState({
-      course_group_publish_times:newlist
-    })
-  }
-
-  addgrouppublish=()=>{
-    let newlist=this.state.course_group_publish_times;
-    newlist.push(  {
-      course_group_id : undefined,
-      publish_time :undefined
-    })
-   this.setState({
-     course_group_publish_times:newlist
-   })
-  }
-
-  render(){
-    let {settextarea,newfileListtype,descriptiontype,
-      course_group_publish_timestype,
-      Modalstopval,
-      ModalCancel,
-      ModalSave,
-      loadtype,
-      is_unified_setting,
-      is_public,
-      datatime,
-      course_group_publish_times,
-      course_groups
-    }=this.state;
-
-    const uploadProps = {
-      width: 600,
-      // showUploadList:false,
-      action: `${getUrl()}/api/attachments.json`,
-      onChange: this.handleChange,
-      onRemove: this.onAttachmentRemove,
-      beforeUpload: (file) => {
-        // console.log('beforeUpload', file.name);
-        const isLt150M = file.size / 1024 / 1024 < 150;
-        if (!isLt150M) {
-          message.error('文件大小必须小于150MB!');
-        }
-        return isLt150M;
-      },
-    };
-
-    return(
-      <div>
-        {/*提示*/}
-        <Modals
-          modalsType={this.state.Modalstype}
-          modalsTopval={this.state.Modalstopval}
-          modalCancel={this.state.ModalCancel}
-          modalSave={this.state.ModalSave}
-          loadtype= {this.state.loadtype}
-
-        />
-
-        <Modal
-          keyboard={false}
-          className={"HomeworkModal"}
-          title={this.props.modalname}
-          visible={this.props.visible}
-          closable={false}
-          footer={null}
-          destroyOnClose={true}
-        >
-          <div className="task-popup-content">
-            <p className="task-popup-text-center font-16">
-
-              <span className={"color-blue underline"}> </span>
-            </p>
-
-            <style>{`
+			return
+		}
+		// if(is_unified_setting===false){
+		//   course_group_publish_times.forEach((item,key)=>{
+		//     if(item.course_group_id===undefined||item.publish_time===undefined){
+		//       this.setState({
+		//         course_group_publish_timestype:true
+		//       })
+		//       return
+		//     }
+		//   })
+		//
+		// }
+
+
+
+		if(description===undefined){
+
+		}else if(description.length>100){
+
+			this.setState({
+				descriptiontype:true
+			})
+			return
+		}
+
+		let coursesId=this.props.match.params.coursesId;
+		let attachmentId=this.props.attachmentId;
+		let url="/files/upload.json";
+
+
+		axios.post(url,{
+			course_id:coursesId,
+			course_second_category_id:this.props.coursesidtype===undefined||this.props.coursesidtype==="node"?0:attachmentId,
+			attachment_ids:newfileList,
+			is_public:is_public,
+			is_unified_setting:is_unified_setting,
+			publish_time:is_unified_setting===true?datatime===undefined? moment(new Date()).format('YYYY-MM-DD HH:mm'):datatime:undefined,
+			description:description,
+			course_group_publish_times:is_unified_setting===false?course_group_publish_times:undefined
+		}).then((result)=>{
+
+			if(result.data.status===0){
+				// this.setState({
+				//   Modalstype:true,
+				//   Modalstopval:result.data.message,
+				//   ModalSave:this.ModalCancelModalCancel,
+				//   loadtype:true
+				// })
+				this.ModalCancelModalCancel();
+				this.props.updataleftNavfun();
+				// this.props.showNotification(result.data.message);
+				this.props.showNotification("上传资源成功");
+				this.props.setupdate(this.props.attachmentId)
+			}
+		})
+
+
+
+	}
+
+	settextarea=(e)=>{
+		this.setState({
+			description:e.target.value
+		})
+	}
+
+	onChangesetting=(e)=>{
+
+		this.setState({
+			is_unified_setting:e.target.checked
+		})
+
+	}
+
+	onChangepublic=(e)=>{
+
+		this.setState({
+			is_public:e.target.checked
+		})
+
+	}
+
+	onChangeTimepublish= (date, dateString,key,type) => {
+		if(type===1){
+			this.setState({
+				datatime:handleDateString(dateString),
+			})
+		}else if(type===2){
+			let {course_group_publish_times}=this.state;
+			let newgroup_publish=course_group_publish_times;
+			for(var i=0; i<newgroup_publish.length; i++){
+				if(i===parseInt(key)){
+					newgroup_publish[i].publish_time=handleDateString(dateString);
+				}
+			}
+			this.setState({
+				course_group_publish_times:newgroup_publish,
+			})
+		}
+
+	}
+
+	selectassigngroups=(e,index,key)=>{
+		let {course_group_publish_times}=this.state;
+		let newgroup_publish=course_group_publish_times;
+		for(var i=0; i<newgroup_publish.length; i++){
+			if(i===parseInt(key)){
+				newgroup_publish[i].course_group_id=index.props.value;
+			}
+		}
+		this.setState({
+			course_group_publish_times:newgroup_publish,
+		})
+	}
+
+	deletegrouppublish=(key)=>{
+		let newlist=this.state.course_group_publish_times;
+		newlist.splice(key,1);
+		this.setState({
+			course_group_publish_times:newlist
+		})
+	}
+
+	addgrouppublish=()=>{
+		let newlist=this.state.course_group_publish_times;
+		newlist.push(  {
+			course_group_id : undefined,
+			publish_time :undefined
+		})
+		this.setState({
+			course_group_publish_times:newlist
+		})
+	}
+
+	render(){
+		let {settextarea,newfileListtype,descriptiontype,
+			course_group_publish_timestype,
+			Modalstopval,
+			ModalCancel,
+			ModalSave,
+			loadtype,
+			is_unified_setting,
+			is_public,
+			datatime,
+			course_group_publish_times,
+			course_groups
+		}=this.state;
+
+		const uploadProps = {
+			width: 600,
+			// showUploadList:false,
+			action: `${getUrl()}/api/attachments.json`,
+			onChange: this.handleChange,
+			onRemove: this.onAttachmentRemove,
+			beforeUpload: (file) => {
+				// console.log('beforeUpload', file.name);
+				const isLt150M = file.size / 1024 / 1024 < 150;
+				if (!isLt150M) {
+					message.error('文件大小必须小于150MB!');
+				}
+				return isLt150M;
+			},
+		};
+
+		return(
+			<div>
+				{/*提示*/}
+				<Modals
+					modalsType={this.state.Modalstype}
+					modalsTopval={this.state.Modalstopval}
+					modalCancel={this.state.ModalCancel}
+					modalSave={this.state.ModalSave}
+					loadtype= {this.state.loadtype}
+
+				/>
+
+				<Modal
+					keyboard={false}
+					className={"HomeworkModal"}
+					title={this.props.modalname}
+					visible={this.props.visible}
+					closable={false}
+					footer={null}
+					destroyOnClose={true}
+				>
+					<div className="task-popup-content">
+						<p className="task-popup-text-center font-16">
+
+							<span className={"color-blue underline"}> </span>
+						</p>
+
+						<style>{`
                 .uploadBtn.ant-btn {
                   border: none;
                   color: #4CACFF;
@@ -404,7 +404,7 @@ class Sendresource extends Component{
                  margin-top:31px;
                 }
 						`}</style>}
-            <p className={"winth540"}>
+						<p className={"winth540"}>
 
 
 							{
@@ -433,152 +433,152 @@ class Sendresource extends Component{
 											<span className={"ml10"}>(单个文件最大150M)</span>
 									</span>:""}
 							</Upload>
-            </p>
+						</p>
 
 						{/*<style>*/}
-							{/*{*/}
-								{/*`*/}
-								{/*.maxwidth400{*/}
-										{/*max-width: 400px;*/}
-										{/*overflow: hidden;*/}
-										{/*text-overflow: ellipsis;*/}
-										{/*white-space: nowrap;*/}
-								{/*}*/}
-								{/*`*/}
-							{/*}*/}
+						{/*{*/}
+						{/*`*/}
+						{/*.maxwidth400{*/}
+						{/*max-width: 400px;*/}
+						{/*overflow: hidden;*/}
+						{/*text-overflow: ellipsis;*/}
+						{/*white-space: nowrap;*/}
+						{/*}*/}
+						{/*`*/}
+						{/*}*/}
 						{/*</style>*/}
 						{/*{this.state.fileList.length===0?"":this.state.fileList.map((item,key)=>{*/}
-							{/*debugger*/}
-							{/*return(*/}
-								{/*<p className="color-grey mt10" key={key}  >*/}
-									{/*<a className="color-grey fl">*/}
-										{/*<i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>*/}
-									{/*</a>*/}
-									{/*<span className="mr12 color9B9B maxwidth400 fl" length="58">*/}
-										{/*{item.name}*/}
-									{/*</span>*/}
-									{/*<span className="color656565 mt2 color-grey-6 font-12 mr8">*/}
-										{/*{item.response===undefined?"":isNaN(bytesToSize(item.filesize))?"":bytesToSize(item.filesize)}*/}
-									{/*</span>*/}
-									{/*<i className="font-14 iconfont  icon-guanbi "*/}
-										 {/*id={item.response===undefined?"":item.response.id}*/}
-										 {/*aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.response===undefined?"":item.response.id&&item.response.id)}></i>*/}
-								{/*</p>*/}
-							{/*)*/}
+						{/*debugger*/}
+						{/*return(*/}
+						{/*<p className="color-grey mt10" key={key}  >*/}
+						{/*<a className="color-grey fl">*/}
+						{/*<i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>*/}
+						{/*</a>*/}
+						{/*<span className="mr12 color9B9B maxwidth400 fl" length="58">*/}
+						{/*{item.name}*/}
+						{/*</span>*/}
+						{/*<span className="color656565 mt2 color-grey-6 font-12 mr8">*/}
+						{/*{item.response===undefined?"":isNaN(bytesToSize(item.filesize))?"":bytesToSize(item.filesize)}*/}
+						{/*</span>*/}
+						{/*<i className="font-14 iconfont  icon-guanbi "*/}
+						{/*id={item.response===undefined?"":item.response.id}*/}
+						{/*aria-hidden="true" onClick={()=>this.onAttachmentRemove(item.response===undefined?"":item.response.id&&item.response.id)}></i>*/}
+						{/*</p>*/}
+						{/*)*/}
 						{/*})}*/}
 
-            {newfileListtype===true&&this.state.fileListtype===false?<p className={"color-red"}>请先上传资源</p>:""}
-
-            {/*<p className={"winth540"}>*/}
-              {/*<style>{`*/}
-                {/*.ant-checkbox-wrapper{*/}
-                  {/*margin-left:0px !important;*/}
-                  {/*margin-top:10px;*/}
-                {/*}*/}
-              {/*`}</style>*/}
-
-              {/*<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>:""}*!/*/}
-              {/*<style>{`*/}
-                {/*.Selectleft20{*/}
-                   {/*margin-left: 20px !important;*/}
-                   {/*width: 176px;*/}
-                   {/*height: 40px;  */}
-                {/*}*/}
-               {/*#startimes .ant-calendar-picker-icon{*/}
-                  {/*margin-top:-11px;*/}
-                {/*}*/}
-                {/*.resourcebox{*/}
-                   {/*max-height:150px;*/}
-                    {/*overflow: auto;*/}
-                {/*}*/}
-              {/*`}</style>*/}
-              {/*<div className={"resourcebox"}>*/}
-              {/*{is_unified_setting===false?*/}
-                {/*course_group_publish_times.map((item,key)=>{*/}
-                  {/*return(*/}
-                    {/*<div className={"mt10"} key={key}>*/}
-
-                      {/*<Select  placeholder="请选择分班名称"*/}
-                               {/*value={item.course_group_id}*/}
-                               {/*style={{ width: 200 }}*/}
-                               {/*onChange={(e,index)=>this.selectassigngroups(e,index,key)}*/}
-                      {/*>*/}
-                        {/*{course_groups&&course_groups.map((item,key)=>{*/}
-                          {/*return(*/}
-                            {/*<Option value={item.id} key={key}>{item.name}</Option>*/}
-                          {/*)*/}
-                        {/*})}*/}
-                      {/*</Select>*/}
-
-                      {/*<DatePicker*/}
-                        {/*dropdownClassName="hideDisable"*/}
-                        {/*showTime={{ format: 'HH:mm' }}*/}
-                        {/*locale={locale}*/}
-                        {/*showToday={false}*/}
-                        {/*format={dateFormat}*/}
-                        {/*placeholder="请选择发布时间"*/}
-                        {/*id={"startimes"}*/}
-                        {/*className={"Selectleft20  "}*/}
-                        {/*width={"200px"}*/}
-                        {/*value={item.publish_time===undefined||item.publish_time===""?undefined:moment(item.publish_time, dateFormat)}*/}
-                        {/*onChange={(e,index)=>this.onChangeTimepublish(e,index,key,2)}*/}
-                        {/*// onChange={ this.onChangeTimepublish }*/}
-                        {/*disabledTime={disabledDateTime}*/}
-												{/*disabledDate={disabledDate}*/}
-                      {/*/>*/}
-                      {/*{key!=0?<i className="iconfont icon-shanchu color-grey-c font-14 font-n ml20" onClick={()=>this.deletegrouppublish(key)}></i>:""}*/}
-                      {/*{key===course_group_publish_times.length-1&&key<this.state.course_groups_count-1?<i className="iconfont icon-tianjiafangda color-green ml15" onClick={this.addgrouppublish}></i>:""}*/}
-                    {/*</div>*/}
-                  {/*)*/}
-                {/*})*/}
-
-                {/*:""}*/}
-              {/*</div>*/}
-
-            {/*</p>*/}
-
-            {is_unified_setting===true?<p className={this.state.fileListtype===true?"mt30":"mt10"}>
+						{newfileListtype===true&&this.state.fileListtype===false?<p className={"color-red"}>请先上传资源</p>:""}
+
+						<p className={"winth540"}>
+							<style>{`
+                .ant-checkbox-wrapper{
+                  margin-left:0px !important;
+                  margin-top:10px;
+                }
+              `}</style>
+
+							<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>:""}*/}
+							<style>{`
+                .Selectleft20{
+                   margin-left: 20px !important;
+                   width: 176px;
+                   height: 40px;
+                }
+               #startimes .ant-calendar-picker-icon{
+                  margin-top:-11px;
+                }
+                .resourcebox{
+                   max-height:150px;
+                    overflow: auto;
+                }
+              `}</style>
+							<div className={"resourcebox"}>
+								{is_unified_setting===false?
+									course_group_publish_times.map((item,key)=>{
+										return(
+											<div className={"mt10"} key={key}>
+
+												<Select  placeholder="请选择分班名称"
+																 value={item.course_group_id}
+																 style={{ width: 200 }}
+																 onChange={(e,index)=>this.selectassigngroups(e,index,key)}
+												>
+													{course_groups&&course_groups.map((item,key)=>{
+														return(
+															<Option value={item.id} key={key}>{item.name}</Option>
+														)
+													})}
+												</Select>
+
+												<DatePicker
+													dropdownClassName="hideDisable"
+													showTime={{ format: 'HH:mm' }}
+													locale={locale}
+													showToday={false}
+													format={dateFormat}
+													placeholder="请选择发布时间"
+													id={"startimes"}
+													className={"Selectleft20  "}
+													width={"200px"}
+													value={item.publish_time===undefined||item.publish_time===""?undefined:moment(item.publish_time, dateFormat)}
+													onChange={(e,index)=>this.onChangeTimepublish(e,index,key,2)}
+													// onChange={ this.onChangeTimepublish }
+													disabledTime={disabledDateTime}
+													disabledDate={disabledDate}
+												/>
+												{key!=0?<i className="iconfont icon-shanchu color-grey-c font-14 font-n ml20" onClick={()=>this.deletegrouppublish(key)}></i>:""}
+												{key===course_group_publish_times.length-1&&key<this.state.course_groups_count-1?<i className="iconfont icon-tianjiafangda color-green ml15" onClick={this.addgrouppublish}></i>:""}
+											</div>
+										)
+									})
+
+									:""}
+							</div>
+
+						</p>
+
+						{is_unified_setting===true?<p className={"mt10"}>
               <span>
                  <DatePicker
-                   dropdownClassName="hideDisable"
-                   showTime={{ format: 'HH:mm' }}
-                   locale={locale}
-                   format={dateFormat}
-                   placeholder="请选择发布时间"
-                   id={"startime"}
-                   showToday={false}
-                   width={"210px"}
-                   value={datatime===undefined||datatime===""?undefined:moment(datatime, dateFormat)}
-                   onChange={(e,index)=>this.onChangeTimepublish(e,index,undefined,1)}
-                   disabledTime={disabledDateTime}
+									 dropdownClassName="hideDisable"
+									 showTime={{ format: 'HH:mm' }}
+									 locale={locale}
+									 format={dateFormat}
+									 placeholder="请选择发布时间"
+									 id={"startime"}
+									 showToday={false}
+									 width={"210px"}
+									 value={datatime===undefined||datatime===""?undefined:moment(datatime, dateFormat)}
+									 onChange={(e,index)=>this.onChangeTimepublish(e,index,undefined,1)}
+									 disabledTime={disabledDateTime}
 									 disabledDate={disabledDate}
-                 />
+								 />
               </span>
-            </p>:""}
-
-            {/*{course_group_publish_timestype===true?<p className={"color-red mt10"}>请填写完整</p>:""}*/}
-            <textarea  placeholder="请在此输入资源描述，最大限制100个字符" className={"mt10"} value={this.state.description} onInput={this.settextarea} style={{
-              width: '100%',
-              height:'120px',
-              border:'1px solid rgba(234,234,234,1)',
-              padding: '10px'
-            }}></textarea>
-            {descriptiontype===true?<p className={"color-red"}>请输入资源描述，最大限制100个字符</p>:""}
-            <div className="clearfix mt30 edu-txt-center mb10">
-              <a  className="task-btn color-white mr70" onClick={this.props.Cancel}>{this.props.Cancelname}</a>
-              <a className="task-btn task-btn-orange" onClick={()=>this.Saves()}>{this.props.Savesname}</a>
-            </div>
-
-          </div>
-        </Modal>
-      </div>
-    )
-  }
+						</p>:""}
+
+						{/*{course_group_publish_timestype===true?<p className={"color-red mt10"}>请填写完整</p>:""}*/}
+						<textarea  placeholder="请在此输入资源描述，最大限制100个字符" className={"mt10"} value={this.state.description} onInput={this.settextarea} style={{
+							width: '100%',
+							height:'120px',
+							border:'1px solid rgba(234,234,234,1)',
+							padding: '10px'
+						}}></textarea>
+						{descriptiontype===true?<p className={"color-red"}>请输入资源描述，最大限制100个字符</p>:""}
+						<div className="clearfix mt30 edu-txt-center mb10">
+							<a  className="task-btn color-white mr70" onClick={this.props.Cancel}>{this.props.Cancelname}</a>
+							<a className="task-btn task-btn-orange" onClick={()=>this.Saves()}>{this.props.Savesname}</a>
+						</div>
+
+					</div>
+				</Modal>
+			</div>
+		)
+	}
 }
 export default Sendresource;
\ No newline at end of file

From b335b20c483ca65932a1bc5b2ff1186377ec2856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 20 Aug 2019 18:19:07 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index af3e228cd..1a6c38639 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) {
   // $('head').append($('<link rel="stylesheet" type="text/css" />')
   //     .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?8`));
+      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?9`));
 
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?8`));
+      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?9`));
 
   // index.html有加载
 	$('head').append($('<link rel="stylesheet" type="text/css" />')
-		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?8`));
+		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?9`));
 
 
   // $('head').append($('<link rel="stylesheet" type="text/css" />')

From 011cca981d6e9de2ec1d86d7aabe9f5bade5acd3 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 20 Aug 2019 18:33:29 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E5=8A=A0=E4=BA=86cdn=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=99=E4=B8=AA=E6=96=87=E4=BB=B6=E9=87=8C=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E6=96=87=E4=BB=B6=E5=8A=A0=E8=BD=BD=E4=BC=9A=E6=9C=89?=
 =?UTF-8?q?=E8=B7=A8=E5=9F=9F=E7=9A=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/scripts/build.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/react/scripts/build.js b/public/react/scripts/build.js
index c18479299..b9bb9a702 100644
--- a/public/react/scripts/build.js
+++ b/public/react/scripts/build.js
@@ -198,7 +198,8 @@ function generateNewIndexJsp() {
     var result = data.replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`)
         // .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)
 
-        .replace('/css/css_min_all.css', `${cdnHost}/react/build/css/css_min_all.css?v=${newVersion}`)
+        // ${cdnHost}  加了cdn后，这个文件里的字体文件加载会有跨域的报错   ../fonts/fontawesome-webfont.eot
+        .replace('/css/css_min_all.css', `/react/build/css/css_min_all.css?v=${newVersion}`)
 			  .replace('/css/iconfont.css', `${cdnHost}/react/build/css/iconfont.css?v=${newVersion}`)
         .replace(/\/js\/create_kindeditor.js/g, `${cdnHost}/react/build/js/create_kindeditor.js?v=${newVersion}`)
 

From 926a8748f20e2b6e35f49d8119ee21516da46d2e Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 20 Aug 2019 18:49:58 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/scripts/build.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/react/scripts/build.js b/public/react/scripts/build.js
index b9bb9a702..b2bac24ec 100644
--- a/public/react/scripts/build.js
+++ b/public/react/scripts/build.js
@@ -199,7 +199,8 @@ function generateNewIndexJsp() {
         // .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)
 
         // ${cdnHost}  加了cdn后，这个文件里的字体文件加载会有跨域的报错   ../fonts/fontawesome-webfont.eot
-        .replace('/css/css_min_all.css', `/react/build/css/css_min_all.css?v=${newVersion}`)
+        // TODO tpi 评测结果关闭也使用了fontawesome
+        .replace('/css/css_min_all.css', `${cdnHost}/react/build/css/css_min_all.css?v=${newVersion}`)
 			  .replace('/css/iconfont.css', `${cdnHost}/react/build/css/iconfont.css?v=${newVersion}`)
         .replace(/\/js\/create_kindeditor.js/g, `${cdnHost}/react/build/js/create_kindeditor.js?v=${newVersion}`)