From 53bca5c0066f0fea50a78d3fd6aa521680758f0b Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 22 Aug 2016 13:52:40 +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 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index 6ccfbcce1..619c0f586 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -419,9 +419,12 @@ class WechatsController < ActionController::Base
       logger.info "user_activities!!!!!!!!!!!!!!"
       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")
-      #   @path = '/login'
-      # else
+      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)
+          @path = '/login'
+        end
+        session["login"] = nil
+      else
         if params[:state] == 'myclass'
           @course_id = params[:id];
         elsif params[:state] == 'myproject'
@@ -430,6 +433,8 @@ class WechatsController < ActionController::Base
 
         session[:wechat_openid] = open_id
         if params[:code]
+          #不跳转至绑定界面的标志
+          session["login"] = false
           if params[:userid]
             redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}" and return
           elsif params[:id]
@@ -439,7 +444,7 @@ class WechatsController < ActionController::Base
           end
           # redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
         end
-      # end
+      end
       render 'wechats/user_activities', layout: nil
     end