From 814fde878e5743013963e9111eb232cf85ea9000 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 31 May 2016 20:19:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E5=90=8E=E5=8F=B0=E8=8E=B7=E5=8F=96op?=
=?UTF-8?q?enid=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/wechats_controller.rb | 2 +-
app/views/wechats/user_activities.html.erb | 30 ++++++++++++++++++++++
config/menu.yml | 2 +-
public/javascripts/wechat/app.js | 4 +++
4 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 app/views/wechats/user_activities.html.erb
diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb
index e47c99cbd..ea230abe5 100644
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@@ -212,7 +212,7 @@ class WechatsController < ActionController::Base
return
end
- render file: File.join(Rails.root, "public/assets/wechat/app.html"), layout: nil
+ render 'wechats/user_activities', layout: nil
end
private
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
new file mode 100644
index 000000000..b45587ae0
--- /dev/null
+++ b/app/views/wechats/user_activities.html.erb
@@ -0,0 +1,30 @@
+
+
+
+ 最新动态
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/config/menu.yml b/config/menu.yml
index 3671ebb1b..83b892037 100644
--- a/config/menu.yml
+++ b/config/menu.yml
@@ -2,7 +2,7 @@ button:
-
type: "view"
name: "最新动态"
- url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxc09454f171153c2d&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
+ url: "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxf694495398c7d470&redirect_uri=http://wechat.trustie.net/wechat/user_activities&response_type=code&scope=snsapi_base&state=123#wechat_redirect"
-
type: "click"
name: "意见反馈"
diff --git a/public/javascripts/wechat/app.js b/public/javascripts/wechat/app.js
index d18719cfe..59605271c 100644
--- a/public/javascripts/wechat/app.js
+++ b/public/javascripts/wechat/app.js
@@ -10,6 +10,10 @@ if(debug===true){
app.factory('auth', function($http,$routeParams, $cookies, $q){
var _openid = '';
+ if(typeof g_openid !== 'undefined'){
+ _openid = g_openid;
+ }
+
if(debug===true){
_openid = "1";
}