From 0026dfe6160c9b24b30c9e0c29785bab8fde7261 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, 23 Jul 2019 11:04:57 +0800
Subject: [PATCH 1/2] =?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/NewHeader.js              | 1 +
 public/react/src/modules/tpm/TPMBanner.js              | 2 +-
 public/react/src/modules/tpm/newshixuns/Newshixuns.js  | 4 +---
 public/react/src/modules/tpm/shixuns/css/TPMBanner.css | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 5f7f485f8..c1ad97276 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -738,6 +738,7 @@ submittojoinclass=(value)=>{
                           <li className="clearfix mb10">
                             <label className="panel-form-label fl">项目邀请码：</label>
                             <Input type="text" className="input-60-40 fl" name="invite_code"
+																	 style={{width: '275px'}}
                                    placeholder="请输入5位课堂邀请码或6位分班邀请码" value={tojoinclasstitle} onInput={this.inputjoinclassvalue}/>
                           </li>
 
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 23b228800..5efadc1d1 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -597,7 +597,7 @@ class TPMBanner extends Component {
                 </ul>
 
                 <div className="pr fl" id="commentsStar">
-									  <div className={"color-grey-c"} style={{color: "#Fff",textAlign: "center"}}>学员评分</div>
+									  <div className={"color-grey-c mb11"} style={{color: "#Fff",textAlign: "center"}}>学员评分</div>
                     <div className="rateYo">
                         <Rating value={star_info[0]} disabled allowHalf/>
                     </div>
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index 184b6313a..956e652c8 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -236,9 +236,7 @@ class Newshixuns extends Component {
         let newshixunUrl = `/shixuns/new.json`;
         axios.get(newshixunUrl).then((response) => {
             if (response.status === 200) {
-                if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) {
-
-                } else {
+                if (response.data.message===undefined) {
                     this.setState({
                         newshixunlist: response.data
                     });
diff --git a/public/react/src/modules/tpm/shixuns/css/TPMBanner.css b/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
index 0492f20c3..b3233f641 100644
--- a/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
+++ b/public/react/src/modules/tpm/shixuns/css/TPMBanner.css
@@ -87,7 +87,7 @@ a:active{text-decoration:none;}
 #commentsStar{
     margin-top: -7px;
     width: 90px;
-    margin-bottom: 11px;
+
 }
 .startbtnModal .ant-modal-content{
     background: transparent;

From ef164e0abcf91e91ad0ab91c0a209ad4552335cf Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 23 Jul 2019 11:48:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E6=B2=A1=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8A=A5409?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b0183574d..81e9402b9 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -34,10 +34,11 @@ class ApplicationController < ActionController::Base
 		User.current.admin? || User.current.business?
 	end
 
+	# 访问课堂时没权限直接弹加入课堂的弹框 ：409
 	def user_course_identity
 		@user_course_identity = current_user.course_identity(@course)
 		if @user_course_identity > Course::STUDENT && @course.is_public == 0
-			tip_exception(403, "您没有权限进入")
+			tip_exception(409, "您没有权限进入")
 		end
 		uid_logger("###############user_course_identity:#{@user_course_identity}")
 	end