Home Explore Help
Sign In
S.H.I.E.L.D.
/
buildingSAAS
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

bootstrap更新至alpha.5，用户相关页面名称修改，新增 账号安全 其他小细节调整

Chente 8 years ago
parent
5ca03de62b
commit
ae3ca30fef
14 changed files with 360 additions and 194 deletions
Split View Show Diff Stats
  1. 7 7
      baobiao.html
  2. 4 5
      css/bootstrap/bootstrap.min.css
  3. 7 2
      css/main.css
  4. 12 12
      gongliaoji.html
  5. 4 4
      js/bootstrap/bootstrap.min.js
  6. 3 4
      login-infoinput.html
  7. 52 53
      login-welcome.html
  8. 7 7
      login.html
  9. 27 28
      project-management.html
  10. 27 22
      user-buy.html
  11. 16 17
      user-info.html
  12. 160 0
      user-safe.html
  13. 18 15
      user-set.html
  14. 16 18
      zaojiashu.html

+ 7 - 7
baobiao.html
View File 

@@ -21,16 +21,16 @@
 
                 <strong>Warning!</strong> Better check yourself, you're not looking too good.
 
             </div>
 
         </div> -->
 
-        <nav class="navbar navbar-light bg-faded p-0 ">
 
-            <span class="header-logo px-1">Smartcost</span>
 
+        <nav class="navbar navbar-toggleable-lg navbar-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 pb-0">
 
+            <div class="float-lg-right navbar-text pt-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">
 
-                        <a class="dropdown-item" href="user-info.html">个人信息</a>
 
-                        <a class="dropdown-item" href="user-bug.html">购买</a>
 
-                        <a class="dropdown-item" href="user-set.html">设置</a>
 
+                        <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
 
+                        <a class="dropdown-item" href="user-buy.html" target="_blank">产品购买</a>
 
+                        <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
 
                     </div>
 
                 </div>
 
                 <span class="btn btn-link btn-sm new-msg">
 
@@ -42,7 +42,7 @@
 
     </div>
 
     <div class="main">
 
         <div class="main-nav">
 
-            <ul class="nav">
 
+            <ul class="nav flex-column">
 
                 <li><a href="zaojiashu.html">造价书</a></li>
 
                 <li><a href="gongliaoji.html">工料机</a></li>
 
                 <li><a href="baobiao.html" class="active">报表</a></li>

File diff suppressed because it is too large
+ 4 - 5
css/bootstrap/bootstrap.min.css


+ 7 - 2
css/main.css
View File 

@@ -92,20 +92,25 @@ body {
 
     border-radius: 0;
 
     padding: 0.2em 0.5em
 
 }
 
+.side-tabs .nav-tabs .nav-item {
 
+  z-index: 999
 
+}
 
 .side-tabs .nav-tabs {
 
     border-bottom: none;
 
+    margin-bottom: -1px
 
 }
 
 .side-tabs .nav-tabs .nav-link {
 
     border-radius: 0;
 
     padding: 0em 0.5em;
 
-    line-height: 30px
 
+    line-height: 30px;
 
+    z-index: 999
 
 }
 
 .bottom-content .nav-tabs .nav-link.active {
 
     border-top: 1px solid #f7f7f9
 
 }
 
 .side-tabs .nav-tabs .nav-link.active {
 
     border-top: none;
 
-    background: #ccc
 
+    border-bottom:1px solid #fff
 
 }
 
 .side-tabs a.active, .sub-nav a.active {
 
     background: #ccc

+ 12 - 12
gongliaoji.html
View File 

@@ -14,24 +14,24 @@
 
 
 <body>
 
     <div class="header">
 
-        <!-- <div class="top-msg clearfix"> -->
 
+        <!-- <div class="top-msg clearfix">
 
             <div class="alert alert-warning mb-0 py-0" role="alert">
 
                 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
 
                   <span aria-hidden="true">&times;</span>
 
                 </button>
 
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
 
             </div>
 
-        </div>
 
-        <nav class="navbar navbar-light bg-faded p-0 ">
 
-            <span class="header-logo px-1">Smartcost</span>
 
+        </div> -->
 
+        <nav class="navbar navbar-toggleable-lg navbar-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 pb-0">
 
+            <div class="float-lg-right navbar-text pt-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">
 
-                        <a class="dropdown-item" href="user-info.html">个人信息</a>
 
-                        <a class="dropdown-item" href="user-bug.html">购买</a>
 
-                        <a class="dropdown-item" href="user-set.html">设置</a>
 
+                        <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
 
+                        <a class="dropdown-item" href="user-buy.html" target="_blank">产品购买</a>
 
+                        <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
 
                     </div>
 
                 </div>
 
                 <span class="btn btn-link btn-sm new-msg">
 
@@ -40,7 +40,7 @@
 
                 <button class="btn btn-link btn-sm">注销</button>
 
             </div>
 
         </nav>
 
-        <nav class="navbar navbar-light p-0">
 
+        <nav class="navbar navbar-toggleable-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>
 
@@ -70,14 +70,14 @@
 
                     <a class="nav-link" href="#" aria-haspopup="true" aria-expanded="false">帮助</a>
 
                 </li>
 
             </ul>
 
-            <form class="form-inline float-xs-right">
 
-                <input class="form-control form-control-sm" style="margin:4px 4px 0 0" type="text" placeholder="告诉我你想做什么">
 
+            <form class="form-inline">
 
+                <input class="form-control form-control-sm mr-1" type="text" placeholder="告诉我你想做什么">
 
             </form>
 
         </nav>
 
     </div>
 
     <div class="main">
 
         <div class="main-nav">
 
-            <ul class="nav">
 
+            <ul class="nav flex-column">
 
                 <li><a href="zaojiashu.html">造价书</a></li>
 
                 <li><a href="gongliaoji.html" class="active">工料机</a></li>
 
                 <li><a href="baobiao.html">报表</a></li>

File diff suppressed because it is too large
+ 4 - 4
js/bootstrap/bootstrap.min.js


+ 3 - 4
login-infoinput.html
View File 

@@ -14,10 +14,9 @@
 
 
 <body>
 
     <div class="header">
 
-        <nav class="navbar navbar-light bg-faded p-0 ">
 
-            <span class="header-logo px-1">Smartcost</span>
 
-            <!--<div class="navbar-text">文件夹<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 pb-0">
 
+        <nav class="navbar navbar-toggleable-lg navbar-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">
 
                     <button class="btn btn-link btn-sm " type="button">15812644017</button>
 
                 </div>

+ 52 - 53
login-welcome.html
View File 

@@ -14,58 +14,57 @@
 
 
 <body>
 
     <div class="header">
 
-        <nav class="navbar navbar-light bg-faded p-0 ">
 
-            <span class="header-logo px-1">  Smartcost</span>
 
-            <!--<div class="navbar-text">文件夹<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 pb-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">
 
-                        <a class="dropdown-item" href="#">我的账户</a>
 
-                        <a class="dropdown-item" href="#">购买</a>
 
-                        <a class="dropdown-item" href="#">设置</a>
 
-                    </div>
 
+      <nav class="navbar navbar-toggleable-lg navbar-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">
 
+              <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>
 
+                  <a class="dropdown-item" href="user-buy.html" target="_blank">产品购买</a>
 
+                  <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
 
+              </div>
 
+          </div>
 
+          <span class="btn btn-link btn-sm new-msg">
 
+            <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;2
 
+          </span>
 
+          <button class="btn btn-link btn-sm">注销</button>
 
+      </div>
 
+    </nav>
 
+      <nav class="navbar navbar-toggleable-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>
 
+                <div class="dropdown-menu" aria-labelledby="supportedContentDropdown">
 
+                    <a class="dropdown-item" href="#">Action</a>
 
+                    <a class="dropdown-item" href="#">Another action</a>
 
+                    <a class="dropdown-item" href="#">Something else here</a>
 
                 </div>
 
-                <span class="btn btn-link btn-sm ">
 
-                  <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;0
 
-                </span>
 
-                <button class="btn btn-link btn-sm">注销</button>
 
-            </div>
 
-        </nav>
 
-        <nav class="navbar 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>
 
-                    <div class="dropdown-menu" aria-labelledby="supportedContentDropdown">
 
-                        <a class="dropdown-item" href="#">Action</a>
 
-                        <a class="dropdown-item" href="#">Another action</a>
 
-                        <a class="dropdown-item" href="#">Something else here</a>
 
-                    </div>
 
-                </li>
 
-                <li class="nav-item dropdown">
 
-                    <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">编辑</a>
 
-                    <div class="dropdown-menu">
 
-                        <a class="dropdown-item" href="#">Action</a>
 
-                        <a class="dropdown-item" href="#">Another action</a>
 
-                        <a class="dropdown-item" href="#">Something else here</a>
 
-                    </div>
 
-                </li>
 
-                <li class="nav-item dropdown">
 
-                    <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">工具</a>
 
-                    <div class="dropdown-menu">
 
-                        <a class="dropdown-item" href="#">Action</a>
 
-                        <a class="dropdown-item" href="#">Another action</a>
 
-                        <a class="dropdown-item" href="#">Something else here</a>
 
-                    </div>
 
-                </li>
 
-                <li class="nav-item">
 
-                    <a class="nav-link" href="#" aria-haspopup="true" aria-expanded="false">帮助</a>
 
-                </li>
 
-            </ul>
 
-            <form class="form-inline float-xs-right">
 
-                <input class="form-control form-control-sm" style="margin:4px 4px 0 0" type="text" placeholder="告诉我你想做什么">
 
-            </form>
 
-        </nav>
 
+            </li>
 
+            <li class="nav-item dropdown">
 
+                <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">编辑</a>
 
+                <div class="dropdown-menu">
 
+                    <a class="dropdown-item" href="#">Action</a>
 
+                    <a class="dropdown-item" href="#">Another action</a>
 
+                    <a class="dropdown-item" href="#">Something else here</a>
 
+                </div>
 
+            </li>
 
+            <li class="nav-item dropdown">
 
+                <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">工具</a>
 
+                <div class="dropdown-menu">
 
+                    <a class="dropdown-item" href="#">Action</a>
 
+                    <a class="dropdown-item" href="#">Another action</a>
 
+                    <a class="dropdown-item" href="#">Something else here</a>
 
+                </div>
 
+            </li>
 
+            <li class="nav-item">
 
+                <a class="nav-link" href="#" aria-haspopup="true" aria-expanded="false">帮助</a>
 
+            </li>
 
+        </ul>
 
+        <form class="form-inline">
 
+            <input class="form-control form-control-sm mr-1" type="text" placeholder="告诉我你想做什么">
 
+        </form>
 
+    </nav>
 
     </div>
 
     <div class="main">
 
         <div class="poj-manage container-fluid">
 
@@ -73,7 +72,7 @@
 
                 <div class="col-lg-2">
 
                     <div class="poj-cate">
 
                         <input type="text" class="mt-1 mb-1 form-control form-control-sm" placeholder="搜索所有工程">
 
-                        <ul class="nav nav-pills nav-stacked">
 
+                        <ul class="nav nav-pills flex-column">
 
                             <li class="nav-item">
 
                                 <a class="nav-link active" href="#">全部</a>
 
                             </li>
 
@@ -273,7 +272,7 @@
 
         <div class="modal-dialog modal-lg" role="document">
 
             <div class="modal-content">
 
                 <div class="modal-header">
 
-                    <h4 class="modal-title">欢迎使用Smartcost</h4>
 
+                    <h5 class="modal-title">欢迎使用Smartcost</h5>
 
                 </div>
 
                 <div class="modal-body">
 
                     <p>推送内容在这</p>

+ 7 - 7
login.html
View File 

@@ -13,8 +13,8 @@
 
 <body>
 
     <div class="container">
 
         <form class="form-signin">
 
-            <h1 class=" text-xs-center">Smartcost</h1>
 
-            <h4 class="text-xs-center mb-2">用户登录</h4>
 
+            <h1 class="d-flex justify-content-center">Smartcost</h1>
 
+            <h4 class="d-flex justify-content-center mb-2">用户登录</h4>
 
             <div class="form-group">
 
                 <input id="inputEmail" class="form-control " placeholder="通行账号 邮箱/手机" required="" autofocus="">
 
             </div>
 
@@ -24,15 +24,15 @@
 
             <div class="form-group">
 
                 <button class="btn btn-primary btn-block" data-toggle="modal" data-target="#ver">登录</button>
 
             </div>
 
-            <div class="pt-1 text-xs-center">
 
+            <div class="pt-1 d-flex justify-content-center">
 
                 <a href="http://sso.smartcost.com.cn/getpasswd" target="_blank" class="mr-3">忘记密码</a>
 
                 <a href="http://sso.smartcost.com.cn/reg" target="_blank">免费注册</a>
 
             </div>
 
         </form>
 
         <!--登录错误-->
 
         <form class="form-signin login-error">
 
-            <h1 class=" text-xs-center">Smartcost</h1>
 
-            <h4 class="text-xs-center mb-2">用户登录</h4>
 
+            <h1 class="d-flex justify-content-center">Smartcost</h1>
 
+            <h4 class="d-flex justify-content-center mb-2">用户登录</h4>
 
             <div class="form-group has-danger">
 
                 <input class="form-control form-control-danger" value="1212@qq.com" placeholder="通行账号 邮箱/手机" required="" autofocus="">
 
                 <div class="form-control-feedback">输入的邮箱/手机无效</div>
 
@@ -44,7 +44,7 @@
 
             <div class="form-group">
 
                 <button class="btn btn-primary btn-block">登录</button>
 
             </div>
 
-            <div class="pt-1 text-xs-center">
 
+            <div class="pt-1 d-flex justify-content-center">
 
                 <a href="http://sso.smartcost.com.cn/getpasswd" target="_blank" class="mr-3">忘记密码</a>
 
                 <a href="http://sso.smartcost.com.cn/reg" target="_blank">免费注册</a>
 
             </div>
 
@@ -56,7 +56,7 @@
 
             <div class="modal-content">
 
                 <div class="modal-header">
 
                     <h4 class="modal-title">选择登录版本</h4>
 
-                    <p class="m-0">进入后，可以在 账户-设置 中修改您的登录习惯。</p>
 
+                    <p class="m-0 text-warning"><i class="fa fa-exclamation-triangle"></i> <b>偏好设置</b> 中可以修改您的登录习惯。</p>
 
                 </div>
 
                 <div class="modal-body">
 
                     <div class="row">

+ 27 - 28
project-management.html
View File 

@@ -22,25 +22,24 @@
 
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
 
             </div>
 
         </div>
 
-        <nav class="navbar navbar-light bg-faded p-0 ">
 
-            <span class="header-logo px-1">Smartcost</span>
 
-            <!--<div class="navbar-text">文件夹<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 pb-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">
 
-                        <a class="dropdown-item" href="user-info.html">个人信息</a>
 
-                        <a class="dropdown-item" href="user-bug.html">购买</a>
 
-                        <a class="dropdown-item" href="user-set.html">设置</a>
 
-                    </div>
 
-                </div>
 
-                <span class="btn btn-link btn-sm new-msg">
 
-                  <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;2
 
-                </span>
 
-                <button class="btn btn-link btn-sm">注销</button>
 
-            </div>
 
+        <nav class="navbar navbar-toggleable-lg navbar-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">
 
+                  <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>
 
+                      <a class="dropdown-item" href="user-buy.html" target="_blank">产品购买</a>
 
+                      <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
 
+                  </div>
 
+              </div>
 
+              <span class="btn btn-link btn-sm new-msg">
 
+                <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;2
 
+              </span>
 
+              <button class="btn btn-link btn-sm">注销</button>
 
+          </div>
 
         </nav>
 
-        <nav class="navbar navbar-light p-0">
 
+        <nav class="navbar navbar-toggleable-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>
 
@@ -70,8 +69,8 @@
 
                     <a class="nav-link" href="#" aria-haspopup="true" aria-expanded="false">帮助</a>
 
                 </li>
 
             </ul>
 
-            <form class="form-inline float-xs-right">
 
-                <input class="form-control form-control-sm" style="margin:4px 4px 0 0" type="text" placeholder="告诉我你想做什么">
 
+            <form class="form-inline">
 
+                <input class="form-control form-control-sm mr-1" type="text" placeholder="告诉我你想做什么">
 
             </form>
 
         </nav>
 
     </div>
 
@@ -80,8 +79,8 @@
 
             <div class="row">
 
                 <div class="col-lg-2">
 
                     <div class="poj-cate">
 
-                        <input type="text" class="mt-1 mb-1 form-control form-control-sm" placeholder="搜索所有工程">
 
-                        <ul class="nav nav-pills nav-stacked">
 
+                        <input type="text" class="my-2 form-control form-control-sm" placeholder="搜索所有工程">
 
+                        <ul class="nav nav-pills flex-column">
 
                             <li class="nav-item">
 
                                 <a class="nav-link active" href="#">全部</a>
 
                             </li>
 
@@ -184,7 +183,7 @@
 
         </div>
 
         <div class="slide-sidebar">
 
             <div class="side-content">
 
-                <div class="p-1">
 
+                <div class="p-3">
 
                     <legend>1号生产车间 汇总</legend>
 
                     <table class="table table-bordered table-hover table-sm">
 
                         <thead>
 
@@ -279,10 +278,10 @@
 
         <div class="modal-dialog" role="document">
 
             <div class="modal-content">
 
                 <div class="modal-header">
 
+                  <h5 class="modal-title">新建工程</h5>
 
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
 
                       <span aria-hidden="true">&times;</span>
 
                     </button>
 
-                    <h4 class="modal-title">新建工程</h4>
 
                 </div>
 
                 <div class="modal-body">
 
                     <form>
 
@@ -336,10 +335,10 @@
 
         <div class="modal-dialog" role="document">
 
             <div class="modal-content">
 
                 <div class="modal-header">
 
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
 
-            <span aria-hidden="true">&times;</span>
 
-          </button>
 
-                    <h4 class="modal-title">新建文件夹</h4>
 
+                  <h5 class="modal-title">新建文件夹</h5>
 
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
 
+                    <span aria-hidden="true">&times;</span>
 
+                  </button>
 
                 </div>
 
                 <div class="modal-body">
 
                     <form>

+ 27 - 22
user-buy.html
View File 

@@ -5,7 +5,7 @@
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
     <meta http-equiv="x-ua-compatible" content="ie=edge">
 
-    <title>购买-Smartcost</title>
 
+    <title>产品购买-Smartcost</title>
 
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
 
     <link rel="stylesheet" href="css/bootstrap/themes.css">
 
     <link rel="stylesheet" href="css/main.css">
 
@@ -22,16 +22,16 @@
 
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
 
             </div>
 
         </div> -->
 
-        <nav class="navbar navbar-light bg-faded p-0 ">
 
+        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
 
             <span class="header-logo px-1">Smartcost</span>
 
             <div class="navbar-text"><a href="project-management.html">项目管理</a></div>
 
-            <div class="float-lg-right navbar-text pb-0">
 
+            <div class="float-lg-right navbar-text pt-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">
 
-                        <a class="dropdown-item" href="user-info.html">个人信息</a>
 
-                        <a class="dropdown-item" href="user-buy.html">购买</a>
 
-                        <a class="dropdown-item" href="user-set.html">设置</a>
 
+                        <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
 
+                        <a class="dropdown-item" href="user-buy.html" target="_blank">产品购买</a>
 
+                        <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
 
                     </div>
 
                 </div>
 
                 <span class="btn btn-link btn-sm new-msg">
 
@@ -45,33 +45,36 @@
 
         <div class="poj-manage container-fluid">
 
             <div class="row">
 
                 <div class="col-lg-2">
 
-                    <div class="poj-cate mt-2">
 
-                        <ul class="nav nav-pills nav-stacked">
 
+                    <div class="poj-cate mt-3">
 
+                        <ul class="nav nav-pills flex-column">
 
                             <li class="nav-item">
 
-                                <a class="nav-link" href="user-info.html">个人信息</a>
 
+                                <a class="nav-link" href="user-info.html">账号资料</a>
 
                             </li>
 
                             <li class="nav-item">
 
-                                <a class="nav-link active" href="user-buy.html">购买</a>
 
+                                <a class="nav-link" href="user-safe.html">账号安全</a>
 
                             </li>
 
                             <li class="nav-item">
 
-                                <a class="nav-link" href="user-set.html">设置</a>
 
+                                <a class="nav-link active" href="user-buy.html">产品购买</a>
 
+                            </li>
 
+                            <li class="nav-item">
 
+                                <a class="nav-link" href="user-set.html">偏好设置</a>
 
                             </li>
 
                         </ul>
 
                     </div>
 
                 </div>
 
                 <div class="col-lg-10 side-content">
 
-                    <div class="col-lg-12 mb-3 mt-2">
 
-                        <legend mt-2>购买企业版</legend>
 
-                        <div class="card card-block mb-3">
 
+                    <div class="col-lg-12 my-3">
 
+                        <legend>购买企业版</legend>
 
+                        <div class="card card-block mb-5">
 
                             <h3 class="card-title">Smartcost 企业版</h3>
 
                             <p class="card-text">简介</p>
 
                             <a class="btn btn-primary" href="#">了解企业版</a>
 
                         </div>
 
                         <legend>购买地区版本</legend>
 
-                        <div class="row mt-2 mb-3">
 
+                        <div class="row mb-5">
 
                             <div class="col-sm-6">
 
                                 <div class="card card-block">
 
-                                    <h3 class="card-title">重庆专业版 ￥9800.00</h3>
 
+                                    <h3 class="card-title">广东专业版 ￥9800.00</h3>
 
                                     <p class="card-text">版本内容</p>
 
                                     <a class="btn btn-primary" href="#">立即购买</a>
 
                                 </div>
 
@@ -84,13 +87,14 @@
 
                                 </div>
 
                             </div>
 
                         </div>
 
-                        <legend>
 
-                            <h5 class="float-lg-right">
 
+                        <legend class="d-flex justify-content-between align-items-center">
 
+                            购买增值服务
 
+                            <h5 class="m-0">
 
                               <i class="fa fa-shopping-cart" aria-hidden="true"></i> 6 项功能 <span  class="text-danger">优惠价￥999.00</span> <del>原价￥1399.00</del>  一年
 
                             </h5>
 
-                            购买增值服务
 
                         </legend>
 
-                        <table class="table table-hover">
 
+                        <div class="card card-block">
 
+                          <table class="table table-hover">
 
                             <thead>
 
                                 <th>功能</th>
 
                                 <th>免费版</th>
 
@@ -190,8 +194,8 @@
 
                                 </tr>
 
                             </tbody>
 
                         </table>
 
-                        <legend>账单</legend>
 
-                        <table class="table table-sm">
 
+                          <legend><i class="fa fa-shopping-cart" aria-hidden="true"></i> 购物车</legend>
 
+                          <table class="table table-sm">
 
                             <tbody>
 
                                 <tr>
 
                                     <th class="">清单</th>
 
@@ -241,6 +245,7 @@
 
                                 </tr>
 
                             </tbody>
 
                         </table>
 
+                        </div>
 
                     </div>
 
                 </div>
 
             </div>

+ 16 - 17
user-info.html
View File 

@@ -5,7 +5,7 @@
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
     <meta http-equiv="x-ua-compatible" content="ie=edge">
 
-    <title>个人信息-Smartcost</title>
 
+    <title>账号资料-Smartcost</title>
 
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
 
     <link rel="stylesheet" href="css/bootstrap/themes.css">
 
     <link rel="stylesheet" href="css/main.css">
 
@@ -22,16 +22,16 @@
 
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
 
             </div>
 
         </div> -->
 
-        <nav class="navbar navbar-light bg-faded p-0 ">
 
+        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
 
             <span class="header-logo px-1">Smartcost</span>
 
             <div class="navbar-text"><a href="project-management.html">项目管理</a></div>
 
-            <div class="float-lg-right navbar-text pb-0">
 
+            <div class="float-lg-right navbar-text pt-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">
 
-                        <a class="dropdown-item" href="user-info.html">个人信息</a>
 
-                        <a class="dropdown-item" href="user-buy.html">购买</a>
 
-                        <a class="dropdown-item" href="user-set.html">设置</a>
 
+                        <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
 
+                        <a class="dropdown-item" href="user-buy.html" target="_blank">产品购买</a>
 
+                        <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
 
                     </div>
 
                 </div>
 
                 <span class="btn btn-link btn-sm new-msg">
 
@@ -42,32 +42,31 @@
 
         </nav>
 
     </div>
 
     <div class="main">
 
-        <div class="poj-manage container-fluid mt-2">
 
+        <div class="poj-manage container-fluid">
 
             <div class="row">
 
                 <div class="col-lg-2">
 
-                    <div class="poj-cate">
 
-                        <ul class="nav nav-pills nav-stacked">
 
+                    <div class="poj-cate mt-3">
 
+                        <ul class="nav nav-pills flex-column">
 
                             <li class="nav-item">
 
-                                <a class="nav-link active" href="user-info.html">个人信息</a>
 
+                                <a class="nav-link active" href="user-info.html">账号资料</a>
 
                             </li>
 
                             <li class="nav-item">
 
-                                <a class="nav-link" href="user-buy.html">购买</a>
 
+                                <a class="nav-link" href="user-safe.html">账号安全</a>
 
                             </li>
 
                             <li class="nav-item">
 
-                                <a class="nav-link" href="user-set.html">设置</a>
 
+                                <a class="nav-link" href="user-buy.html">产品购买</a>
 
+                            </li>
 
+                            <li class="nav-item">
 
+                                <a class="nav-link" href="user-set.html">偏好设置</a>
 
                             </li>
 
                         </ul>
 
                     </div>
 
                 </div>
 
                 <div class="col-lg-10">
 
                     <div class="col-lg-4">
 
-                        <legend class="mb-2">我的账户</legend>
 
+                        <legend class="my-3">账号资料</legend>
 
                         <from>
 
                             <div class="form-group">
 
-                                <label class="form-control-label">通行账号</label>
 
-                                <p class="form-control-static mb-0">15812644017 / 914630468@qq.com <a href="http://sso.smartcost.com.cn" target="_blank">纵横通行账号</a></p>
 
-                            </div>
 
-                            <div class="form-group">
 
                                 <label class="form-control-label">您的姓名</label>
 
                                 <input class="form-control" value="陈特" placeholder="输入您的姓名" required="" autofocus="">
 
                             </div>

+ 160 - 0
user-safe.html
View File 

@@ -0,0 +1,160 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+
 
+<head>
 
+    <meta charset="utf-8">
 
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
 
+    <title>账号资料-Smartcost</title>
 
+    <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
 
+    <link rel="stylesheet" href="css/bootstrap/themes.css">
 
+    <link rel="stylesheet" href="css/main.css">
 
+    <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
 
+</head>
 
+
 
+<body>
 
+    <div class="header">
 
+        <!-- <div class="top-msg clearfix">
 
+            <div class="alert alert-warning mb-0 py-0" role="alert">
 
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
 
+                  <span aria-hidden="true">&times;</span>
 
+                </button>
 
+                <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
 
+            </div>
 
+        </div> -->
 
+        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
 
+            <span class="header-logo px-1">Smartcost</span>
 
+            <div class="navbar-text"><a href="project-management.html">项目管理</a></div>
 
+            <div class="float-lg-right navbar-text pt-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">
 
+                        <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
 
+                        <a class="dropdown-item" href="user-buy.html" target="_blank">产品购买</a>
 
+                        <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
 
+                    </div>
 
+                </div>
 
+                <span class="btn btn-link btn-sm new-msg">
 
+                  <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;2
 
+                </span>
 
+                <button class="btn btn-link btn-sm">注销</button>
 
+            </div>
 
+        </nav>
 
+    </div>
 
+    <div class="main">
 
+        <div class="poj-manage container-fluid">
 
+            <div class="row">
 
+                <div class="col-lg-2">
 
+                    <div class="poj-cate mt-3">
 
+                        <ul class="nav nav-pills flex-column">
 
+                            <li class="nav-item">
 
+                                <a class="nav-link" href="user-info.html">账号资料</a>
 
+                            </li>
 
+                            <li class="nav-item">
 
+                                <a class="nav-link active" href="user-safe.html">账号安全</a>
 
+                            </li>
 
+                            <li class="nav-item">
 
+                                <a class="nav-link" href="user-buy.html">产品购买</a>
 
+                            </li>
 
+                            <li class="nav-item">
 
+                                <a class="nav-link" href="user-set.html">偏好设置</a>
 
+                            </li>
 
+                        </ul>
 
+                    </div>
 
+                </div>
 
+                <div class="col-lg-10">
 
+                    <div class="col-lg-4">
 
+                        <legend class="my-3">账号安全</legend>
 
+                        <from>
 
+                            <div class="form-group">
 
+                                <label class="form-control-label">登录密码</label>
 
+                                <div class="form-control-static">
 
+                                  <button class="btn btn-secondary btn-sm">修改密码</button>
 
+                                </div>
 
+                            </div>
 
+                            <div class="form-group">
 
+                                <label class="form-control-label">邮箱地址</label>
 
+                                <p class="form-control-static mb-0">914630468@qq.com <span class="badge badge-default">未验证</span></p>
 
+                                <button class="btn btn-secondary btn-sm">验证邮箱</button> <button class="btn btn-secondary btn-sm">更换邮箱</button>
 
+                                <p class="form-control-static mb-0">914630468@qq.com <span class="badge badge-success">已验证</span></p>
 
+                                <button class="btn btn-secondary btn-sm">更换邮箱</button>
 
+                            </div>
 
+                            <div class="form-group">
 
+                                <label class="form-control-label">手机号码</label>
 
+                                <p class="form-control-static mb-0">1581260000</p>
 
+                                <button class="btn btn-secondary btn-sm">更换手机</button>
 
+                                <div class="form-control-static">
 
+                                  <button class="btn btn-secondary btn-sm">添加手机</button>
 
+                                </div>
 
+                            </div>
 
+                            <div class="form-group">
 
+                                <label class="form-control-label">异常登录提醒</label>
 
+                                <div class="form-control-static">
 
+                                  <label class="custom-control custom-checkbox" data-toggle="modal" data-target="#phoneTips" >
 
+                                    <input type="checkbox" class="custom-control-input">
 
+                                    <span class="custom-control-indicator"></span>
 
+                                    <span class="custom-control-description">开启</span>
 
+                                  </label>
 
+                                  <p class="text-muted">
 
+                                    账号出现异常登录时将给你的手机号码发送通知。
 
+                                  </p>
 
+                                </div>
 
+                            </div>
 
+                        </from>
 
+                    </div>
 
+                    <div class="mt-5">
 
+                      <legend>访问日志</legend>
 
+                      <table class="table table-hover">
 
+                        <thead><tr><th>系统</th><th>浏览器</th><th>访问日期</th><th>地址</th></tr></thead>
 
+                        <tbody>
 
+                          <tr>
 
+                            <td>Windows NT 10.0 64-bit</td><td>Chrome 55.0.2883.87 m (64-bit)</td><td>2017-01-12 09:09</td><td>广东省珠海市 电信（116.19.86.133）</td>
 
+                          </tr>
 
+                          <tr>
 
+                            <td>Windows NT 10.0 64-bit</td><td>Chrome 55.0.2883.87 m (64-bit)</td><td>2017-01-12 09:09</td><td>广东省珠海市 电信（116.19.86.133）</td>
 
+                          </tr>
 
+                        </tbody>
 
+                      </table>
 
+                      <nav aria-label="...">
 
+                        <ul class="pagination">
 
+                          <li class="page-item disabled">
 
+                            <a class="page-link" href="#" tabindex="-1">上一页</a>
 
+                          </li>
 
+                          <li class="page-item active"><a class="page-link" href="#">1</a></li>
 
+                          <li class="page-item"><a class="page-link" href="#">2</a></li>
 
+                          <li class="page-item"><a class="page-link" href="#">3</a></li>
 
+                          <li class="page-item">
 
+                            <a class="page-link" href="#">下一页</a>
 
+                          </li>
 
+                        </ul>
 
+                      </nav>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+    </div>
 
+    <!--弹出异常登录提醒-->
 
+    <div class="modal fade" id="phoneTips" data-backdrop="static">
 
+        <div class="modal-dialog" role="document">
 
+            <div class="modal-content">
 
+                <div class="modal-body">
 
+                    <p>开启异常登录提醒，需要先为您的通行账号添加手机号码。</p>
 
+                    <p><a class="btn btn-primary btn-sm" href="#">去添加手机</a></p>
 
+                </div>
 
+                <div class="modal-footer">
 
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
 
+                </div>
 
+            </div>
 
+        </div>
 
+    </div>
 
+    <!-- JS. -->
 
+    <script src="js/jquery/jquery.min.js"></script>
 
+    <script src="js/tether/tether.min.js"></script>
 
+    <script src="js/bootstrap/bootstrap.min.js"></script>
 
+    <script src="js/global.js"></script>
 
+</body>
 
+<script type="text/javascript">
 
+    autoFlashHeight();
 
+</script>
 
+
 
+</html>

+ 18 - 15
user-set.html
View File 

@@ -5,7 +5,7 @@
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
     <meta http-equiv="x-ua-compatible" content="ie=edge">
 
-    <title>设置-Smartcost</title>
 
+    <title>偏好设置-Smartcost</title>
 
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
 
     <link rel="stylesheet" href="css/bootstrap/themes.css">
 
     <link rel="stylesheet" href="css/main.css">
 
@@ -22,16 +22,16 @@
 
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
 
             </div>
 
         </div> -->
 
-        <nav class="navbar navbar-light bg-faded p-0 ">
 
+        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
 
             <span class="header-logo px-1">Smartcost</span>
 
             <div class="navbar-text"><a href="project-management.html">项目管理</a></div>
 
-            <div class="float-lg-right navbar-text pb-0">
 
+            <div class="float-lg-right navbar-text pt-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">
 
-                        <a class="dropdown-item" href="user-info.html">个人信息</a>
 
-                        <a class="dropdown-item" href="user-buy.html">购买</a>
 
-                        <a class="dropdown-item" href="user-set.html">设置</a>
 
+                        <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
 
+                        <a class="dropdown-item" href="user-buy.html" target="_blank">产品购买</a>
 
+                        <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
 
                     </div>
 
                 </div>
 
                 <span class="btn btn-link btn-sm new-msg">
 
@@ -42,26 +42,29 @@
 
         </nav>
 
     </div>
 
     <div class="main">
 
-        <div class="poj-manage container-fluid mt-2">
 
+        <div class="poj-manage container-fluid">
 
             <div class="row">
 
                 <div class="col-lg-2">
 
-                    <div class="poj-cate">
 
-                        <ul class="nav nav-pills nav-stacked">
 
+                    <div class="poj-cate mt-3">
 
+                        <ul class="nav nav-pills flex-column">
 
                             <li class="nav-item">
 
-                                <a class="nav-link" href="user-info.html">个人信息</a>
 
+                                <a class="nav-link" href="user-info.html">账号资料</a>
 
                             </li>
 
                             <li class="nav-item">
 
-                                <a class="nav-link" href="user-buy.html">购买</a>
 
+                                <a class="nav-link" href="user-safe.html">账号安全</a>
 
                             </li>
 
                             <li class="nav-item">
 
-                                <a class="nav-link active" href="user-set.html">设置</a>
 
+                                <a class="nav-link" href="user-buy.html">产品购买</a>
 
+                            </li>
 
+                            <li class="nav-item">
 
+                                <a class="nav-link active" href="user-set.html">偏好设置</a>
 
                             </li>
 
                         </ul>
 
                     </div>
 
                 </div>
 
                 <div class="col-lg-10">
 
                     <div class="col-lg-4">
 
-                        <legend class="mb-2">设置</legend>
 
+                        <legend class="my-3">偏好设置</legend>
 
                         <from>
 
                             <div class="form-group">
 
                                 <label class="form-control-label">登录时选择版本</label>
 
@@ -81,8 +84,8 @@
 
                             <div class="form-group">
 
                                 <label class="form-control-label">指定版本</label>
 
                                 <select class="form-control">
 
-                                  <option>广东版</option>
 
-                                  <option>重庆版</option>
 
+                                  <option>广东版（专业版）</option>
 
+                                  <option>重庆版（免费版）</option>
 
                                 </select>
 
                             </div>
 
                             <div class="form-group mt-3">

+ 16 - 18
zaojiashu.html
View File 

@@ -22,27 +22,25 @@
 
                 <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
 
             </div>
 
         </div> -->
 
-        <nav class="navbar navbar-light bg-faded p-0 ">
 
-            <span class="header-logo px-1">
 
-          Smartcost
 
-        </span>
 
+        <nav class="navbar navbar-toggleable-lg navbar-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 pb-0">
 
+            <div class="float-lg-right navbar-text pt-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">
 
-                        <a class="dropdown-item" href="user-info.html">个人信息</a>
 
-                        <a class="dropdown-item" href="user-bug.html">购买</a>
 
-                        <a class="dropdown-item" href="user-set.html">设置</a>
 
+                        <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
 
+                        <a class="dropdown-item" href="user-buy.html" target="_blank">产品购买</a>
 
+                        <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
 
                     </div>
 
                 </div>
 
                 <span class="btn btn-link btn-sm new-msg">
 
-          <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;2
 
-        </span>
 
+                  <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;2
 
+                </span>
 
                 <button class="btn btn-link btn-sm">注销</button>
 
             </div>
 
         </nav>
 
-        <nav class="navbar navbar-light p-0">
 
+        <nav class="navbar navbar-toggleable-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>
 
@@ -72,21 +70,21 @@
 
                     <a class="nav-link" href="#" aria-haspopup="true" aria-expanded="false">帮助</a>
 
                 </li>
 
             </ul>
 
-            <form class="form-inline float-xs-right">
 
-                <input class="form-control form-control-sm" style="margin:4px 4px 0 0" type="text" placeholder="告诉我你想做什么">
 
+            <form class="form-inline">
 
+                <input class="form-control form-control-sm mr-1" type="text" placeholder="告诉我你想做什么">
 
             </form>
 
         </nav>
 
     </div>
 
     <div class="main">
 
         <div class="main-nav">
 
-            <ul class="nav">
 
+            <ul class="nav flex-column">
 
                 <li><a href="zaojiashu.html" class="active">造价书</a></li>
 
                 <li><a href="gongliaoji.html">工料机</a></li>
 
                 <li><a href="baobiao.html">报表</a></li>
 
             </ul>
 
         </div>
 
         <div class="content">
 
-            <div class="toolsbar px-1">
 
+            <div class="toolsbar px-1 d-flex justify-content-between">
 
                 <div class="tools-btn btn-group align-top">
 
                     <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>
 
@@ -94,13 +92,13 @@
 
                     <a href="" class="btn btn-sm"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
 
                     <a href="" class="btn btn-sm"><i class="fa fa-undo" aria-hidden="true"></i></a>
 
                 </div>
 
-                <div class="side-tabs float-lg-right">
 
+                <div class="side-tabs">
 
                     <ul class="nav nav-tabs" role="tablist">
 
                         <li class="nav-item">
 
-                            <a class="nav-link active" data-toggle="tab" href="#qd" role="tab">清单</a>
 
+                            <a class="nav-link active px-3" data-toggle="tab" href="#qd" role="tab">清单</a>
 
                         </li>
 
                         <li class="nav-item">
 
-                            <a class="nav-link" data-toggle="tab" href="#de" role="tab">定额</a>
 
+                            <a class="nav-link px-3" data-toggle="tab" href="#de" role="tab">定额</a>
 
                         </li>
 
                     </ul>
 
                 </div>