Explorar el Código

登录增加手机号验证;部分界面调整

Chente hace 7 años
padre
commit
114eada22b
Se han modificado 6 ficheros con 79 adiciones y 38 borrados
  1. 10 6
      css/main.css
  2. 56 8
      login.html
  3. 1 1
      project-management.html
  4. 5 5
      user-buy.html
  5. 5 8
      user-safe.html
  6. 2 10
      zaojiashu.html

+ 10 - 6
css/main.css

@@ -27,6 +27,10 @@ body {
     font-size: 1.25rem;
     line-height: inherit
 }
+.header .header-logo sup{
+  font-size:10px;
+  top:-1.2em
+}
 .top-msg{
   position: fixed;
   top:0;
@@ -48,7 +52,6 @@ body {
     width: 28px;
     text-align: center;
     line-height: 18px;
-    color: #999;
     padding: 10px 0;
     border-right: 1px solid #ccc;
 }
@@ -58,7 +61,7 @@ body {
     text-decoration: none;
 }
 .main-nav .nav a.active {
-    border: 1px solid #ccc;
+    border: 1px solid #ff6501;
     border-right: 1px solid #fff;
     background: #fff;
     color: #333
@@ -75,10 +78,10 @@ body {
 .poj-cate .nav-pills .nav-link{
   border-radius: 0;
   font-size: 24px;
-  color: #6c757d
+  color: #007bff
 }
 .poj-cate .nav-pills .nav-link:hover{
-  color:#007bff
+  color:#0056b3
 }
 .poj-cate .nav-pills .nav-link.active, .nav-pills .show > .nav-link{
   background-color: #6c757d;
@@ -136,7 +139,7 @@ body {
 }
 .bottom-content .nav {
     background: #f7f7f9;
-    padding:0 0 0 2px
+    padding:1px 0 0 2px
 }
 .bottom-content .nav-tabs .nav-link, .side-tabs .nav-tabs .nav-link {
     border-radius: 0;
@@ -156,7 +159,8 @@ body {
     z-index: 999
 }
 .bottom-content .nav-tabs .nav-link.active {
-    border-top: 1px solid #f7f7f9
+    border:1px solid #ff6501;
+    border-bottom: 1px solid #fff
 }
 .side-tabs .nav-tabs .nav-link.active {
     border-top: none;

+ 56 - 8
login.html

@@ -21,7 +21,7 @@
                 <input id="inputPassword" class="form-control " placeholder="输入密码" required="" type="password">
             </div>
             <div class="form-group">
-                <button class="btn btn-primary btn-block" data-toggle="modal" data-target="#ver">登录</button>
+                <a href="#ver" class="btn btn-primary btn-block" data-toggle="modal" data-target="#ver">登录</a>
             </div>
             <div class="pt-1 d-flex justify-content-center">
                 <a href="http://sso.smartcost.com.cn/getpasswd" target="_blank" class="mr-3">忘记密码</a>
@@ -44,7 +44,7 @@
               </div>
             </div>
             <div class="form-group">
-                <button class="btn btn-primary btn-block">登录</button>
+              <a href="#phone" class="btn btn-primary btn-block" data-toggle="modal" data-target="#phone">登录</a>
             </div>
             <div class="pt-1 d-flex justify-content-center">
                 <a href="http://sso.smartcost.com.cn/getpasswd" target="_blank" class="mr-3">忘记密码</a>
@@ -52,28 +52,32 @@
             </div>
         </form>
     </div>
-    <!--弹出信息-->
+    <!--弹出版本选择-->
     <div class="modal fade" id="ver" data-backdrop="static">
         <div class="modal-dialog modal-lg" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h4 class="modal-title">选择登录版本</h4>
+                    <h5 class="modal-title">选择登录版本</h5>
                     <p class="m-0 text-warning"><i class="fa fa-exclamation-triangle"></i> <b>偏好设置</b> 中可以修改您的登录习惯。</p>
                 </div>
                 <div class="modal-body">
                     <div class="row">
                         <div class="col-sm-6">
                             <div class="card card-block">
-                                <h3 class="card-title">重庆版免费版</h3>
-                                <p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
+                              <div class="card-body">
+                                <h3 class="card-title">重庆版(2018)免费版</h3>
+                                <p class="card-text">介绍内容</p>
                                 <a class="btn btn-primary" href="login-infoinput.html">开始使用</a>
+                              </div>
                             </div>
                         </div>
                         <div class="col-sm-6">
                             <div class="card card-block">
-                                <h3 class="card-title">广东版免费版</h3>
-                                <p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
+                              <div class="card-body">
+                                <h3 class="card-title">广东版(2018)免费版</h3>
+                                <p class="card-text">介绍内容</p>
                                 <a class="btn btn-primary" href="login-infoinput.html">开始使用</a>
+                              </div>
                             </div>
                         </div>
                     </div>
@@ -81,6 +85,50 @@
             </div>
         </div>
     </div>
+    <!--弹出手机号-->
+    <div class="modal fade" id="phone" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">验证手机号</h5>
+                </div>
+                <div class="modal-body">
+                  <div class="form-row">
+                    <div class="form-group col-md-8">
+                      <input type="email" class="form-control" id="inputEmail4" placeholder="输入验证码">
+                    </div>
+                    <div class="form-group col-md-4">
+                      <button class="btn btn-primary">获取验证码</button>
+                    </div>
+                  </div>
+                  <div class="form-row">
+                    <div class="form-group col-md-8">
+                      <input type="email" class="form-control" id="inputEmail4" placeholder="输入验证码">
+                    </div>
+                    <div class="form-group col-md-4">
+                      <button class="btn btn-outline-secondary disabled">59秒 重新获取</button>
+                    </div>
+                  </div>
+                  <div class="form-row">
+                    <div class="form-group col-md-8">
+                      <input type="email" class="form-control is-invalid" id="inputEmail4" placeholder="输入验证码">
+                      <div class="invalid-feedback">
+                        验证码错误。
+                      </div>
+                    </div>
+                    <div class="form-group col-md-4">
+                      <button class="btn btn-outline-secondary disabled">59秒 重新获取</button>
+                    </div>
+                  </div>
+                </div>
+                <div class="modal-footer">
+                  <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                  <button class="btn btn-primary" >确定</a>
+                </div>
+            </div>
+
+        </div>
+    </div>
     <!-- JS. -->
     <script src="js/jquery/jquery-3.2.1.min.js"></script>
     <script src="js/popper/popper.min.js"></script>

+ 1 - 1
project-management.html

@@ -24,7 +24,7 @@
             </div>
         </div> -->
         <nav class="navbar navbar-expand-lg p-0 d-flex">
-            <span class="header-logo px-2">Smartcost</span>
+            <span class="header-logo px-2">纵横云造价<sup>广东2018专业版</sup></span>
             <!-- <div class="navbar-text navbar-crumb p-0">
                 <span class=""><a href="project-management.html">项目管理</a></span>
                 <span class=""><i class="fa fa-angle-right fa-fw"></i></span>

+ 5 - 5
user-buy.html

@@ -74,7 +74,7 @@
                         </div> -->
                         <legend class=" mb-4">激活专业版</legend>
                         <div class="row">
-                            <div class="col-sm-6 mb-5">
+                            <div class="col-sm-4 mb-5">
                                 <div class="card">
                                   <div class=" card-body">
                                     <h3 class="card-title">免费版 </h3>
@@ -87,12 +87,12 @@
                                       </p>
                                   </div>
                                   <ul class="list-group list-group-flush">
-                                     <li class="list-group-item">广东版 <i class="fa fa-check text-success"></i><a data-toggle="popover" data-content="通过 虾米造价公众号 激活" data-placement="left" class="pull-right"><i class="fa fa-info-circle"></i></a></li>
-                                     <li class="list-group-item">重庆版 <i class="fa fa-check text-success"></i><a data-toggle="popover" data-content="由 广东办刘飞15987654321 激活" data-placement="left" class="pull-right"><i class="fa fa-info-circle"></i></a></li>
+                                     <li class="list-group-item">广东版 <i class="fa fa-check text-success"></i></li>
+                                     <li class="list-group-item">重庆版 <i class="fa fa-check text-success"></i></li>
                                    </ul>
                                 </div>
                             </div>
-                            <div class="col-sm-6 mb-5">
+                            <div class="col-sm-4 mb-5">
                                 <div class="card">
                                   <div class=" card-body">
                                     <h3 class="card-title">专业版</h3>
@@ -104,7 +104,7 @@
                                       </ul>
                                   </div>
                                   <ul class="list-group list-group-flush">
-                                     <li class="list-group-item">广东版 <i class="fa fa-check text-success"></i><a data-toggle="popover" data-content="由 广东办刘飞15987654321 激活" data-placement="left" class="pull-right"><i class="fa fa-info-circle"></i></a></li>
+                                     <li class="list-group-item">广东版 <i class="fa fa-check text-success"></i></li>
                                      <li class="list-group-item">重庆版</li>
                                    </ul>
                                 </div>

+ 5 - 8
user-safe.html

@@ -71,23 +71,20 @@
                             <div class="form-group">
                                 <label class="form-control-label">登录密码</label>
                                 <div class="form-control-static">
-                                  <button class="btn btn-secondary btn-sm">修改密码</button>
+                                  <button class="btn btn-outline-primary 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>
+                                <button class="btn btn-outline-primary 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>
+                                <button class="btn btn-outline-primary 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>
+                                <p class="form-control-static mb-0">1581260000 <span class="badge badge-success">已验证</span></p>
+                                <button class="btn btn-outline-primary btn-sm">更换手机</button>
                             </div>
                             <div class="form-group">
                                 <label class="form-control-label">异常登录提醒</label>

+ 2 - 10
zaojiashu.html

@@ -22,7 +22,7 @@
             </div>
         </div> -->
         <nav class="navbar navbar-expand-lg p-0 d-flex">
-            <span class="header-logo px-2">Smartcost</span>
+            <span class="header-logo px-2">纵横云造价<sup>广东2018专业版</sup></span>
             <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>
@@ -52,14 +52,6 @@
                     </li>
                 </ul>
             <div class="navbar-text navbar-crumb p-0">
-                <span class=""><a href="project-management.html">项目管理</a></span>
-                <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
-                <span class="" data-toggle="tooltip" data-placement="bottom" title="文件夹名称"><i class="fa fa-folder-o"></i></span>
-                <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
-                <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"><i class="fa fa-cubes"></i></span>
-                <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
-                <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"><i class="fa fa-cube"></i></span>
-                <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
                 <span><i class="fa fa-sticky-note-o"></i></span>
                 <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"> <span class="text-truncate float-right">&nbsp;乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程</span></span>
             </div>
@@ -2110,7 +2102,7 @@
                             <div class="tab-content">
                                 <div class="tab-pane active" id="gl" role="tabpanel">
                                     <div class="main-data-bottom ovf-hidden">
-                                        <table class="table table-sm table-bordered m-0">
+                                        <table class="table table-sm table-bordered m-1">
                                             <thead>
                                                 <th>编号</th>
                                                 <th>名称</th>