From de529c0dadc10fde65c3f5da25bab94ef2be0920 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 27 Jun 2019 13:48:46 +0800
Subject: [PATCH 1/8] is_evaluation

---
 public/react/src/modules/courses/busyWork/CommonWorkList.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 2243310a2..8de294118 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -234,7 +234,7 @@ function buildColumns(that, student_works) {
         <span>
           <Tooltip title={
             getScoreTip(student_score,
-            isNiPing ? `你的评阅分数：${record.student_score}分` : <div>
+            that.state.is_evaluation ? `你的评阅分数：${record.student_score}分` : <div>
               {record.student_comment_count && <div>{`${record.student_comment_count}名学生进行了匿评`}</div>}
               <div>有效平均分：{record.student_score}分</div>
             </div>
@@ -334,7 +334,7 @@ const orderMap = {
   work_score: 'asc',
   student_id: 'asc',
 }
-const PAGE_SIZE = 50
+const PAGE_SIZE = 20
 // 类似页面 http://localhost:3007/courses/1309/graduation/graduation_tasks/48/76/setting
 class CommonWorkList extends Component{
 

From 4aa55e3c591cd5146eb289c57832014f2e5bd716 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 27 Jun 2019 14:20:57 +0800
Subject: [PATCH 2/8] timeMsg

---
 .../modules/courses/busyWork/CommonWorkList.js    | 15 ++++++++++++++-
 .../src/modules/page/component/UpdateDrawer.js    |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 8de294118..34c2d6154 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -564,6 +564,19 @@ class CommonWorkList extends Component{
 			 }
 		})
 
+    // time_status	int	时间对应的状态: 0：未发布，1:提交中，2:补交中，3:匿评中，4:申诉中，5:评阅中，6:已结束
+
+    let timeMsg = '提交剩余时间'
+    if (time_status === 1) {
+
+    } else if (time_status === 2) {
+      timeMsg = '补交剩余时间'
+    } else if (time_status === 3) {
+      timeMsg = '匿评剩余时间'
+    } else if (time_status === 4) {
+      timeMsg = '申诉剩余时间'
+    }
+    
     // console.log(StudentData)
 		// console.log(student_works)
     return(
@@ -638,7 +651,7 @@ class CommonWorkList extends Component{
                     (!!commit_count || !!uncommit_count) &&
                     <React.Fragment>
                       <span className="color-orange-tip">{commit_count}</span>已交　{uncommit_count}未交　
-											{time_status===5?"":"剩余提交时间"}
+											{timeMsg || ''}
                       <span className="color-orange-tip">{left_time.time}</span>
                     </React.Fragment>
                   }
diff --git a/public/react/src/modules/page/component/UpdateDrawer.js b/public/react/src/modules/page/component/UpdateDrawer.js
index 5a0f2db5d..b39445d9a 100644
--- a/public/react/src/modules/page/component/UpdateDrawer.js
+++ b/public/react/src/modules/page/component/UpdateDrawer.js
@@ -198,7 +198,7 @@ class UpdateDrawer extends Component {
 		            	}
 		            </div>
 	          	</DialogContent>
-	          	<DialogActions id="dialog-actions">
+	          	<DialogActions id="dialog-actions" style={{ 'margin-bottom': '16px'}}>
 	          		{ needUpdateScript ? 
 	          		<React.Fragment>
 			            <Button 

From ed149ff5557a6a37dfc16a545e41551160f4fa24 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 27 Jun 2019 14:32:32 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E8=A1=A5=E4=BA=A4=E4=BD=9C=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/busyWork/CommonWorkDetailIndex.js   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index 4e3214e50..b16fd6d32 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -243,6 +243,12 @@ class CommonWorkDetailIndex extends Component{
                         {work_statuses && work_statuses.indexOf('提交作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
                             onClick={() => { this.props.toWorkPostPage(this.props.match.params)}}
                         >提交作品</a>}
+
+                        { work_statuses && work_statuses.indexOf('补交作品') != -1 &&
+                        <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
+                            onClick={() => { this.props.toWorkPostPage(this.props.match.params, null, true, work_id)}}>
+                        补交作品</a> }
+
                         {work_statuses && work_statuses.indexOf('修改作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
                             onClick={() => { this.props.toWorkPostPage(this.props.match.params, null, true, work_id)}}
                         >修改作品</a>}

From 304df978223348418fbd77518639448818510978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 27 Jun 2019 14:36:50 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../graduation/tasks/GraduationTasksappraiseReply.js      | 4 +---
 .../modules/courses/shixunHomework/Trainingjobsetting.js  | 8 +++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
index 0f98f4d8f..e2ab8ec05 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js
@@ -159,7 +159,6 @@ class GraduationTasksappraiseReply extends Component{
       <React.Fragment>
 				{comment_scores.length===0? "": <div className="edu-back-white padding20-30" style={{marginTop: '16px'}}>
         {isStudent===true?
-
           <GraduationTasksappraiseReplyChild
               {...this.props}
               {...this.state}
@@ -169,8 +168,7 @@ class GraduationTasksappraiseReply extends Component{
               addSuccess={this.addSuccess}
               onDelete={this.onDelete}
             />
-          :
-              <GraduationTasksappraiseReplyChild {...this.state} {...this.props}
+          : <GraduationTasksappraiseReplyChild {...this.state} {...this.props}
                  cancelmodel={this.cancelmodel}
                  showModulationtype={(id)=>this.showModulationtype(id)}
                  saveModulationModal={(value,num)=>this.saveModulationModal(value,num)}
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index bece9862f..12d21fb53 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1747,7 +1747,7 @@ class Trainingjobsetting extends Component {
                                         <div>
                                             <div className="clearfix mb5 ml15">
                                                 <span className="font-16 mr15 fl mt6" style={{"color":"#999999"}}>发布时间：</span>
-                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : starttimetype === true ? "发布时间已过，则不能修改" : ""}></Tooltip>
+                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditstwo === true ? "发布时间已过，则不能修改" : ""}>
                                                 <div className="fl">
                                                     <DatePicker
                                                         showToday={false}
@@ -1775,11 +1775,12 @@ class Trainingjobsetting extends Component {
                                                         }
                                                     </p>
                                                 </div>
+                                                </Tooltip>
                                                 <span className="ml20 fl mt10" style={{"color":"#999999","text-align":"left","font-size":"14px"}}>(学生收到作业的时间)</span>
                                             </div>
                                             <div className="clearfix ml15">
                                                 <span className="mr15 fl mt10 font-16" style={{"color":"#999999"}}>截止时间：</span>
-                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : starttimetype === true ? "截止时间已过，则不能修改" : ""}> </Tooltip>
+                                                <Tooltip placement="bottom" title={this.props.isSuperAdmin() ? "" : !flagPageEditsthrees === true ? "截止时间已过，则不能修改" : ""}>
                                                 <div className="fl">
                                                     <DatePicker
                                                         showToday={false}
@@ -1807,6 +1808,7 @@ class Trainingjobsetting extends Component {
                                                         }
                                                     </p>
                                                 </div>
+                                                </Tooltip>
                                                 <span className=" ml20 fl mt10 color-grey-9" style={{"text-align":"left","font-size":"14px"}}>(学生“按时”提交作品的时间截点)</span>
                                             </div>
                                         </div>
@@ -1924,7 +1926,7 @@ class Trainingjobsetting extends Component {
                                           checked={this.state.completionefficiencyscore} style={{"color":"#666666"}}>效率分<span
                                     className={"font-14 color-grey-9 font-14 ml15"} style={{"text-align":"left"}}>(选中，则学生最终成绩包含效率分)</span></Checkbox>
                             </div>
-                            <div className="ml80 mt30">
+                            <div className="ml85 mt30">
                                 <span className="c_grey mr10" style={{"color":"#999999"}}>分值</span>
                                 <InputNumber min={0} disabled={!flagPageEdit} max={100} className="ml10 h40 mr10  color-grey-9"
                                              style={{width: "100px","color":"#999999"}}

From aeedc74f409d02e2a0a928e47792aef26ce3efe9 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 27 Jun 2019 14:42:18 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E9=80=89=E9=A2=98-?=
 =?UTF-8?q?=E5=90=8C=E6=84=8F=E9=80=89=E9=A2=98=E7=82=B9=E5=87=BB=E6=97=A0?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/graduation/topics/GraduateTopicDetailTable.js      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
index bd58e555b..4e92f75ee 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js
@@ -80,10 +80,11 @@ class GraduateTopicDetailTable extends Component{
   }
   sureAgreeTopic=(count)=>{
     if(count > 0){
+      debugger
       let{tableData}=this.props;
       let{operationId,classesId}=this.state
       let courseId=this.props.match.params.course_id;
-      let name=tableData.group_list.filter(item=>item.course_group_id==classesId)[0].group_name;
+      let name=tableData.group_list.filter(item=>item.group_id==classesId)[0].group_name;
       this.agreeChoose(courseId,operationId,classesId,name);
     }else{
       this.setState({

From 98d9af969eb2f3a2970253104b52fa64d1e96163 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 27 Jun 2019 14:46:54 +0800
Subject: [PATCH 6/8] c

---
 public/react/src/AppConfig.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 8f93f780b..2100ebe8d 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -102,6 +102,7 @@ export function initAxiosInterceptors(props) {
         if(response===undefined){
            return
        }
+       const config = response.config
         if (response.data.status === -1) {
         //     console.error('error:', response.data.message)
         //     throw new Error()

From 4636c3586836f57d2306a3de357fe52138272821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 27 Jun 2019 15:01:18 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/login/LoginDialog.css   | 246 +++++++++---------
 .../src/modules/login/Trialapplication.js     |  16 +-
 2 files changed, 130 insertions(+), 132 deletions(-)

diff --git a/public/react/src/modules/login/LoginDialog.css b/public/react/src/modules/login/LoginDialog.css
index 25e176f3e..314ece06a 100644
--- a/public/react/src/modules/login/LoginDialog.css
+++ b/public/react/src/modules/login/LoginDialog.css
@@ -1,124 +1,124 @@
-.dialogBox{
-    height: 370px;
-}
-.dialogBox2{
-    height: 420px;
-}
-#DialogID{
-    z-index: 20000;
-}
-    #DialogID .dialogBox {
-        width: 402px;
-    }
-.MuiPaper-elevation24-45{
-    box-shadow:none !important;
-}
-.MuiPaper-root-19{
-    /* background:none !important; */
-}
-.MuiDialog-paper-9{
-    overflow-y:hidden !important;
-}
-#log_reg_content{
-    top: 0px !important;
-}
-#log_reg_content{
-    width:400px !important;
-    border-radius:6px;
-    box-shadow:4px 8px 12px rgba(76,76,76,0.3);
-}
-.log_nav li{
-    height:17px;
-    font-size:18px;
-    font-family:NotoSansHans-Regular;
-    color:rgba(25,0,0,1);
-    line-height: 0px;
-}
-.vertical-line{
-    margin-left:10px;
-    margin-right:10px;
-}
-#DialogID div  {
-    overflow-y:visible !important;
-    box-shadow:none !important;
-}
-#wrapper{
-    position: relative;
-    top: 3px;
-    left: 0px;
-    margin-bottom: 17px;
-}
-
-.slidetounlock{
-    font-size: 12px;
-    background:-webkit-gradient(linear,left top,right top,color-stop(0,#4d4d4d),color-stop(.4,#4d4d4d),color-stop(.5,#fff),color-stop(.6,#4d4d4d),color-stop(1,#4d4d4d));
-    -webkit-background-clip:text;
-    -webkit-text-fill-color:transparent;
-    -webkit-animation:slidetounlock 3s infinite;
-    -webkit-text-size-adjust:none
-}
-@-webkit-keyframes slidetounlock{0%{background-position:-200px 0} 100%{background-position:200px 0}}
-
-.handler_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;}
-.handler_ok_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;}
-
-#drag{
-    position: relative;
-    background-color: #e8e8e8;
-    width: 340px;
-    height: 34px;
-    line-height: 34px;
-    text-align: center;
-}
-#drag .handler{
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    width: 40px;
-    height: 32px;
-    border: 1px solid #ccc;
-    cursor: move;
-}
-
-#drag .drag_bg{
-    background-color: #7ac23c;
-    height: 34px;
-    width: 0px;
-}
-#drag .drag_text{
-    position: absolute;
-    top: 0px;
-    width: 340px;
-    color:#9c9c9c;
-    -moz-user-select: none;
-    -webkit-user-select: none;
-    user-select: none;
-    -o-user-select:none;
-    -ms-user-select:none;
-    font-size: 12px;
-}
-#drag{
-    overflow: hidden !important;
-}
-
-
-
-#closeIcon{
-    position: absolute;
-    top: -30px;
-    right: -27px;
-     z-index: 100000;
-}
-
-.bluebutton{
-    width: 100%;
-    text-align: center;
-    color: #FFFFff!important;
-    display: block;
-    background: #cbcbcb;
-    height: 45px;
-    line-height: 45px;
-    border-radius: 4px;
-    letter-spacing: 2px;
-    cursor: pointer;
+.dialogBox{
+    height: 338px;
+}
+.dialogBox2{
+    height: 420px;
+}
+#DialogID{
+    z-index: 20000;
+}
+    #DialogID .dialogBox {
+        width: 402px;
+    }
+.MuiPaper-elevation24-45{
+    box-shadow:none !important;
+}
+.MuiPaper-root-19{
+    /* background:none !important; */
+}
+.MuiDialog-paper-9{
+    overflow-y:hidden !important;
+}
+#log_reg_content{
+    top: 0px !important;
+}
+#log_reg_content{
+    width:400px !important;
+    border-radius:6px;
+    box-shadow:4px 8px 12px rgba(76,76,76,0.3);
+}
+.log_nav li{
+    height:17px;
+    font-size:18px;
+    font-family:NotoSansHans-Regular;
+    color:rgba(25,0,0,1);
+    line-height: 0px;
+}
+.vertical-line{
+    margin-left:10px;
+    margin-right:10px;
+}
+#DialogID div  {
+    overflow-y:visible !important;
+    box-shadow:none !important;
+}
+#wrapper{
+    position: relative;
+    top: 3px;
+    left: 0px;
+    margin-bottom: 17px;
+}
+
+.slidetounlock{
+    font-size: 12px;
+    background:-webkit-gradient(linear,left top,right top,color-stop(0,#4d4d4d),color-stop(.4,#4d4d4d),color-stop(.5,#fff),color-stop(.6,#4d4d4d),color-stop(1,#4d4d4d));
+    -webkit-background-clip:text;
+    -webkit-text-fill-color:transparent;
+    -webkit-animation:slidetounlock 3s infinite;
+    -webkit-text-size-adjust:none
+}
+@-webkit-keyframes slidetounlock{0%{background-position:-200px 0} 100%{background-position:200px 0}}
+
+.handler_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;}
+.handler_ok_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;}
+
+#drag{
+    position: relative;
+    background-color: #e8e8e8;
+    width: 340px;
+    height: 34px;
+    line-height: 34px;
+    text-align: center;
+}
+#drag .handler{
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    width: 40px;
+    height: 32px;
+    border: 1px solid #ccc;
+    cursor: move;
+}
+
+#drag .drag_bg{
+    background-color: #7ac23c;
+    height: 34px;
+    width: 0px;
+}
+#drag .drag_text{
+    position: absolute;
+    top: 0px;
+    width: 340px;
+    color:#9c9c9c;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    user-select: none;
+    -o-user-select:none;
+    -ms-user-select:none;
+    font-size: 12px;
+}
+#drag{
+    overflow: hidden !important;
+}
+
+
+
+#closeIcon{
+    position: absolute;
+    top: -30px;
+    right: -27px;
+     z-index: 100000;
+}
+
+.bluebutton{
+    width: 100%;
+    text-align: center;
+    color: #FFFFff!important;
+    display: block;
+    background: #cbcbcb;
+    height: 45px;
+    line-height: 45px;
+    border-radius: 4px;
+    letter-spacing: 2px;
+    cursor: pointer;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/login/Trialapplication.js b/public/react/src/modules/login/Trialapplication.js
index 846971e82..cd3b72dad 100644
--- a/public/react/src/modules/login/Trialapplication.js
+++ b/public/react/src/modules/login/Trialapplication.js
@@ -268,25 +268,23 @@ class Trialapplication extends Component {
 			reason: this.state.reason,
 		}).then((result) => {
 			// console.log(result);
-			try {
 				// this.onTabChange("1");
-				thiss.props.showNotification(`试用申请已提交，我们将尽快完成审核`);
-				if (thiss.state.showTrial === false) {
+			if(result !== undefined){
+				this.props.showNotification(`试用申请已提交，我们将尽快完成审核`);
+				if (this.state.showTrial === false) {
 					window.location.href = "/";
-					thiss.setState({
+					this.setState({
 						isRenders: false
 					})
-					thiss.Cancel();
+					this.Cancel();
 
 				} else {
-					thiss.setState({
+					this.setState({
 						isRenders: false
 					})
-					thiss.Cancel();
+					this.Cancel();
 
 				}
-			} catch (e) {
-
 			}
 		}).catch((error) => {
 

From 5db4ae0f185ab1432f97946e8210f0baef8b7295 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Thu, 27 Jun 2019 15:18:57 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E9=A2=98=E5=BA=93=E9=80=89=E7=94=A8?=
 =?UTF-8?q?=EF=BC=8C=E7=AB=8B=E5=8D=B3=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/busyWork/commonWork.js   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js
index cc4aff4f9..7fbe33a67 100644
--- a/public/react/src/modules/courses/busyWork/commonWork.js
+++ b/public/react/src/modules/courses/busyWork/commonWork.js
@@ -88,10 +88,14 @@ class commonWork extends Component{
     let {page,search,order}=this.state;
     this.getList(page,search,order);
   }
-  useBankSuccess = () => {
+  useBankSuccess = (checkBoxValues, newWorkIdArray) => {
     this.setState({
-      page:1
+      page:1,
+      checkBoxValues: newWorkIdArray
+    }, () => {
+      this.refs['publishModalRef'].open()
     })
+    
     let {search, order}=this.state;
     this.getList(1, search, order);
   }
@@ -418,7 +422,7 @@ class commonWork extends Component{
                       onClick={this.onWorkDelete}>删除</a>
                 </li>
                 <li className="li_line">
-                  <PublishRightnow showActionButton={true} {...this.props} checkBoxValues={checkBoxValues} 
+                  <PublishRightnow ref="publishModalRef" showActionButton={true} {...this.props} checkBoxValues={checkBoxValues} 
                       isPublish={true} doWhenSuccess={this.doWhenSuccess} fromListPage={true}></PublishRightnow>
                 </li>
                 <li className="li_line">