From e28511177b5dc47c3532d18a354573ad6438d611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 8 Aug 2019 09:17:53 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/search/SearchPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/search/SearchPage.js b/public/react/src/search/SearchPage.js
index 5ff8f16c3..3a2d1df8a 100644
--- a/public/react/src/search/SearchPage.js
+++ b/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){

From a05860387a071c628f12f4838ffbda4093224188 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 8 Aug 2019 09:40:40 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=80=81=E7=94=A8=E6=88=B7=EF=BC=88?=
 =?UTF-8?q?=E5=85=B7=E4=BD=93=E5=8E=9F=E5=9B=A0=E6=9C=AA=E7=9F=A5=EF=BC=89?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E4=BB=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=BA=E8=AF=95=E7=94=A8=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/homepage_info.json.jbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/homepage_info.json.jbuilder b/app/views/users/homepage_info.json.jbuilder
index 1621448f3..3fabd110b 100644
--- a/app/views/users/homepage_info.json.jbuilder
+++ b/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

From 9c8e70eb4d1b35d63a3eb908d6499fe85aad83ee Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 8 Aug 2019 10:05:13 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=B8=96=E5=AD=90=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8Cmemo=E5=A2=9E=E5=8A=A0=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=AD=97=E6=AE=B5forum=5Fid=EF=BC=8C=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=E5=89=8D=E7=AB=AF=E9=9D=A2=E5=8C=85=E5=B1=91=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9B=AE=E5=BD=95=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/_memo.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/memos/_memo.json.jbuilder b/app/views/memos/_memo.json.jbuilder
index f0ac5cd3d..f0d2c147f 100644
--- a/app/views/memos/_memo.json.jbuilder
+++ b/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

From 5d87411130b8448c5c1cf8c52be293b3e5739768 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 8 Aug 2019 10:11:19 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=AF=95=E7=94=A8=E7=94=B3=E8=AF=B7=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=EF=BC=88=E8=AF=95=E7=94=A8=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=B7=B2=E7=BB=8F=E5=8E=BB=E9=99=A4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/user/usersInfo/Infos.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js
index 343f8ac59..80b223e43 100644
--- a/public/react/src/modules/user/usersInfo/Infos.js
+++ b/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.attendance_signed ? 
-                        <React.Fragment>
-                          <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>
-                        </React.Fragment>
-                        :
-                        <a herf="javascript:void(0);" onClick={this.signFor} id="attendance" className="user_default_btn user_orange_btn fl mb15">签到</a>
+                      data && data.attendance_signed ? 
+                      <React.Fragment>
+                        <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>
+                      </React.Fragment>
                       :
-                      <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> 
                   :