Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/views/memos/_memo.json.jbuilder

@@ -1,5 +1,6 @@
 json.memo do
   json.id memo.id
+  json.forum_id memo.forum_id
   json.subject memo.subject
   json.is_md memo.is_md
   json.content memo.content

app/views/users/homepage_info.json.jbuilder

@@ -16,7 +16,7 @@ json.college_identifier @user.college_identifier
 json.followed User.current.watched?(@user)
 
 if @user.logged_user?
-  json.can_apply_trial @user.can_apply_trial?
+  #json.can_apply_trial @user.can_apply_trial?
   json.attendance_signed @user.attendance_signed?
   json.tomorrow_attendance_gold @user.tomorrow_attendance_gold
 end

public/react/src/modules/user/usersInfo/Infos.js

@@ -342,16 +342,14 @@ class Infos extends Component{
                   is_current ? 
                   <div className="inline">
                     {
-                      data && data.can_apply_trial == false ?
+                      data && data.attendance_signed ? 
-                        data.attendance_signed ? 
+                      <React.Fragment>
-                        <React.Fragment>
+                        <span className="user_default_btn user_grey_btn mb5">已签到</span>
-                          <span className="user_default_btn user_grey_btn mb5">已签到</span>
+                        <p id="attendance_notice" className="none font-12 color-grey-6" style={{"display":"block"}}>明日签到&nbsp;<font className="color-orange">+{next_gold}</font>&nbsp;金币</p>
-                          <p id="attendance_notice" className="none font-12 color-grey-6" style={{"display":"block"}}>明日签到&nbsp;<font className="color-orange">+{next_gold}</font>&nbsp;金币</p>
+                      </React.Fragment>
-                        </React.Fragment>
-                        :
-                        <a herf="javascript:void(0);" onClick={this.signFor} id="attendance" className="user_default_btn user_orange_btn fl mb15">签到</a>
                       :
-                      <a herf="javascript:void(0);" onClick={this.trialapplications} id="authentication_apply" className="user_default_btn user_private_btn fl ml15">试用申请</a>
+                      <a herf="javascript:void(0);" onClick={this.signFor} id="attendance" className="user_default_btn user_orange_btn fl mb15">签到</a>
+                      // <a herf="javascript:void(0);" onClick={this.trialapplications} id="authentication_apply" className="user_default_btn user_private_btn fl ml15">试用申请</a>
                     }
                   </div> 
                   :

public/react/src/search/SearchPage.js

@@ -25,7 +25,7 @@ class SearchPage extends Component{
 	}
 	//切换tab
 	changeTab=(e)=>{
-
+		// course 课堂,	shixun 开发社区  subject 实践课程  memo 交流问答
 
    let types ="";
 		if(parseInt(e.key)===0){