RubyGems - educode_sales - Versions diffs - 0.4.3 → 0.4.7 - Mend

educode_sales 0.4.3 → 0.4.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (85) hide show

data/app/views/layouts/educode_sales/application.html.erb CHANGED Viewed

@@ -13,7 +13,7 @@
 <body class="" id="body">
 <div class="layui-layout layui-layout-admin " >
   <div class="layui-header">
-    <div class="layui-logo layui-hide-xs layui-bg-black layuimini-logo">
+    <div class="layui-hide-xs layui-bg-black layuimini-logo layui-logo">
       <%= image_tag "educode_sales/logo.png", class: 'header-logo' %>
       <span class="app-title">营销系统</span>
     </div>
@@ -24,7 +24,7 @@
       </li>
     </ul>
     <ul class="layui-nav layui-layout-right">
-      <li class="layui-nav-item layui-hide layui-show-md-inline-block">
+      <li class="layui-nav-item layui-hide layui-show-md-inline-block" id="logout">
         <a href="javascript:;">
           <%= image_tag "/images/#{url_to_avatar(@current_admin.user)}", class: 'layui-nav-img' %>
           <%= @current_admin.user.real_name %>
@@ -43,66 +43,67 @@
   </div>
   <div class="layui-side layui-bg-black">
-    <div class="layui-side-scroll">
+    <div class="layui-side-scroll ">
       <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
-      <ul class="layui-nav layui-nav-tree" lay-filter="test">
-        <li class="layui-nav-item layui-nav-itemed">
-          <a class="" href="javascript:;"><b><i class="layui-icon layui-icon-template-1" style="font-size: 25px;  padding-right: 20px"></i>销售活动</b></a>
+      <ul class="layui-nav layui-nav-tree ul"
+          lay-filter="test">
+        <li class="layui-nav-item layui-nav-itemed menu-li" >
+          <a class="" href="javascript:;"><b><%= image_tag "educode_sales/1.销售活动.png",size:"15"%><i style="padding-right: 25px"></i>销售活动</b></a>
           <dl class="layui-nav-child">
             <% if can? :trends, EducodeSales::SaleTrend %>
               <dd>
-                <a href="/missions/sale_trends/trends" class="<%= current?('layui-this', trends_sale_trends_path) %>"><i class="layui-icon layui-icon-chart-screen" style="font-size: 25px;  padding-right: 20px"></i>市场态势</a>
+                <a href="/missions/sale_trends/trends" class="<%= current?('layui-this', trends_sale_trends_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/2.市场态势.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>销售态势</a>
               </dd>
             <% end %>
             <% if can? :sales, EducodeSales::Staff %>
-              <dd><a href="/missions/sales" class="<%= current?('layui-this', sales_path) %>"><i class="layui-icon  layui-icon-username" style="font-size: 25px;  padding-right: 20px"></i>销售分工</a>
+              <dd><a href="/missions/sales" class="<%= current?('layui-this', sales_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/3.销售分工.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售分工</a>
               </dd>
             <% end %>
             <% if can? :read, EducodeSales::Business %>
-              <dd><a href="/missions/businesses" class="<%= current?('layui-this', businesses_path) %>"><i class="layui-icon layui-icon-component" style="font-size: 25px;  padding-right: 20px"></i>商机管理</a>
+              <dd><a href="/missions/businesses" class="<%= current?('layui-this', businesses_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>商机管理</a>
               </dd>
             <% end %>
             <% if can? :read, EducodeSales::Place %>
-              <dd><a href="/missions/places" class="<%= current?('layui-this', places_path) %>"><i class="layui-icon layui-icon-tabs" style="font-size: 25px;  padding-right: 20px"></i>渠道管理</a></dd>
+              <dd><a href="/missions/places" class="<%= current?('layui-this', places_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/5.渠道管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>渠道管理</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::SalePlan %>
-              <dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>"><i class="layui-icon layui-icon-form" style="font-size: 25px;  padding-right: 20px"></i>销售计划</a></dd>
+              <dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/6.销售计划.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售计划</a></dd>
             <% end %>
           </dl>
         </li>
-        <li class="layui-nav-item layui-nav-itemed">
-          <a class="" href="javascript:;"><b><i class="layui-icon layui-icon-app" style="font-size: 25px;  padding-right: 20px"></i>运营活动</b></a>
+        <li class="layui-nav-item layui-nav-itemed menu-li">
+          <a class="" href="javascript:;"><b><%= image_tag "educode_sales/7.运营活动.png",size:"15"%><i  style="font-size: 25px;  padding-right: 25px"></i>运营活动</b></a>
           <dl class="layui-nav-child">
             <% if can? :read, EducodeSales::OperationTrend %>
               <dd>
-                <a href="/missions/operations/trends" class="<%= current?('layui-this', trends_operations_path) %>"><i class="layui-icon  layui-icon-chart" style="font-size: 25px;  padding-right: 20px"></i>运营态势</a>
+                <a href="/missions/operations/trends" class="<%= current?('layui-this', trends_operations_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/8.运营态势.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>运营态势</a>
               </dd>
             <% end %>
             <% if can? :operations, EducodeSales::Staff %>
               <dd>
-                <a href="/missions/sales/operations" class="<%= current?('layui-this', operations_sales_path) %>"><i class="layui-icon layui-icon-friends" style="font-size: 25px;  padding-right: 20px"></i>运营分工</a>
+                <a href="/missions/sales/operations" class="<%= current?('layui-this', operations_sales_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/9.运营分工.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>运营分工</a>
               </dd>
             <% end %>
             <% if can? :read, EducodeSales::Teacher %>
-              <dd><a href="/missions/teachers" class="<%= current?('layui-this', teachers_path) %>"><i class="layui-icon layui-icon-release" style="font-size: 25px;  padding-right: 20px"></i>教师运营</a></dd>
+              <dd><a href="/missions/teachers" class="<%= current?('layui-this', teachers_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/10.教师运营.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>教师运营</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::Activity %>
-              <dd><a href="/missions/activities" class="<%= current?('layui-this', activities_path) %>"><i class="layui-icon layui-icon-engine" style="font-size: 25px;  padding-right: 20px"></i>活动运营</a></dd>
+              <dd><a href="/missions/activities" class="<%= current?('layui-this', activities_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/11.活动运营.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>活动运营</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::OperationPlan %>
               <dd>
-                <a href="/missions/operation_plans" class="<%= current?('layui-this', operation_plans_path) %>"><i class="layui-icon layui-icon-log" style="font-size: 25px;  padding-right: 20px"></i>运营计划</a>
+                <a href="/missions/operation_plans" class="<%= current?('layui-this', operation_plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/12.运营计划.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>运营计划</a>
               </dd>
             <% end %>
           </dl>
         </li>
         <% if @current_admin.is_admin %>
-          <li class="layui-nav-item layui-nav-itemed">
-            <a class="" href="javascript:;"><b><i class="layui-icon layui-icon-set-sm" style="font-size: 25px;  padding-right: 20px"></i>系统设置</b></a>
+          <li class="layui-nav-item layui-nav-itemed menu-li">
+            <a class="" href="javascript:;"><b><%= image_tag "educode_sales/13.系统设置.png",size:"15"%><i  style="font-size: 25px;  padding-right: 25px"></i>系统设置</b></a>
             <dl class="layui-nav-child">
-              <dd><a href="/missions/roles" class="<%= current?('layui-this', roles_path) %>"><i class="layui-icon layui-icon-username" style="font-size: 25px;  padding-right: 20px"></i>角色管理</a></dd>
-              <dd><a href="/missions/staffs" class="<%= current?('layui-this', staffs_path) %>"><i class="layui-icon layui-icon-user" style="font-size: 25px;  padding-right: 20px"></i>人员管理</a></dd>
-              <dd><a href="/missions/commons" class="<%= current?('layui-this', commons_path) %>"><i class="layui-icon layui-icon-file" style="font-size: 25px;  padding-right: 20px"></i>字典列表</a></dd>
+              <dd><a href="/missions/roles" class="<%= current?('layui-this', roles_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/14.角色管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>角色管理</a></dd>
+              <dd><a href="/missions/staffs" class="<%= current?('layui-this', staffs_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/15.人员管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>人员管理</a></dd>
+              <dd><a href="/missions/commons" class="<%= current?('layui-this', commons_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/16.字典列表.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>字典列表</a></dd>
             </dl>
           </li>
         <% end %>
@@ -127,6 +128,17 @@
 </body>
 </html>
 <script type="text/javascript" charset="utf-8">
+//  if(true){
+//      var $ = layui.jquery;
+//      var body = $("#body");
+//      var btn = $("#leftEnumIcon");
+//      $(".layui-nav-item").removeClass('layui-nav-itemed')
+//      btn.removeClass('layui-icon-shrink-right').addClass('layui-icon-spread-left');
+//      body.addClass('layuimini-mini');
+//      $(".i_class").animate({left: '60px'});
+//  }
     //头部事件
     layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
         var $ = layui.jquery,
@@ -134,11 +146,17 @@
             table = layui.table,
             request = layui.request,
             util = layui.util,
-            miniPage = layui.miniPage;
+            layer = layui.layer,
+            miniMenu = layui.miniMenu,
+            miniTheme = layui.miniTheme,
+            element = layui.element ,
+            miniTab = layui.miniTab;
+        miniPage = layui.miniPage;
+            $ = layui.jquery;
         util.event('lay-header-event', {  //util 记得 声明 var util = layui.util
             //左侧菜单事件
             menuLeft: function (othis) {
+                var li = $(".li")
                 var body = $("#body");
                 var btn = $("#leftEnumIcon");
                 if (btn.hasClass('layui-icon-shrink-right')) {
@@ -161,36 +179,85 @@
                         if (!btn.hasClass('btn-index')) {
                             if (btn.hasClass('layui-icon-spread-left')) {
                                 menuHide(btn);
                             }
                         }
                     }
                 });
                 function menuShow(btn) {
+                    try {
+                        layer.close(window.openTips);
+                    } catch (e) {
+                        console.log(e.message);
+                    }
                     btn.removeClass('layui-icon-spread-left').addClass('layui-icon-shrink-right');
                     body.removeClass('layuimini-mini')
-                    $(".i_class").animate({left: '200px'});
-                    // $(".zq-logo").animate({width: 'toggle'});
-                    // $(".layui-body").animate({left: '200px'});
-                    // $(".layui-footer").animate({left: '200px'});
+                    $(".i_class").animate({left: '200px'},"fast");
+                    $(".layui-nav-item").addClass('layui-nav-itemed')
+                    $("#logout").removeClass('layui-nav-itemed')
                 }
                 function menuHide(btn) {
+                    $(".layui-nav-item").removeClass('layui-nav-itemed')
                     btn.removeClass('layui-icon-shrink-right').addClass('layui-icon-spread-left');
                     body.addClass('layuimini-mini');
-                    // $(".layui-side").animate({width: '50px'}); //toggle如果原来div是隐藏的就会把元素显示，如果原来是显示则隐藏
                     $(".i_class").animate({left: '60px'});
-                    // $(".layui-body").animate({left: '0px'});
-                    // $(".layui-footer").animate({left: '0px'});
                 }
             }
         });
+        $(document).ready(function() {
+            var btn = $("#leftEnumIcon");
+            $("body").on("mouseenter", ".menu-li", function () {
+                    tips = $(this).prop("innerHTML")
+                    flag = btn.hasClass('layui-icon-spread-left')
+                if (flag && tips) {
+                    tips = "<ul class='ul-down layuimini-menu-left-zoom layui-nav layui-nav-tree layui-this' style='width: 170px'><li class='layui-nav-item layui-nav-itemed'>"+tips+"</li></ul>" ;
+                    window.openTips = layer.tips(tips, $(this), {
+                        tips: [2, '#2f4056'],
+                        time: 300000,
+                        skin:"popup-tips",
+                        success:function (el) {
+                            var left = $(el).position().left - 150 ;
+                            $(el).css({ left:left});
+                            element.render();
+                        }
+                    });
+                }
+            });
+            $("body").on("mouseleave", ".layui-nav-child", function () {
+                    try {
+                        layer.close(window.openTips);
+                    } catch (e) {
+                        console.log(e.message);
+                    }
+            });
+            $("body").on("mouseenter", ".layui-body", function () {
+                    try {
+                        layer.close(window.openTips);
+                    } catch (e) {
+                        console.log(e.message);
+                    }
+            });
+        })
     });
 </script>
 <style>
+    .layuimini-mini .ul .layui-nav-child{
+        display: none;!important;
+    }
+    .ul-down .layui-icon-down{
+        display: none;!important;
+    }
 </style>

data/config/routes.rb CHANGED Viewed

@@ -7,6 +7,7 @@ EducodeSales::Engine.routes.draw do
   get :search_users, to: "home#search_users"
   get :search_teacher, to: "home#search_teacher"
   get :search_edu_teacher,to: "home#search_edu_teacher"
+  get :search_operation_teacher,to: "home#search_operation_teacher"
   get :search, to: "home#search"
   get :no_permission, to: "home#no_permission"
   get :sales_staff, to: "home#sales_staff"

data/db/migrate/20211022085324_add_teacher_used_to_teachers.rb ADDED Viewed

@@ -0,0 +1,7 @@
+class AddTeacherUsedToTeachers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_teachers, :teacher_used, :integer, default: 0
+    add_column :educode_sales_teachers, :students_count, :integer, default: 0
+    add_column :educode_sales_teachers, :courses_count, :integer, default: 0
+  end
+end

data/lib/educode_sales/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.4.3'
+  VERSION = '0.4.7'
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.7
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -82,11 +82,28 @@ files:
 - app/assets/fonts/iconfont.ttf
 - app/assets/fonts/iconfont.woff
 - app/assets/fonts/iconfont.woff2
+- app/assets/images/educode_sales/1.销售活动.png
+- app/assets/images/educode_sales/10.教师运营.png
+- app/assets/images/educode_sales/11.活动运营.png
+- app/assets/images/educode_sales/12.运营计划.png
+- app/assets/images/educode_sales/13.系统设置.png
+- app/assets/images/educode_sales/14.角色管理.png
+- app/assets/images/educode_sales/15.人员管理.png
+- app/assets/images/educode_sales/16.字典列表.png
+- app/assets/images/educode_sales/2.市场态势.png
+- app/assets/images/educode_sales/3.销售分工.png
+- app/assets/images/educode_sales/4.商机管理.png
+- app/assets/images/educode_sales/5.渠道管理.png
+- app/assets/images/educode_sales/6.销售计划.png
+- app/assets/images/educode_sales/7.运营活动.png
+- app/assets/images/educode_sales/8.运营态势.png
+- app/assets/images/educode_sales/9.运营分工.png
+- app/assets/images/educode_sales/a.png
 - app/assets/images/educode_sales/favicon.ico
 - app/assets/images/educode_sales/icon-ext.png
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
-- app/assets/images/educode_sales/indexlogo.png
+- app/assets/images/educode_sales/indexLogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -200,6 +217,7 @@ files:
 - app/views/educode_sales/home/sales_staff.json.jbuilder
 - app/views/educode_sales/home/search.json.jbuilder
 - app/views/educode_sales/home/search_edu_teacher.json.jbuilder
+- app/views/educode_sales/home/search_operation_teacher.json.jbuilder
 - app/views/educode_sales/home/search_teacher.json.jbuilder
 - app/views/educode_sales/home/search_users.json.jbuilder
 - app/views/educode_sales/home/statistics.html.erb
@@ -334,6 +352,7 @@ files:
 - db/migrate/20211009063423_add_source_businesses.rb
 - db/migrate/20211013060712_create_educode_sales_assign_follow_ups.rb
 - db/migrate/20211018054256_add_extras_to_commons.rb
+- db/migrate/20211022085324_add_teacher_used_to_teachers.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb

data/app/assets/images/educode_sales/indexlogo.png DELETED Viewed

Binary file