From 5e92a38af9e775e8be79cfcec76063ca9df61956 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Tue, 27 Aug 2019 10:41:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BB=A3=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=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 @@
 <table class="edu-pop-table edu-txt-center" cellspacing="0" cellpadding="0" style="table-layout: fixed;">
   <thead>
-  <th width="10%">ID</th>
+  <th width="10%">序号</th>
   <th width="15%">代理人登录名</th>
   <th width="15%">代理人姓名</th>
   <th width="20%">注册情况</th>