diff --git a/app/controllers/ecloud_controller.rb b/app/controllers/ecloud_controller.rb index ac303ce3..3e02c579 100644 --- a/app/controllers/ecloud_controller.rb +++ b/app/controllers/ecloud_controller.rb @@ -18,7 +18,7 @@ class EcloudController < ApplicationController skip_before_filter :verify_authenticity_token before_filter :save_para - # before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update] + before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update] before_filter :user_setup # before_filter :require_login, only: [:authorize] diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index b3d944f5..e7273b94 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -29,7 +29,7 @@ class ManagementsController < ApplicationController end def user_agents - @user_agents = UserAgent.where("user_agents.key is not null") + @user_agents = UserAgent.where("user_agents.key is not order by action_status, register_status") @agents_count = @user_agents.count limit = 20 @agents_pages = Paginator.new @agents_count, limit, params['page'] || 1 diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 251e6de7..bd850ac6 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -42,7 +42,9 @@ class WelcomeController < ApplicationController # 运营引流个人数据展示 def user_agents - @user_agents = UserAgent.where(key: params[:edu]) + @user_agents = UserAgent.where(key: params[:edu]).order("register_status desc, action_status desc") + @action_count = @user_agents.where(action_status: 2).count + @register_count = @user_agents.where(register_status: 2).count @agents_count = @user_agents.count limit = 20 @agents_pages = Paginator.new @agents_count, limit, params['page'] || 1 diff --git a/app/views/managements/_user_agent_list.html.erb b/app/views/managements/_user_agent_list.html.erb index 43886c8d..6b47e51c 100644 --- a/app/views/managements/_user_agent_list.html.erb +++ b/app/views/managements/_user_agent_list.html.erb @@ -4,9 +4,9 @@ 代理人登录名 代理人姓名 学校 + 用户注册状态 竞赛报名状态 ip - ip 负责人 @@ -19,9 +19,10 @@ <%= link_to ua.key, user_path(ua.key), :target => "_blank" %> <%= link_to user.try(:show_real_name), user_path(user), target:'_blank' %> <%= school.name %> - <%= "--" %> + <%= ua.action_status == 2 ? "代理之后注册" : "--" %> + <%= ua.register_status == 2 ? "代理之后报名" : "--" %> <%= ua.ip %> - <%= "理由" %> + "--" <% end %> diff --git a/app/views/managements/user_agents.html.erb b/app/views/managements/user_agents.html.erb index d29e7bec..a1e88ef0 100644 --- a/app/views/managements/user_agents.html.erb +++ b/app/views/managements/user_agents.html.erb @@ -1,19 +1,10 @@ -<%= form_tag(url_for(departments_part_managements_path),:id=>"department_part_search",:method => "post",:remote=>true) do %> -
- - 搜索 - 清除 - <%= link_to "关联代理人",add_departments_part_managements_path(),:class => "task-btn task-btn-green fr mt6 mr30" %> - -
-<% end %>
<%= render :partial => "managements/user_agent_list" %>
\ No newline at end of file diff --git a/app/views/welcome/_user_agent_list.html.erb b/app/views/welcome/_user_agent_list.html.erb index 607392bd..a4b048f6 100644 --- a/app/views/welcome/_user_agent_list.html.erb +++ b/app/views/welcome/_user_agent_list.html.erb @@ -1,6 +1,6 @@ - + diff --git a/app/views/welcome/user_agents.html.erb b/app/views/welcome/user_agents.html.erb index 4fe6649c..f81c537e 100644 --- a/app/views/welcome/user_agents.html.erb +++ b/app/views/welcome/user_agents.html.erb @@ -1,7 +1,6 @@
- 统计总计: - 引流总人数<%= @agents_count %>人, + 引流总人数:<%= @agents_count %>人 | 竞赛成功报名:<%= @action_count %>
ID序号 代理人登录名 代理人姓名 注册情况