diff --git a/app/controllers/wechats_controller.rb b/app/controllers/wechats_controller.rb index 69636c411..653184844 100644 --- a/app/controllers/wechats_controller.rb +++ b/app/controllers/wechats_controller.rb @@ -424,14 +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 - redirect_to "/wechat/user_activities##{@path}?id=#{params[:id]}" and return + 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/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb index 413bf6852..eb58fbe3e 100644 --- a/app/views/wechats/user_activities.html.erb +++ b/app/views/wechats/user_activities.html.erb @@ -17,7 +17,7 @@ window.g_debug = false; //调试标志,如果在本地请置为true window.apiUrl = '/api/v1/'; window.g_redirect_path = '<%= @path %>'; - window.g_localhost = "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"; + window.g_localhost = "https://"+"<%= Setting.host_name%>"; window.g_appid = "<%= @appid %>"; <% if @course_id %> window.g_courseid = <%= @course_id %>;