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/search/SearchPage.js

@@ -16,7 +16,7 @@ class SearchPage extends Component{
 			tab:"1",
 			count:0,
 			keywords:undefined,
-			type:"shixun",
+			type:"subject",
 			page:1,
 			perpages:20,
 			data:[],
@@ -25,7 +25,7 @@ class SearchPage extends Component{
 	}
 	//切换tab
 	changeTab=(e)=>{
-
+		// course 课堂,	shixun 开发社区  subject 实践课程  memo 交流问答
 
    let types ="";
 		if(parseInt(e.key)===0){