文件更新

1. 替换 js\jquery\jquery.min.js 为 jquery-3.2.1.slim.min.js
1. 移除 js\tether 新增 js\popper
2. 更新 js\bootstrap\bootstrap.min.js
3. 更新 css\bootstrap\bootstrap.min.css

类名
1. .navbar-toggleable 替换为 .navbar-expand 所有navbar受影响
2. .bg-faded 替换为 .bg-light 顶部navbar受影响
3. 造价书 列设置 父级 div 增加  class="tools-btn"；解决 清单规则与定额库Tab margin-bottom：-1px 无效 导致下边线无法隐藏
4. 账号信息下拉按钮组，<div class="float-lg-right navbar-text pt-0">  “pt-0” 修改为 "pt-0" 解决LOGO 多余的1px
5. 账号信息下拉按钮组，<div class="dropdown d-inline-block">  增加 class "navbar-nav" 为<div class="dropdown d-inline-block navbar-nav"> 解决下拉菜单右对齐
6.  login-infoinput.html   ，"card-block" 替换 为"card-body"
7.  login-infoinput.html   ，"col-lg-8 offset-lg-2" 替换 为"col-lg-8 m-auto"
8. user-buy.html ，"card-block" 替换 为"card-body"
9. user-buy.html ，"push-lg-8" 替换 为"ml-auto"  "push-lg-10" 替换 为"ml-auto"
10. baobiao.html, 格式 弹窗内 粗体斜体下划线按钮 "btn-secondary" 替换为 "btn-outline-secondary"

baobiao.html

@@ -22,11 +22,11 @@
                 <strong>Warning!</strong> Better check yourself, you're not looking too good.
             </div>
         </div> -->
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
+        <nav class="navbar navbar-expand-lg navbar-light bg-light p-0 justify-content-between">
             <span class="header-logo px-2">Smartcost</span>
             <div class="navbar-text"><a href="project-management.html">项目管理</a><i class="fa fa-angle-right fa-fw"></i>文件夹<i class="fa fa-angle-right fa-fw"></i>建设项目<i class="fa fa-angle-right fa-fw"></i>单项工程<i class="fa fa-angle-right fa-fw"></i>单位工程</div>
-            <div class="float-lg-right navbar-text pt-0">
-                <div class="dropdown d-inline-block">
+            <div class="float-lg-right navbar-text p-0">
+                <div class="dropdown d-inline-block navbar-nav">
                     <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
                     <div class="dropdown-menu dropdown-menu-right">
                         <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
@@ -40,7 +40,7 @@
                 <button class="btn btn-link btn-sm">注销</button>
             </div>
         </nav>
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
+        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
             <ul class="nav navbar-nav px-1">
                 <li class="nav-item">
                     <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cube"></i> 项目属性</a>
@@ -143,7 +143,7 @@
                           <div class="panel-body">
                             <div class="btn-group" role="group">
                               <button type="button" class="btn btn-secondary btn-sm">-</button>
-                              <a class="btn btn-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="重置默认大小">1000%</a>
+                              <button class="btn btn-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="重置默认大小">1000%</button>
                               <button type="button" class="btn btn-secondary btn-sm">+</button>
                             </div>
                           </div>
@@ -165,7 +165,7 @@
                       </div>
                     </div>
                   </div>
-                    <div class="print-view poj-list">
+                    <div class="print-view form-view">
                       <div class="pageContainer">
                         <div class="page">
                           <img src="img/baobiao.png">
@@ -311,9 +311,9 @@
                         <select class="form-control form-control-sm"><option>20</option></select>
                       </div>
                       <div class="col-3">
-                        <a href="" class="btn btn-sm btn-secondary" title="加粗"><i class="fa fa-bold"></i></a>
-                        <a href="" class="btn btn-sm btn-secondary" title="斜体"><i class="fa fa-italic"></i></a>
-                        <a href="" class="btn btn-sm btn-secondary" title="下划线"><i class="fa fa-underline"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="加粗"><i class="fa fa-bold"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="斜体"><i class="fa fa-italic"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="下划线"><i class="fa fa-underline"></i></a>
                       </div>
                     </div>
                     <div class="row mb-1">
@@ -327,9 +327,9 @@
                         <select class="form-control form-control-sm"><option>20</option></select>
                       </div>
                       <div class="col-3">
-                        <a href="" class="btn btn-sm btn-secondary active" title="加粗"><i class="fa fa-bold"></i></a>
-                        <a href="" class="btn btn-sm btn-secondary" title="斜体"><i class="fa fa-italic"></i></a>
-                        <a href="" class="btn btn-sm btn-secondary" title="下划线"><i class="fa fa-underline"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary active" title="加粗"><i class="fa fa-bold"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="斜体"><i class="fa fa-italic"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="下划线"><i class="fa fa-underline"></i></a>
                       </div>
                     </div>
                     <div class="row mb-1">
@@ -343,9 +343,9 @@
                         <select class="form-control form-control-sm"><option>20</option></select>
                       </div>
                       <div class="col-3">
-                        <a href="" class="btn btn-sm btn-secondary" title="加粗"><i class="fa fa-bold"></i></a>
-                        <a href="" class="btn btn-sm btn-secondary active" title="斜体"><i class="fa fa-italic"></i></a>
-                        <a href="" class="btn btn-sm btn-secondary" title="下划线"><i class="fa fa-underline"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="加粗"><i class="fa fa-bold"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary active" title="斜体"><i class="fa fa-italic"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="下划线"><i class="fa fa-underline"></i></a>
                       </div>
                     </div>
                     <div class="row mb-1">
@@ -359,9 +359,9 @@
                         <select class="form-control form-control-sm"><option>20</option></select>
                       </div>
                       <div class="col-3">
-                        <a href="" class="btn btn-sm btn-secondary" title="加粗"><i class="fa fa-bold"></i></a>
-                        <a href="" class="btn btn-sm btn-secondary" title="斜体"><i class="fa fa-italic"></i></a>
-                        <a href="" class="btn btn-sm btn-secondary active" title="下划线"><i class="fa fa-underline"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="加粗"><i class="fa fa-bold"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="斜体"><i class="fa fa-italic"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary active" title="下划线"><i class="fa fa-underline"></i></a>
                       </div>
                     </div>
                     <div class="row mb-1">
@@ -375,9 +375,9 @@
                         <select class="form-control form-control-sm"><option>20</option></select>
                       </div>
                       <div class="col-3">
-                        <a href="" class="btn btn-sm btn-secondary" title="加粗"><i class="fa fa-bold"></i></a>
-                        <a href="" class="btn btn-sm btn-secondary" title="斜体"><i class="fa fa-italic"></i></a>
-                        <a href="" class="btn btn-sm btn-secondary" title="下划线"><i class="fa fa-underline"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="加粗"><i class="fa fa-bold"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="斜体"><i class="fa fa-italic"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="下划线"><i class="fa fa-underline"></i></a>
                       </div>
                     </div>
                     <div class="row mb-1">
@@ -391,9 +391,9 @@
                         <select class="form-control form-control-sm"><option>20</option></select>
                       </div>
                       <div class="col-3">
-                        <a href="" class="btn btn-sm btn-secondary" title="加粗"><i class="fa fa-bold"></i></a>
-                        <a href="" class="btn btn-sm btn-secondary" title="斜体"><i class="fa fa-italic"></i></a>
-                        <a href="" class="btn btn-sm btn-secondary" title="下划线"><i class="fa fa-underline"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="加粗"><i class="fa fa-bold"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="斜体"><i class="fa fa-italic"></i></a>
+                        <a href="" class="btn btn-sm btn-outline-secondary" title="下划线"><i class="fa fa-underline"></i></a>
                       </div>
                     </div>
                     <div class="row mb-1">
@@ -490,8 +490,8 @@
           </div>
       </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
     <!-- zTree -->

feilv.html

@@ -21,11 +21,11 @@
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
             </div>
         </div> -->
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
+        <nav class="navbar navbar-expand-lg bg-light bg-faded p-0 justify-content-between">
             <span class="header-logo px-2">Smartcost</span>
             <div class="navbar-text"><a href="project-management.html">项目管理</a><i class="fa fa-angle-right fa-fw"></i>文件夹<i class="fa fa-angle-right fa-fw"></i>建设项目<i class="fa fa-angle-right fa-fw"></i>单项工程<i class="fa fa-angle-right fa-fw"></i>单位工程</div>
-            <div class="float-lg-right navbar-text pt-0">
-                <div class="dropdown d-inline-block">
+            <div class="float-lg-right navbar-text p-0">
+                <div class="dropdown d-inline-block navbar-nav">
                     <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
                     <div class="dropdown-menu dropdown-menu-right">
                         <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
@@ -39,7 +39,7 @@
                 <button class="btn btn-link btn-sm">注销</button>
             </div>
         </nav>
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
+        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
             <ul class="nav navbar-nav px-1">
                 <li class="nav-item">
                     <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cube"></i> 项目属性</a>
@@ -319,8 +319,8 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
 </body>

gongliaoji.html

@@ -21,11 +21,11 @@
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
             </div>
         </div> -->
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
+        <nav class="navbar navbar-expand-lg bg-light bg-faded p-0 justify-content-between">
             <span class="header-logo px-2">Smartcost</span>
             <div class="navbar-text"><a href="project-management.html">项目管理</a><i class="fa fa-angle-right fa-fw"></i>文件夹<i class="fa fa-angle-right fa-fw"></i>建设项目<i class="fa fa-angle-right fa-fw"></i>单项工程<i class="fa fa-angle-right fa-fw"></i>单位工程</div>
-            <div class="float-lg-right navbar-text pt-0">
-                <div class="dropdown d-inline-block">
+            <div class="float-lg-right navbar-text p-0">
+                <div class="dropdown d-inline-block navbar-nav">
                     <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
                     <div class="dropdown-menu dropdown-menu-right">
                         <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
@@ -39,7 +39,7 @@
                 <button class="btn btn-link btn-sm">注销</button>
             </div>
         </nav>
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
+        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
             <ul class="nav navbar-nav px-1">
                 <li class="nav-item">
                     <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cube"></i> 项目属性</a>
@@ -261,8 +261,8 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
 </body>

jisuanchengxu.html

@@ -21,11 +21,11 @@
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
             </div>
         </div> -->
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
+        <nav class="navbar navbar-expand-lg bg-light bg-faded p-0 justify-content-between">
             <span class="header-logo px-2">Smartcost</span>
             <div class="navbar-text"><a href="project-management.html">项目管理</a><i class="fa fa-angle-right fa-fw"></i>文件夹<i class="fa fa-angle-right fa-fw"></i>建设项目<i class="fa fa-angle-right fa-fw"></i>单项工程<i class="fa fa-angle-right fa-fw"></i>单位工程</div>
-            <div class="float-lg-right navbar-text pt-0">
-                <div class="dropdown d-inline-block">
+            <div class="float-lg-right navbar-text p-0">
+                <div class="dropdown d-inline-block navbar-nav">
                     <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
                     <div class="dropdown-menu dropdown-menu-right">
                         <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
@@ -39,7 +39,7 @@
                 <button class="btn btn-link btn-sm">注销</button>
             </div>
         </nav>
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
+        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
             <ul class="nav navbar-nav px-1">
                 <li class="nav-item">
                     <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cube"></i> 项目属性</a>
@@ -197,8 +197,8 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
 </body>

login-infoinput.html

@@ -13,10 +13,10 @@
 
 <body>
     <div class="header">
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
+        <nav class="navbar navbar-expand-lg bg-light bg-faded p-0 justify-content-between">
             <span class="header-logo px-2">Smartcost</span>
-            <div class="float-lg-right navbar-text pt-0">
-                <div class=" d-inline-block">
+            <div class="float-lg-right navbar-text p-0">
+                <div class=" d-inline-block navbar-nav">
                     <button class="btn btn-link btn-sm " type="button">15812644017</button>
                 </div>
                 <span class="btn btn-link btn-sm new-msg">
@@ -28,13 +28,13 @@
     </div>
     <div class="container mt-3">
         <div class="row">
-            <div class="col-lg-8 offset-lg-2">
+            <div class="col-lg-8 m-auto">
                 <div class="card newuser-input">
-                    <div class="card-block">
+                    <div class="card-body">
                         <h4 class="card-title">在开始使用前，请填写以下信息。</h4>
                         <h6 class="card-subtitle text-muted">详细填写这些信息，可以让我们更好的服务您。</h6>
                     </div>
-                    <div class="card-block">
+                    <div class="card-body">
                             <div class="form-group">
                                 <input class="form-control" placeholder="你的姓名" required="" autofocus="">
                             </div>
@@ -78,8 +78,8 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
 </body>

login-welcome.html

@@ -13,9 +13,9 @@
 
 <body>
     <div class="header">
-      <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
+      <nav class="navbar navbar-expand-lg bg-light bg-faded p-0 justify-content-between">
       <span class="header-logo px-2">Smartcost</span>
-      <div class="navbar-text pt-0">
+      <div class="navbar-text p-0">
           <div class="dropdown d-inline-block">
               <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
               <div class="dropdown-menu dropdown-menu-right">
@@ -30,7 +30,7 @@
           <button class="btn btn-link btn-sm">注销</button>
       </div>
     </nav>
-      <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
+      <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
         <ul class="nav navbar-nav px-1">
             <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" href="http://example.com" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">文件</a>
@@ -283,8 +283,8 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
 </body>

login.html

@@ -82,8 +82,8 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
 </body>

main.html

@@ -23,10 +23,10 @@
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
             </div>
         </div> -->
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
+        <nav class="navbar navbar-expand-lg bg-light bg-faded p-0 justify-content-between">
             <span class="header-logo px-2">Smartcost</span>
             <div class="navbar-text"><a href="project-management.html">项目管理</a><i class="fa fa-angle-right fa-fw"></i>文件夹<i class="fa fa-angle-right fa-fw"></i>建设项目<i class="fa fa-angle-right fa-fw"></i>单项工程<i class="fa fa-angle-right fa-fw"></i>单位工程</div>
-            <div class="float-lg-right navbar-text pt-0">
+            <div class="float-lg-right navbar-text p-0">
                 <div class="dropdown d-inline-block">
                     <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
                     <div class="dropdown-menu dropdown-menu-right">
@@ -41,7 +41,7 @@
                 <button class="btn btn-link btn-sm">注销</button>
             </div>
         </nav>
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
+        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
             <ul class="nav navbar-nav px-1">
                 <li class="nav-item">
                     <a class="nav-link" href="#" aria-haspopup="true" aria-expanded="false"><i class="fa fa-sliders"></i> 选项</a>
@@ -102,8 +102,8 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
     <!--报表 zTree -->

project-management.html

@@ -23,10 +23,10 @@
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
             </div>
         </div>
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
+        <nav class="navbar navbar-expand-lg bg-light bg-faded p-0 justify-content-between">
           <span class="header-logo px-2">Smartcost</span>
-          <div class="navbar-text pt-0">
-              <div class="dropdown d-inline-block">
+          <div class="navbar-text p-0">
+              <div class="dropdown d-inline-block navbar-nav">
                   <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
                   <div class="dropdown-menu dropdown-menu-right">
                       <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
@@ -40,7 +40,7 @@
               <button class="btn btn-link btn-sm">注销</button>
           </div>
         </nav>
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
+        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
             <ul class="nav navbar-nav px-1">
                 <li class="nav-item">
                     <a class="nav-link" href="#" aria-haspopup="true" aria-expanded="false"><i class="fa fa-sliders"></i> 选项</a>
@@ -717,8 +717,8 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
     <!-- zTree -->

tools-gongliaoji.html

@@ -22,10 +22,10 @@
                 <strong>Warning!</strong> Better check yourself, you're not looking too good.
             </div>
         </div> -->
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
+        <nav class="navbar navbar-expand-lg ng-light bg-faded p-0 justify-content-between">
             <span class="header-logo px-2">Smartcost</span>
             <div class="navbar-text"><a href="project-management.html">项目管理</a></div>
-            <div class="float-lg-right navbar-text pt-0">
+            <div class="float-lg-right navbar-text p-0">
                 <div class="dropdown d-inline-block">
                     <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
                     <div class="dropdown-menu dropdown-menu-right">
@@ -40,7 +40,7 @@
                 <button class="btn btn-link btn-sm">注销</button>
             </div>
         </nav>
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
+        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
             <ul class="nav navbar-nav px-1">
                 <li class="nav-item">
                     <a class="nav-link" href="#" aria-expanded="false"><i class="fa fa-sliders"></i> 选项</a>
@@ -243,8 +243,8 @@
           </div>
       </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
     <!-- zTree -->

user-buy.html

@@ -21,10 +21,10 @@
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
             </div>
         </div> -->
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
+        <nav class="navbar navbar-expand-lg bg-light bg-faded p-0 justify-content-between">
             <span class="header-logo px-2">Smartcost</span>
             <div class="navbar-text"><a href="project-management.html">项目管理</a></div>
-            <div class="float-lg-right navbar-text pt-0">
+            <div class="float-lg-right navbar-text p-0">
                 <div class="dropdown d-inline-block">
                     <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
                     <div class="dropdown-menu dropdown-menu-right">
@@ -64,7 +64,7 @@
                 <div class="col-lg-10 side-content">
                     <div class="col-lg-12 my-3">
                         <legend>购买企业版</legend>
-                        <div class="card card-block mb-5">
+                        <div class="card card-body mb-5">
                             <h3 class="card-title">Smartcost 企业版</h3>
                             <p class="card-text">简介</p>
                             <a class="btn btn-primary" href="#">了解企业版</a>
@@ -72,14 +72,14 @@
                         <legend>购买地区版本</legend>
                         <div class="row mb-5">
                             <div class="col-sm-6">
-                                <div class="card card-block">
+                                <div class="card card-body">
                                     <h3 class="card-title">广东专业版 ￥9800.00</h3>
                                     <p class="card-text">版本内容</p>
                                     <a class="btn btn-primary" href="#">立即购买</a>
                                 </div>
                             </div>
                             <div class="col-sm-6">
-                                <div class="card card-block">
+                                <div class="card card-body">
                                     <h3 class="card-title">重庆专业版 ￥9800.00</h3>
                                     <p class="card-text">版本内容</p>
                                     <a class="btn btn-primary" href="#">立即购买</a>
@@ -92,7 +92,7 @@
                               <i class="fa fa-shopping-cart" aria-hidden="true"></i> 6 项功能 <span  class="text-danger">优惠价￥999.00</span> <del>原价￥1399.00</del>  一年
                             </h5>
                         </legend>
-                        <div class="card card-block">
+                        <div class="card card-body">
                           <table class="table table-hover">
                             <thead>
                                 <th>功能</th>
@@ -213,7 +213,7 @@
                                     <th class="">周期</th>
                                     <td class="text-lg-right">
                                         <div class="row">
-                                            <div class="col-lg-4 push-lg-8">
+                                            <div class="col-lg-4 ml-auto">
                                                 <label class="custom-control custom-radio">
                                                   <input id="radio1" name="radio" type="radio" class="custom-control-input" checked>
                                                   <span class="custom-control-indicator"></span>
@@ -227,7 +227,7 @@
                                             </div>
                                         </div>
                                         <div class="row">
-                                            <div class="col-lg-2 push-lg-10">
+                                            <div class="col-lg-2 ml-auto">
                                                 <select class="form-control "><option>一年（9折）</option><option>三年（8折）</option><option>五年（7折）</option></select>
                                             </div>
                                         </div>
@@ -251,8 +251,8 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
 </body>

user-info.html

@@ -21,10 +21,10 @@
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
             </div>
         </div> -->
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
+        <nav class="navbar navbar-expand-lg bg-light bg-faded p-0 justify-content-between">
             <span class="header-logo px-2">Smartcost</span>
             <div class="navbar-text"><a href="project-management.html">项目管理</a></div>
-            <div class="float-lg-right navbar-text pt-0">
+            <div class="float-lg-right navbar-text p-0">
                 <div class="dropdown d-inline-block">
                     <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
                     <div class="dropdown-menu dropdown-menu-right">
@@ -112,8 +112,8 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
 </body>

user-safe.html

@@ -21,10 +21,10 @@
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
             </div>
         </div> -->
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
+        <nav class="navbar navbar-expand-lg bg-light bg-faded p-0 justify-content-between">
             <span class="header-logo px-2">Smartcost</span>
             <div class="navbar-text"><a href="project-management.html">项目管理</a></div>
-            <div class="float-lg-right navbar-text pt-0">
+            <div class="float-lg-right navbar-text p-0">
                 <div class="dropdown d-inline-block">
                     <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
                     <div class="dropdown-menu dropdown-menu-right">
@@ -150,8 +150,8 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
 </body>

user-set.html

@@ -21,10 +21,10 @@
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
             </div>
         </div> -->
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
+        <nav class="navbar navbar-expand-lg bg-light bg-faded p-0 justify-content-between">
             <span class="header-logo px-2">Smartcost</span>
             <div class="navbar-text"><a href="project-management.html">项目管理</a></div>
-            <div class="float-lg-right navbar-text pt-0">
+            <div class="float-lg-right navbar-text p-0">
                 <div class="dropdown d-inline-block">
                     <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
                     <div class="dropdown-menu dropdown-menu-right">
@@ -97,8 +97,8 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
 </body>

zaojiashu.html

@@ -21,7 +21,7 @@
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
             </div>
         </div> -->
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
+        <nav class="navbar navbar-expand-lg bg-light bg-faded p-0 justify-content-between">
             <span class="header-logo px-2">Smartcost</span>
             <div class="navbar-text navbar-crumb p-0">
                 <span class="text-truncate"><a href="project-management.html">项目管理</a></span>
@@ -36,8 +36,8 @@
                 <span class="text-truncate"><i class="fa fa-angle-right fa-fw"></i></span>
                 <span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"><i class="fa fa-sticky-note-o"></i> 乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程</span>
             </div>
-            <div class="float-lg-right navbar-text pt-0">
-                <div class="dropdown d-inline-block">
+            <div class="float-lg-right navbar-text p-0">
+                <div class="dropdown d-inline-block navbar-nav">
                     <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
                     <div class="dropdown-menu dropdown-menu-right">
                         <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
@@ -51,7 +51,7 @@
                 <button class="btn btn-link btn-sm">注销</button>
             </div>
         </nav>
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
+        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
             <ul class="nav navbar-nav px-1">
                 <li class="nav-item">
                     <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cube"></i> 项目属性</a>
@@ -109,7 +109,7 @@
                 <a href="" class="btn btn-sm"><i class="fa fa-arrow-down" aria-hidden="true"></i> 下移</a>
                 <a href="" class="btn btn-sm"><i class="fa fa-arrow-up" aria-hidden="true"></i> 上移</a>
               </div>
-              <div>
+              <div class="tools-btn">
                 <a href="javacript:void(0);" data-toggle="modal" data-target="#column" class="btn btn-sm"><i class="fa fa-table" aria-hidden="true"></i> 列设置</a>
               </div>
               <div class="side-tabs">
@@ -2751,8 +2751,8 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="js/jquery/jquery.min.js"></script>
-    <script src="js/tether/tether.min.js"></script>
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
 </body>