From 822ca15c78cb6f55872069bf7c58a1d3ecd5c08a Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 12 Aug 2016 11:34:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/wechats_controller.rb       | 15 ++++++++-------
 public/javascripts/wechat/others/factory.js |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index e1fa7dcc2..69636c411 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -424,13 +424,14 @@ class WechatsController < ActionController::Base
 
         session[:wechat_openid] = open_id
         if params[:code]
-          if params[:userid]
-            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}" and return
-          elsif params[:id]
-            redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
-          else
-            redirect_to "/wechat/user_activities##{@path}" and return
-          end
+          # if params[:userid]
+          #   redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}&userid=#{params[:userid]}" and return
+          # elsif params[:id]
+          #   redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
+          # else
+          #   redirect_to "/wechat/user_activities##{@path}" and return
+          # end
+          redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return
         end
       # end
       render 'wechats/user_activities', layout: nil
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index f0d48dda9..5b20643a9 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -268,12 +268,12 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$loc
                     var urlName = response.data.type_name + "_discussion";
                     link = "https://open.weixin.qq.com/connect/oauth2/authorize?appid="+window.g_appid +
                         "&redirect_uri="+window.g_localhost+"/wechat/user_activities?id="+response.data.data.act_id+
-                        "&response_type=code&scope=snsapi_base&state="+urlName+"&connect_redirect=1#wechat_redirect";
+                        "&response_type=code&scope=snsapi_info&state="+urlName+"&connect_redirect=1#wechat_redirect";
                 }
                 else{
                     link = "https://open.weixin.qq.com/connect/oauth2/authorize?appid="+window.g_appid +
                         "&redirect_uri="+window.g_localhost+"/wechat/user_activities?id="+response.data.data.act_id+
-                        "&response_type=code&scope=snsapi_base&state="+args.urlName+"&connect_redirect=1#wechat_redirect";
+                        "&response_type=code&scope=snsapi_info&state="+args.urlName+"&connect_redirect=1#wechat_redirect";
                 }
 
                 console.log("link= "+link);