Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

lib/bootstrap/css/bootstrap-submenu.css

@@ -2,7 +2,7 @@
   margin-left: 1px;
 }
 
-.dropdown-submenu .dropleft .dropdown-menu {
+.dropdown-submenu.dropleft .dropdown-menu {
   margin-right: 1px;
 }
 

web/users/html/login-ver.html

@@ -25,12 +25,12 @@
             <div class="">
             <div class="row  modal-auto-height">
                 <% for (const ver of versionData) { %>
-                        <div class="col-sm-6">
+                        <div class="col-sm-4 mb-4">
                             <div class="card card-block">
                                 <div class="card-body">
-                                    <h3 class="card-title"><%= ver.name %></h3>
-                                    <!--<p class="card-text"><%= ver.description ? ver.description : '介绍内容' %></p>-->
-                                    <a class="btn btn-primary" href="/boot/<%= ver._id.toString() %>">开始使用</a>
+                                    <h4 class="card-title d-flex justify-content-between"><%= ver.name %>
+                                        <a class="btn btn-sm btn-primary" href="/boot/<%= ver._id.toString() %>">开始使用</a></h4>
+                                    <p class="small mb-0 text-muted"><%= ver.description ? ver.description : '介绍内容' %></p>
                                 </div>
                             </div>
                         </div>

web/users/html/login.html

@@ -60,17 +60,17 @@
                 </div>
             </div>
         </form>
-        <div class="text-white fixed-bottom"><p class="text-center mb-1">Copyright © 2018 <a href="https://smartcost.com.cn" target="_blank" class="text-white">珠海纵横创新软件有限公司</a>.All Rights Reserved.<a class="text-white ml-2" href="http://www.miitbeian.gov.cn" target="_blank">粤ICP备14032472号</a>  
+        <div class="text-white fixed-bottom"><p class="text-center mb-1">Copyright © 2018 <a href="https://smartcost.com.cn" target="_blank" class="text-white">珠海纵横创新软件有限公司</a>.All Rights Reserved.<a class="text-white ml-2" href="http://www.miitbeian.gov.cn" target="_blank">粤ICP备14032472号</a>
           <% if (title == "纵横公路云造价") { %>
             <%include ../../common/html/dataStatistics_sc.html %>
           <% } else { %>
             <%include ../../common/html/dataStatistics.html %>
-          <% } %>      
+          <% } %>
         <small class="position-absolute mr-3 login-img-cr">Photo by <a class="text-white" href="https://www.pexels.com/@no-name-14543?utm_content=attributionCopyText&utm_medium=referral&utm_source=pexels" target="_blank">NO NAME</a> from <a class="text-white" href="https://www.pexels.com/photo/nature-sky-sunset-the-mountains-66997/?utm_content=attributionCopyText&utm_medium=referral&utm_source=pexels" target="_blank">Pexels</a></small></p></div>
     </div>
     <!--弹出信息-->
-    <div class="modal fade" id="ver" data-backdrop="static" style="top: 25%;">
-        <div class="modal-dialog modal-lg" role="document">
+    <div class="modal fade" id="ver" data-backdrop="static" style="">
+        <div class="modal-dialog modal-xl" role="document">
             <div class="modal-content compilation-content">
                 <div class="modal-header">
                     <h5 class="modal-title">选择编制办法</h5>

web/users/js/login.js

@@ -534,12 +534,13 @@ function cleanError() {
 function setVersion(versionData) {
     let html = '';
     for (let version of versionData) {
-        //let description = version.description ? version.description : '介绍内容';
-        let tmpHtml = '<div class="col-sm-4 mb-3">' +
+        let description = version.description ? version.description : '';
+        let tmpHtml = '<div class="col-sm-4 mb-4">' +
             '<div class="card card-block">' +
             '<div class="card-body">' +
-            '<h3 class="card-title">'+ version.name +'</h3>' +
-            '<a class="btn btn-primary" href="/boot/'+ version._id.toString() +'">开始使用</a>' +
+            '<h4 class="card-title d-flex justify-content-between">'+ version.name +
+            '<a class="btn btn-sm btn-primary" href="/boot/'+ version._id.toString() +'">开始使用</a></h4>' +
+            '<p class="small mb-0 text-muted">' + description + '</p>' +
             '</div>' +
             '</div>' +
             '</div>';