Merge remote-tracking branch 'remotes/origin/develop' into dev_aliyun

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

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>
 

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>

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
                     });

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;