From 4a168b75a3ae7fa2c3e706945219031dc1075eb3 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Mon, 26 Aug 2019 15:00:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=AD=E5=9B=BD=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ecloud_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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] From fca3e77467030ce30346a3fc96ad27bd36fb1cd4 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Tue, 27 Aug 2019 10:34:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E9=BB=84=E5=8F=B0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 2 +- app/views/managements/_user_agent_list.html.erb | 7 ++++--- app/views/managements/user_agents.html.erb | 11 +---------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index b018e38d..ea6b37dc 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/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 From 5e92a38af9e775e8be79cfcec76063ca9df61956 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Tue, 27 Aug 2019 10:41:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/welcome_controller.rb | 2 +- app/views/welcome/_user_agent_list.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 251e6de7..96fa6f36 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -42,7 +42,7 @@ 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") @agents_count = @user_agents.count limit = 20 @agents_pages = Paginator.new @agents_count, limit, params['page'] || 1 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 @@ - + From c331eaa60ac4800653c73b1df5a12a91adfd9f96 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Tue, 27 Aug 2019 10:51:48 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/welcome_controller.rb | 2 ++ app/views/welcome/user_agents.html.erb | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 96fa6f36..bd850ac6 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -43,6 +43,8 @@ class WelcomeController < ApplicationController # 运营引流个人数据展示 def user_agents @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/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 %>
From cd97b89fc212f4c07336b261b9fb4308515276e9 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 4 Sep 2019 16:07:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E6=A0=87=E7=AD=BE=E6=8F=90=E4=BE=9Btitle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/managements/_shixun_setting_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/managements/_shixun_setting_list.html.erb b/app/views/managements/_shixun_setting_list.html.erb index 98c3deae..bfe4f6c3 100644 --- a/app/views/managements/_shixun_setting_list.html.erb +++ b/app/views/managements/_shixun_setting_list.html.erb @@ -57,7 +57,7 @@ <% @shixun_tags.each do |tag| %>

data-shixun="<%= shixun.id %>" type="checkbox" class="select<%= count %> magic-checkbox" id="<%= count %>_<%= tag.name %>_<%= tag.id %>" value="<%= tag.name %>"/> - +

<% end %>
ID序号 代理人登录名 代理人姓名 注册情况