From 6c19c8d213fd85992941c0899506763066ba9dfc Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Fri, 23 Aug 2019 15:27:12 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E7=9A=84=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/exercise/ExerciseReviewAndAnswer.js   | 8 +++++++-
 .../src/modules/courses/exercise/question/shixunAnswer.js | 2 +-
 public/react/src/modules/courses/poll/PollDetailIndex.js  | 2 +-
 public/react/src/modules/courses/poll/PollInfo.js         | 2 +-
 public/react/src/modules/courses/poll/PollNew.js          | 6 ++++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
index 91ca19e7d..cdbc7218b 100644
--- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
+++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
@@ -479,6 +479,12 @@ class ExerciseReviewAndAnswer extends Component{
     })
   }
 
+  // 返回
+  returnBtn = () =>{
+    let coursesId=this.props.match.params.coursesId;
+    let eId=this.props.match.params.Id;
+    this.props.history.push(`/courses/${coursesId}/exercises/${eId}/student_exercise_list?tab=0`)
+  }
 
   render(){
     let coursesId=this.props.match.params.coursesId;
@@ -561,7 +567,7 @@ class ExerciseReviewAndAnswer extends Component{
             </span>
             {
               (isAdmin || ( isStudent && exercise && user_exercise_status == 1)) ?
-              <WordsBtn className="fr font-16 lineh-40" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn>
+              <WordsBtn className="fr font-16 lineh-40" style="grey" onClick={this.returnBtn}>返回</WordsBtn>
               :
               time && time != 0 ?
               <div className="fr remainingTime">
diff --git a/public/react/src/modules/courses/exercise/question/shixunAnswer.js b/public/react/src/modules/courses/exercise/question/shixunAnswer.js
index 64e4214fa..cdffe08b8 100644
--- a/public/react/src/modules/courses/exercise/question/shixunAnswer.js
+++ b/public/react/src/modules/courses/exercise/question/shixunAnswer.js
@@ -316,7 +316,7 @@ class shixunAnswer extends Component{
                           </span>
                           <span className="fl mt3 font-16">
                             <span className="font-bd mr15">第{item[0].position}关</span>
-                            <Link to={ "/tasks/" + item[0].game_identifier }>
+                            <Link to={ "/tasks/" + item[0].game_identifier } style={{"cursor":"pointer"}}>
                               <span className={"font-16"}>{item[0].name}</span>
                             </Link>
                           </span>
diff --git a/public/react/src/modules/courses/poll/PollDetailIndex.js b/public/react/src/modules/courses/poll/PollDetailIndex.js
index a141db961..e92a0e352 100644
--- a/public/react/src/modules/courses/poll/PollDetailIndex.js
+++ b/public/react/src/modules/courses/poll/PollDetailIndex.js
@@ -136,7 +136,7 @@ class PollDetailIndex extends Component{
 						<span className="mt3 fl" style={{height:"25px"}}>
               <CoursesListType typelist={[`${map[pollDetail && pollDetail.polls_status]}`]} typesylename={""} />
             </span>
-						<WordsBtn className="fr font-16 mt2" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn>
+						<WordsBtn className="fr font-16 mt2" style="grey" to={`/courses/${this.props.match.params.coursesId}/polls/${user_permission && user_permission.left_banner_id}`}>返回</WordsBtn>
 					</p>
 					<div>
 						<div className="clearfix edu-back-white pl30 pr30 bor-bottom-greyE">
diff --git a/public/react/src/modules/courses/poll/PollInfo.js b/public/react/src/modules/courses/poll/PollInfo.js
index bce3d2753..2476e0bc3 100644
--- a/public/react/src/modules/courses/poll/PollInfo.js
+++ b/public/react/src/modules/courses/poll/PollInfo.js
@@ -327,7 +327,7 @@ class PollInfo extends Component{
             <span className="color-grey-3 font-24 fl task-hide break-word" style={{maxWidth:"900px",lineHeight:"30px"}}>{poll && poll.polls_name}</span>
             <CoursesListType typelist={[`${statudmap[poll && poll.poll_status]}`]} typesylename={""} />
             {
-              isAdmin || (poll && poll.user_poll_status == 1) ? <WordsBtn className="fr font-16 mt5" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn> :''
+              isAdmin || (poll && poll.user_poll_status == 1) ? <WordsBtn className="fr font-16 mt5" style="grey" to={`/courses/${coursesId}/polls/${this.props.match.params.pollId}/detail`}>返回</WordsBtn> :''
             }
             
           </p>
diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index ce602afc3..f8163b6a4 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -1,6 +1,9 @@
 import React, {Component} from "react";
 import {Form, Input, Tooltip, Checkbox, Radio, Select, message, Modal, Button} from 'antd'
 import {WordsBtn, ActionBtn} from 'educoder'
+
+import {Link} from 'react-router-dom'
+
 import '../css/members.css'
 import "../common/formCommon.css"
 
@@ -2412,8 +2415,7 @@ class PollNew extends Component {
 					<div className="clearfix mb30">
 						<p
 							className="fl color-black summaryname mt5">{this.props.match.params.news === undefined ? "新建问卷" : this.props.match.params.news === "new" ? "新建问卷" : "编辑问卷"}</p>
-						<a onClick={()=>this.gotohome()}
-											 className=" fr font-16">返回</a>
+							<Link to={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollid}`} className=" fr font-16">返回</Link>
 					</div>
 
 					{/*<Form {...formItemLayout} onSubmit={this.handleSubmit}>*/}

From 2e5f34decc53679a491437491991fe35dfd16800 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Fri, 23 Aug 2019 15:37:50 +0800
Subject: [PATCH 2/7] =?UTF-8?q?addonafter=E6=9B=BF=E6=8D=A2=E4=B8=BAsuffix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/boards/BoardsNew.js          | 2 +-
 public/react/src/modules/courses/busyWork/NewWork.js          | 2 +-
 public/react/src/modules/courses/exercise/ExerciseNew.js      | 2 +-
 .../modules/courses/graduation/tasks/GraduationTasksedit.js   | 2 +-
 .../modules/courses/graduation/tasks/GraduationTasksnew.js    | 2 +-
 .../src/modules/courses/graduation/topics/GraduateTopicNew.js | 2 +-
 public/react/src/modules/courses/poll/PollNew.js              | 4 ++--
 .../react/src/modules/user/usersInfo/video/EditVideoModal.js  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js
index d2b218f3d..b02f6a73f 100644
--- a/public/react/src/modules/courses/boards/BoardsNew.js
+++ b/public/react/src/modules/courses/boards/BoardsNew.js
@@ -350,7 +350,7 @@ class BoardsNew extends Component{
                     }],
                   })(
                     <Input placeholder={`请输入帖子标题，最大限制${MAX_TITLE_LENGTH}个字符 `}className="searchViewAfter" maxLength={MAX_TITLE_LENGTH}
-                      onInput={this.changeTitle} addonAfter={`${title_num}/${MAX_TITLE_LENGTH}`} />
+                      onInput={this.changeTitle} suffix={`${title_num}/${MAX_TITLE_LENGTH}`} />
                   )}
                 </Form.Item>
 
diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js
index 83e792d68..ca79e8ac5 100644
--- a/public/react/src/modules/courses/busyWork/NewWork.js
+++ b/public/react/src/modules/courses/busyWork/NewWork.js
@@ -399,7 +399,7 @@ class NewWork extends Component{
                     required: true, message: '请输入标题'
                   }],
                 })(
-                  <Input placeholder="请输入作业标题，最大限制60个字符" onInput={this.changeTitle} className="searchView searchViewAfter" style={{"width":"100%"}} maxLength={MAX_TITLE_LENGTH} addonAfter={`${String(title_num)}/${MAX_TITLE_LENGTH}`}/>
+                  <Input placeholder="请输入作业标题，最大限制60个字符" onInput={this.changeTitle} className="searchView searchViewAfter" style={{"width":"100%"}} maxLength={MAX_TITLE_LENGTH} suffix={`${String(title_num)}/${MAX_TITLE_LENGTH}`}/>
                 )}
               </Form.Item>
               <style>{`
diff --git a/public/react/src/modules/courses/exercise/ExerciseNew.js b/public/react/src/modules/courses/exercise/ExerciseNew.js
index 482a807cc..6e8444411 100644
--- a/public/react/src/modules/courses/exercise/ExerciseNew.js
+++ b/public/react/src/modules/courses/exercise/ExerciseNew.js
@@ -451,7 +451,7 @@ class ExerciceNew extends Component{
                     }],
                   })( */}
                     <Input placeholder={`请输入试卷标题，最大限制${TITLE_MAX_LENGTH}个字符`} maxLength={TITLE_MAX_LENGTH} className="input-100-40 mt5" value={exercise_name} 
-                        onChange={this.exercise_name_change} addonAfter={`${exercise_name ? exercise_name.length : 0}/${TITLE_MAX_LENGTH}`}
+                        onChange={this.exercise_name_change} suffix={`${exercise_name ? exercise_name.length : 0}/${TITLE_MAX_LENGTH}`}
                     />
                   {/* )} */}
                 </Form.Item>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 559144ecf..6f1b2db06 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -379,7 +379,7 @@ class GraduationTasksedit extends Component{
                   <Form.Item label="任务标题"  >
                     {getFieldDecorator('name', {
                       rules: [{ required: true, message: "请输入标题" }],
-                    })(<Input placeholder="请输入任务名称，最大限制60个字符" value={name} onInput={this.changeTitle}  className="searchView searchViewAfter" style={{"width":"100%"}} maxLength="60" addonAfter={String(title_num)}/>)}
+                    })(<Input placeholder="请输入任务名称，最大限制60个字符" value={name} onInput={this.changeTitle}  className="searchView searchViewAfter" style={{"width":"100%"}} maxLength="60" suffix={String(title_num)}/>)}
                   </Form.Item>
                   <input type="hidden"  id='nametypes' />
                 </div>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index 1d3c7578f..efe2bdd07 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -384,7 +384,7 @@ class GraduationTasksnew extends Component {
 											rules: [{required: true, message: "不能为空"}],
 										})(<Input placeholder="请输入任务名称，最大限制60个字符" value={title_value} onInput={this.changeTitle}
 															className="searchView searchViewAfter  h40" style={{"width": "100%"}} maxLength="60"
-															addonAfter={String(title_num)}/>)}
+															suffix={String(title_num)}/>)}
 									</Form.Item>
 									<input type="hidden" id='nametypes'  />
 								</div>
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
index 8c46bfa0e..94c238a5e 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
@@ -366,7 +366,7 @@ class GraduateTopicNew extends Component{
                       max: 60, message: '最大限制为60个字符',
                     }],
                   })(
-                    <Input placeholder="请输入帖子选题名称，最大限制60个字符" maxLength="60" onInput={this.changeTopicName} autoComplete="off" addonAfter={String(addonAfter)} className="searchViewAfter" />
+                    <Input placeholder="请输入帖子选题名称，最大限制60个字符" maxLength="60" onInput={this.changeTopicName} autoComplete="off" suffix={String(addonAfter)} className="searchViewAfter" />
                   )}
                 </Form.Item>
               </div>
diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index 9917187df..faa736ef2 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -2525,7 +2525,7 @@ class PollNew extends Component {
 										}
 
 									</div>
-									{/*addonAfter={String(addonAfter)}*/}
+									{/*suffix={String(addonAfter)}*/}
 									<Input placeholder="请输入问卷标题，最大限制60个字符" maxLength="60"
 												 style={{"margin-top": "15px", "text-align": "left"}}
 												 onInput={this.changeTopicName}
@@ -2556,7 +2556,7 @@ class PollNew extends Component {
 														readOnly={readOnlys}
 														onInput={this.changeTopicNametwo}
 														value={this.state.polls_descriptiontest}
-														autoComplete="off" addonAfter={"100"}></TextArea>
+														autoComplete="off" suffix={"100"}></TextArea>
 									{
 										this.state.Newedit === true || this.state.mysave === true ?
 											<div>
diff --git a/public/react/src/modules/user/usersInfo/video/EditVideoModal.js b/public/react/src/modules/user/usersInfo/video/EditVideoModal.js
index 4ed20d3cd..fc05cc932 100644
--- a/public/react/src/modules/user/usersInfo/video/EditVideoModal.js
+++ b/public/react/src/modules/user/usersInfo/video/EditVideoModal.js
@@ -77,7 +77,7 @@ function EditVideoModal (props) {
                     }],
                 })(
                     <Input placeholder="" className="titleInput" maxLength={MAX_LENGTH}
-                            addonAfter={String(_title ? `${String(_title.length)}/${MAX_LENGTH}` : 0)} />
+                            suffix={String(_title ? `${String(_title.length)}/${MAX_LENGTH}` : 0)} />
                 )}
             </Form.Item>
         </ModalWrapper>

From bbf419ef80018e1664a3d0688e6963e844b6bd91 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 23 Aug 2019 15:48:09 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/accounts_controller.rb    | 2 +-
 app/controllers/application_controller.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index e62dcf6ed..d6b4068cb 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -33,7 +33,7 @@ class AccountsController < ApplicationController
       uid_logger("start register:  verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
       # check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
       # todo 上线前请删除万能验证码"513231"
-      unless code == "513231" && request.host == "47.96.87.25"
+      unless code == "513231" && request.domain == "pre-newweb.educoder.net"
         return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
         return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
       end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 233d94c8f..ac9d63346 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -245,7 +245,8 @@ class ApplicationController < ActionController::Base
 
 
 		# 测试版前端需求
-		if request.host == "47.96.87.25"
+		logger.info("#########domain:#{request.domain}")
+		if request.domain == "pre-newweb.educoder.net"
 			if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
 				User.current = User.find 81403
 			elsif params[:debug] == 'student'

From 5fdd157034f9a1e4011bf822aae1b19f4ac5db2f Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Fri, 23 Aug 2019 15:51:47 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E9=80=89=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../graduation/topics/GraduateTopicDetail.js      |  2 +-
 .../courses/graduation/topics/GraduateTopicNew.js | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
index b24277a2c..b518c44f3 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetail.js
@@ -114,7 +114,7 @@ class GraduateTopicDetail extends Component{
           <p className="clearfix mb20 lineh-25">
             <span className="color-grey-3 font-24 fl task-hide" style={{lineHeight:"25px",maxWidth:"900px"}}>{tableData && tableData.graduation_topic_name}</span>
             <span className="fl mt1" style={{height:"25px"}}><CoursesListType typelist={[`${tableData && tableData.status_name}`]} typesylename={""} /></span>
-            <WordsBtn className="fr font-16 mt1" style="grey" onClick={()=>this.props.history.goBack()}>返回</WordsBtn>
+            <WordsBtn className="fr font-16 mt1" style="grey" to={`/courses/${tableData.course_id}/graduation_topics/${tableData.graduation_id}`}>返回</WordsBtn>
           </p>
           <div>
             <div className="clearfix edu-back-white bor-bottom-greyE" >
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
index 94c238a5e..3845721be 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicNew.js
@@ -12,6 +12,8 @@ import "../../common/formCommon.css"
 import '../style.css'
 import '../../css/Courses.css'
 import { WordsBtn, City } from 'educoder'
+
+import {Link} from 'react-router-dom'
 // import City from './City'
 
 // import './board.css'
@@ -20,6 +22,7 @@ import { WordsBtn, City } from 'educoder'
 const confirm = Modal.confirm;
 const $ = window.$
 const { Option } = Select;
+const NAME_COUNT=60;
 // 新建毕设选题
 // https://lanhuapp.com/web/#/item/project/board/detail?pid=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&project_id=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&image_id=c6d9b36f-7701-4035-afdb-62404681108c
 class GraduateTopicNew extends Component{
@@ -38,7 +41,7 @@ class GraduateTopicNew extends Component{
       topic_source:[],
       topic_type:[],
       attachments:undefined,
-      addonAfter:60,
+      addonAfter:0,
       left_banner_id:undefined,
       course_name:undefined
     }
@@ -99,7 +102,7 @@ class GraduateTopicNew extends Component{
           topic_source:result.data.topic_source,
           topic_type:result.data.topic_type,
           attachments:result.data.attachments,
-          addonAfter:20-parseInt(result.data.selected_data.name.length)
+          addonAfter:parseInt(result.data.selected_data.name.length)
         })
         this.props.form.setFieldsValue({
           tea_id:result.data.selected_data.tea_id,
@@ -257,9 +260,9 @@ class GraduateTopicNew extends Component{
   // 附件相关 ------------ END
 
   changeTopicName=(e)=>{
-    let num= 60 - parseInt(e.target.value.length);
+    // let num= 60 - parseInt(e.target.value.length);
     this.setState({
-      addonAfter:num < 0 ? 0 : num
+      addonAfter:e.target.value.length
     })
   }
   render() {
@@ -331,7 +334,7 @@ class GraduateTopicNew extends Component{
             </p>
             <div className="clearfix mb20 lineh-25">
               <p className="fl color-black summaryname">{topicId==undefined?"新建":"编辑"}毕设选题</p>
-              <a onClick={()=>this.props.history.goBack()} className="color-grey-6 fr font-16">返回</a>
+              <Link to={`/courses/${coursesId}/graduation_topics/${left_banner_id}`} className="color-grey-6 fr font-16">返回</Link>
             </div>
 
             <Form {...formItemLayout} onSubmit={this.handleSubmit}>
@@ -366,7 +369,7 @@ class GraduateTopicNew extends Component{
                       max: 60, message: '最大限制为60个字符',
                     }],
                   })(
-                    <Input placeholder="请输入帖子选题名称，最大限制60个字符" maxLength="60" onInput={this.changeTopicName} autoComplete="off" suffix={String(addonAfter)} className="searchViewAfter" />
+                    <Input placeholder="请输入帖子选题名称，最大限制60个字符" maxLength="60" onInput={this.changeTopicName} autoComplete="off" suffix={`${String(addonAfter)}/${NAME_COUNT}`} className="searchViewAfter" />
                   )}
                 </Form.Item>
               </div>

From 2d76ddbad8389a12b834b891649d5810b704e0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 23 Aug 2019 15:52:42 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/shared/main.css                              | 3 +++
 public/react/src/modules/courses/gradinforms/Eduinforms.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/templates/shared/main.css b/app/templates/shared/main.css
index 81b80cdf8..c77818f16 100644
--- a/app/templates/shared/main.css
+++ b/app/templates/shared/main.css
@@ -779,4 +779,7 @@ html>body #ajax-indicator { position: fixed; }
     border-top-right-radius: 4px;
     border-bottom-right-radius: 4px;
     border-bottom-left-radius: 4px;
+}
+.yslminHeigth{
+    min-height: 400px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/courses/gradinforms/Eduinforms.js b/public/react/src/modules/courses/gradinforms/Eduinforms.js
index 777f04bc6..a50bc0369 100644
--- a/public/react/src/modules/courses/gradinforms/Eduinforms.js
+++ b/public/react/src/modules/courses/gradinforms/Eduinforms.js
@@ -149,7 +149,7 @@ class Eduinforms extends Component{
 														</div>
 														:
 														<div  className="edu-back-white ">
-														<div id="MakedownHTML"  className={"markdown-body fonttext yslmtopcg"}  style={{minHeight:"400px"}} dangerouslySetInnerHTML={{__html: markdownToHTML(description).replace(/▁/g, "▁▁▁")}}>
+														<div id="MakedownHTML"  className={"markdown-body fonttext yslmtopcg yslminHeigth"}  style={{minHeight:"400px"}} dangerouslySetInnerHTML={{__html: markdownToHTML(description).replace(/▁/g, "▁▁▁")}}>
 
 
 														</div>

From 599b94d579a76cc70e59b479c781c1d7fa1de292 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 23 Aug 2019 15:54:45 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/accounts_controller.rb    | 2 +-
 app/controllers/application_controller.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index d6b4068cb..46b3964c2 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -33,7 +33,7 @@ class AccountsController < ApplicationController
       uid_logger("start register:  verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
       # check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
       # todo 上线前请删除万能验证码"513231"
-      unless code == "513231" && request.domain == "pre-newweb.educoder.net"
+      unless code == "513231" && request.subdomain == "pre-newweb"
         return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
         return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
       end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ac9d63346..4506d20e1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -245,8 +245,8 @@ class ApplicationController < ActionController::Base
 
 
 		# 测试版前端需求
-		logger.info("#########domain:#{request.domain}")
-		if request.domain == "pre-newweb.educoder.net"
+		logger.info("subdomain:#{subdomain}")
+		if request.subdomain == "pre-newweb"
 			if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
 				User.current = User.find 81403
 			elsif params[:debug] == 'student'

From 6073e6a7c3e12e98455e06fc5648769cb0063373 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 23 Aug 2019 15:55:54 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4506d20e1..177eb1a42 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -245,7 +245,7 @@ class ApplicationController < ActionController::Base
 
 
 		# 测试版前端需求
-		logger.info("subdomain:#{subdomain}")
+		logger.info("subdomain:#{request.subdomain}")
 		if request.subdomain == "pre-newweb"
 			if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
 				User.current = User.find 81403