diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb index 461cc7225..ebfd15057 100644 --- a/app/controllers/wechats_controller.rb +++ b/app/controllers/wechats_controller.rb @@ -404,6 +404,10 @@ class WechatsController < ActionController::Base def user_activities + if params[:state] == nil + return + end + @appid = Wechat.config.appid ## sign @@ -420,10 +424,7 @@ class WechatsController < ActionController::Base logger.info params 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") - if !(session["login"] != nil && session["login"] == false) || session["login"] == nil - @path = '/login' - end - session.delete("login") + @path = '/login' else if params[:state] == 'myclass' @course_id = params[:id]; @@ -433,11 +434,6 @@ class WechatsController < ActionController::Base session[:wechat_openid] = open_id if params[:code] - #不跳转至绑定界面的标志 - session.delete("login") - if 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" - session["login"] = false - end if params[:userid] redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}" and return elsif params[:id]