educode_sales 0.9.80 → 0.9.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 395f66b5ef943bc9225deabd8c08878c41fc4c557107f1728c97e4db077950d0
-  data.tar.gz: c359c0122a4889fb641d8a7ced439aec7e2110db21edae0944cb33fc82b95fb3
+  metadata.gz: 2a02f50d9c3e88bb55ba6352183871b6e80eaabd42e2f32640043cc140255560
+  data.tar.gz: 6fd1ff6c5df5d5b53c72399e370c0c15bb37da1fae1e8a6f1bd626da81d8ddf1
 SHA512:
-  metadata.gz: 62eb2a7d7487db2adf78a544af31aae449c76026f5d29fd366a56b6ad96a25c47d3adcc3c30a1a9cc7ec0b9a53a9cca82ee5f9241ee5555d575c8bab1ac2b183
-  data.tar.gz: 9fe50dbd0b57e981e65976cef26a2ed96f69b09aa07df4c6ce15e6e97bf02caf23e960eb922266b32d32cde40cfdaa60795702cbdf2db8b96f1e337825a16087
+  metadata.gz: a41df2eb05cc02587e6c4d4fa800b5e1048f01f3e1c53498c2f6dc61d1dbd6bcf13188eeab9d0e14d0b0da4f52f553b593ad1f4394613c416f4fa89caec3c9d5
+  data.tar.gz: 04a3399b18c8cb0b62c016591be00a668996b5c4a62434ab913d511564ea1cb7666e2af1a2197c9fd8dcaef85e7292a5c6c2d473105f379d8868fb8d0abaabc5

data/app/controllers/educode_sales/businesses_controller.rb

@@ -315,6 +315,8 @@ module EducodeSales
              
           end
 
+          @business_count = @businesses.distinct.count
+          
           if params[:sort].present? && params[:sort][:field]
             if params[:sort][:field] == "service_end_time"
               @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")
@@ -325,7 +327,6 @@ module EducodeSales
             @businesses = @businesses.order("educode_sales_businesses.created_at desc")
           end
 
-          @business_count = @businesses.distinct.count
           # mysql -select
           watch_sql = " "
           unless @current_admin.is_admin?

data/app/views/educode_sales/contracts/_list.html.erb

@@ -113,7 +113,11 @@
 
 </script>
 
-
+<script type="text/html" id="toolbar_contract">
+  <div class="layui-btn-container">
+    <span class="table-label">合同列表</span>
+  </div>
+</script>
 <script>
   layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown','laytpl', 'xmSelect'], function () {
       var $ = layui.jquery,
@@ -441,15 +445,15 @@
       return false;
     });
       var business_table = table.render({
-          elem: '#contact_table',
-          url: '/missions/contracts',
-          autoSort: false,
-          where: {q: data},
-          defaultToolbar: ['filter'],
-          title: '合同数据表',
-          totalRow: true,//开启合并行
-          cols: cols_table,
-
+        elem: '#contact_table',
+        url: '/missions/contracts',
+        autoSort: false,
+        where: {q: data},
+        defaultToolbar: ['filter'],
+        title: '合同数据表',
+        totalRow: true,//开启合并行
+        cols: cols_table,
+        toolbar: '#toolbar_contract',
         limit: 20,
         limits: [10,15,20,30,40,50,60,70,80,90],
         page: true,

data/app/views/layouts/educode_sales/login.html.erb

@@ -16,5 +16,5 @@
   <%= yield %>
 </div>
 <div class="footer">
-  ©版权所有 <%= Time.now.year %> 头歌<span class="padding-5">|</span><a target="_blank" href="http://www.educoder.net">头歌官网</a>
+  ©版权所有 <%= Time.now.year %> 头歌<span class="padding-5">|</span><a target="_blank" href="http://www.educoder.net">头歌官方网站</a>
 </div>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.80'
+  VERSION = '0.9.81'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.80
+  version: 0.9.81
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - 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
@@ -670,7 +671,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -685,8 +686,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []