Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/views/admins/salesman_channels/index.html.erb

@@ -1,5 +1,5 @@
 <% define_admin_breadcrumbs do %>
-  <% add_admin_breadcrumb("#{@salesman.name}的渠道", admins_salesmans_path) %>
+  <% add_admin_breadcrumb("#{@salesman.name}跟踪的院校", admins_salesmans_path) %>
 <% end %>
 
 <% define_admin_breadcrumbs do %>
@@ -18,13 +18,13 @@
       </div>
 
     </div>
-    <%= text_field_tag :keyword, params[:keyword], placeholder: 'ID/单位名称检索', class: 'form-control mx-3 search-input' %>
+    <%= text_field_tag :keyword, params[:keyword], placeholder: 'ID/院校名称检索', class: 'form-control mx-3 search-input' %>
 
     <%= javascript_void_link '搜索', class: 'btn btn-primary search-btn', target: '' %>
     <input type="reset" class="btn btn-secondary clear-btn ml-3" value="清空"/>
   </form>
   <div class="flex-12">
-    <%= javascript_void_link '新增渠道', class: 'btn btn-primary', data: {toggle: 'modal', target: '.admin-add-salesman-channel-user-modal' } %>
+    <%= javascript_void_link '新增院校', class: 'btn btn-primary', data: {toggle: 'modal', target: '.admin-add-salesman-channel-user-modal' } %>
   </div>
 </div>
 

app/views/admins/salesman_channels/shared/_add_salesman_channels_user_modal.html.erb

@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-dialog-centered" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title">添加渠道</h5>
+        <h5 class="modal-title">添加院校</h5>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>

app/views/admins/salesman_customers/index.html.erb

@@ -1,10 +1,10 @@
 <% define_admin_breadcrumbs do %>
-  <% add_admin_breadcrumb("#{@salesman.name}的客户", admins_salesmans_path) %>
+  <% add_admin_breadcrumb("#{@salesman.name}跟踪的用户", admins_salesmans_path) %>
 <% end %>
 
 <div class="box search-form-container salesman-customer-list-form rig">
   <div class="flex-1">
-    <%= javascript_void_link '新增客户', class: 'btn btn-primary', data: {salesman_id: @salesman.id, toggle: 'modal', target: '.admin-add-salesman-customer-user-modal' } %>
+    <%= javascript_void_link '新增用户', class: 'btn btn-primary', data: {salesman_id: @salesman.id, toggle: 'modal', target: '.admin-add-salesman-customer-user-modal' } %>
   </div>
 </div>
 

app/views/admins/salesman_customers/shared/_add_salesman_customers_user_modal.html.erb

@@ -2,7 +2,7 @@
   <div class="modal-dialog modal-dialog-centered" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title">添加客户</h5>
+        <h5 class="modal-title">添加用户</h5>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>

app/views/admins/salesmans/shared/_list.html.erb

@@ -3,8 +3,8 @@
   <tr>
     <th width="6%">序号</th>
     <th width="20%" class="text-left">业务员</th>
-    <th width="30%" class="text-left">重点跟踪客户(点击数字客户列表)</th>
-    <th width="30%" class="text-left">重点跟踪院校(点击数字渠道列表)</th>
+    <th width="30%" class="text-left">重点用户跟踪(点击数字进入列表)</th>
+    <th width="30%" class="text-left">重点院校跟踪(点击数字进入列表)</th>
     <th width="14%">操作</th>
   </tr>
   </thead>
@@ -14,15 +14,15 @@
       <tr class="salesman-item salesman-item-<%= salesman.id %>">
         <td><%= index + 1 %></td>
         <td class="text-left">
-          <span><%= link_to salesman.name, admins_salesman_path(salesman), :title => salesman.name %></span>
+          <span><%= link_to salesman.name, users_path(salesman), :title => salesman.name %></span>
         </td>
         <td class="text-left">
           <span><%= link_to salesman.salesman_customers_count.to_i,
-                            admins_salesman_customers_path(salesman_id: salesman), :title => "点击进入客户列表" %></span>
+                            admins_salesman_customers_path(salesman_id: salesman), :title => "点击进入用户列表" %></span>
         </td>
         <td class="text-left">
           <span><%= link_to salesman.salesman_channels_count.to_i, admins_salesman_channels_path(salesman_id: salesman),
-                            :title => "点击进入渠道列表" %></span>
+                            :title => "点击进入院校列表" %></span>
         </td>
         <td>
           <%= delete_link '删除', admins_salesman_path(salesman, element: ".salesman-item-#{salesman.id}"),