From c275557fa73158891992aeb7724ce86ade9e1690 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 22 Aug 2016 15:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index ebfd15057..cfa5f4414 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -404,10 +404,6 @@ class WechatsController < ActionController::Base
 
     def user_activities
 
-      if params[:state] == nil
-        return
-      end
-
       @appid = Wechat.config.appid
       ## sign
 
@@ -422,6 +418,11 @@ class WechatsController < ActionController::Base
 
       logger.info "user_activities!!!!!!!!!!!!!!"
       logger.info params
+
+      #保证下面的redirect_to "/wechat/user_activities##{@path}?id=...不会往下走
+      if params[:state] == nil
+        return
+      end
       
       unless (user_binded?(open_id) || params[:state] == "invite_code" || params[:state] == "project_invite_code" ||  params[:state] == "blog_comment" || params[:state] == "course_notice" || params[:state] == "project_discussion" || params[:state] == "course_discussion" || params[:state] == "homework" || params[:state] == "issues" || params[:state] == "journal_for_message")
         @path = '/login'