Bläddra i källkod

项目管理界面调整,产品激活 页面调整

Chente 7 år sedan
förälder
incheckning
44358e583f
10 ändrade filer med 221 tillägg och 287 borttagningar
  1. 18 14
      css/main.css
  2. 2 1
      js/global.js
  3. 35 26
      project-management-Recycle.html
  4. 35 26
      project-management-share.html
  5. 35 26
      project-management-synergy.html
  6. 18 9
      project-management.html
  7. 69 176
      user-buy.html
  8. 3 3
      user-info.html
  9. 3 3
      user-safe.html
  10. 3 3
      user-set.html

+ 18 - 14
css/main.css

@@ -33,12 +33,6 @@ body {
   width:100%;
   z-index: 999
 }
-.in-1{padding-left:0px!important}
-.in-2{padding-left:21px!important}
-.in-3{padding-left:42px!important}
-.in-4{padding-left:63px!important}
-.in-5{padding-left:84px!important}
-.in-6{padding-left:105px!important}
 .main {
     position: relative;
     background: #f7f7f9;
@@ -72,6 +66,24 @@ body {
 .main-nav .nav-tabs{
   border-bottom: none
 }
+.poj-manage .col-auto{
+  background:#f7f7f9
+}
+.poj-cate {
+  width:58px
+}
+.poj-cate .nav-pills .nav-link{
+  border-radius: 0;
+  font-size: 24px;
+  color: #6c757d
+}
+.poj-cate .nav-pills .nav-link:hover{
+  color:#007bff
+}
+.poj-cate .nav-pills .nav-link.active, .nav-pills .show > .nav-link{
+  background-color: #6c757d;
+  color:#fff
+}
 .content {
     border-left: 1px solid #ccc;
     margin-left: 29px;
@@ -250,14 +262,6 @@ body {
 .poj-list, .side-content ,.form-view{
     overflow: auto;
 }
-.poj-list span.poj-icon {
-  padding-right:7px;
-  color:#ccc
-}
-.poj-list a.tree-open,.poj-list a.tree-close{
-  width:15px;
-  display: inline-block;
-}
 .print-toolsbar{
   padding:5px
 }

+ 2 - 1
js/global.js

@@ -42,6 +42,7 @@ $("body").click(function(event){
 /*侧滑*/
 /*工具提示*/
 $(function () {
-  $('[data-toggle="tooltip"]').tooltip()
+  $('[data-toggle="tooltip"]').tooltip();
+  $('[data-toggle="popover"]').popover()
 });
 });

+ 35 - 26
project-management-Recycle.html

@@ -69,7 +69,7 @@
                     <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-buy.html" target="_blank">产品激活</a>
                         <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
                         <div class="dropdown-divider"></div>
                         <a class="dropdown-item" href="#" target="_blank">退出登录</a>
@@ -84,32 +84,41 @@
     <div class="main">
         <div class="poj-manage container-fluid">
             <div class="row">
-                <div class="col-lg-2">
-                    <div class="poj-cate">
-                        <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" href="project-management.html">全部</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="#">最近使用</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="#">共享</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="#">协同工作</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="#">归档</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link active" href="project-management-Recycle.html">回收站</a>
-                            </li>
-                        </ul>
+              <div class="col-auto p-0">
+                  <div class="poj-cate">
+                    <div class="dropdown">
+                      <a class="btn btn-light dropdown-toggle" data-toggle="dropdown">
+                        <i class="fa fa-search"></i>
+                      </a>
+                      <div class="dropdown-menu p-3" aria-labelledby="dropdownMenuButton">
+                        <div class="form-group m-0">
+                          <input type="text" class="form-control form-control-sm" placeholder="搜索所有工程"style="width:300px">
+                        </div>
+                      </div>
                     </div>
-                </div>
-                <div class="col-lg-10">
+                      <ul class="nav nav-pills flex-column">
+                          <li class="nav-item">
+                              <a class="nav-link" href="project-management.html" data-toggle="tooltip" data-placement="right" data-original-title="全部"><i class="fa fa-bars"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link" href="#"  data-toggle="tooltip" data-placement="right" data-original-title="最近使用"><i class="fa fa-bookmark"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link" href="project-management-share.html"  data-toggle="tooltip" data-placement="right" data-original-title="共享"><i class="fa fa-share-alt"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link" href="project-management-synergy.html"  data-toggle="tooltip" data-placement="right" data-original-title="协同工作"><i class="fa fa-users"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link" href="#"  data-toggle="tooltip" data-placement="right" data-original-title="归档"><i class="fa fa-book"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link active" href="project-management-Recycle.html" data-toggle="tooltip" data-placement="right" data-original-title="回收站"><i class="fa fa-trash"></i></a>
+                          </li>
+                      </ul>
+                  </div>
+              </div>
+                <div class="col">
                     <div class="toolsbar">
                         <!-- <div class="tools-btn btn-group align-top">
                             <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj1" class="btn btn-sm">新建 <i class="fa fa-cubes"></i> 建设项目</a>

+ 35 - 26
project-management-share.html

@@ -69,7 +69,7 @@
                     <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-buy.html" target="_blank">产品激活</a>
                         <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
                         <div class="dropdown-divider"></div>
                         <a class="dropdown-item" href="#" target="_blank">退出登录</a>
@@ -84,32 +84,41 @@
     <div class="main">
         <div class="poj-manage container-fluid">
             <div class="row">
-                <div class="col-lg-2">
-                    <div class="poj-cate">
-                        <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" href="project-management.html">全部</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="#">最近使用</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link active" href="project-management-share.html">共享</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="project-management-synergy.html">协同工作</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="#">归档</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="project-management-Recycle.html">回收站</a>
-                            </li>
-                        </ul>
+              <div class="col-auto p-0">
+                  <div class="poj-cate">
+                    <div class="dropdown">
+                      <a class="btn btn-light dropdown-toggle" data-toggle="dropdown">
+                        <i class="fa fa-search"></i>
+                      </a>
+                      <div class="dropdown-menu p-3" aria-labelledby="dropdownMenuButton">
+                        <div class="form-group m-0">
+                          <input type="text" class="form-control form-control-sm" placeholder="搜索所有工程"style="width:300px">
+                        </div>
+                      </div>
                     </div>
-                </div>
-                <div class="col-lg-10">
+                      <ul class="nav nav-pills flex-column">
+                          <li class="nav-item">
+                              <a class="nav-link" href="project-management.html" data-toggle="tooltip" data-placement="right" data-original-title="全部"><i class="fa fa-bars"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link" href="#"  data-toggle="tooltip" data-placement="right" data-original-title="最近使用"><i class="fa fa-bookmark"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link active" href="project-management-share.html"  data-toggle="tooltip" data-placement="right" data-original-title="共享"><i class="fa fa-share-alt"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link" href="project-management-synergy.html"  data-toggle="tooltip" data-placement="right" data-original-title="协同工作"><i class="fa fa-users"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link" href="#"  data-toggle="tooltip" data-placement="right" data-original-title="归档"><i class="fa fa-book"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link" href="project-management-Recycle.html" data-toggle="tooltip" data-placement="right" data-original-title="回收站"><i class="fa fa-trash"></i></a>
+                          </li>
+                      </ul>
+                  </div>
+              </div>
+                <div class="col">
                     <div class="toolsbar">
                         <!-- <div class="tools-btn btn-group align-top">
                             <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj1" class="btn btn-sm">新建 <i class="fa fa-cubes"></i> 建设项目</a>

+ 35 - 26
project-management-synergy.html

@@ -69,7 +69,7 @@
                     <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-buy.html" target="_blank">产品激活</a>
                         <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
                         <div class="dropdown-divider"></div>
                         <a class="dropdown-item" href="#" target="_blank">退出登录</a>
@@ -84,32 +84,41 @@
     <div class="main">
         <div class="poj-manage container-fluid">
             <div class="row">
-                <div class="col-lg-2">
-                    <div class="poj-cate">
-                        <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" href="project-management.html">全部</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="#">最近使用</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="project-management-share.html">共享</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link active" href="project-management-synergy.html">协同工作</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="#">归档</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link" href="project-management-Recycle.html">回收站</a>
-                            </li>
-                        </ul>
+              <div class="col-auto p-0">
+                  <div class="poj-cate">
+                    <div class="dropdown">
+                      <a class="btn btn-light dropdown-toggle" data-toggle="dropdown">
+                        <i class="fa fa-search"></i>
+                      </a>
+                      <div class="dropdown-menu p-3" aria-labelledby="dropdownMenuButton">
+                        <div class="form-group m-0">
+                          <input type="text" class="form-control form-control-sm" placeholder="搜索所有工程"style="width:300px">
+                        </div>
+                      </div>
                     </div>
-                </div>
-                <div class="col-lg-10">
+                      <ul class="nav nav-pills flex-column">
+                          <li class="nav-item">
+                              <a class="nav-link" href="project-management.html" data-toggle="tooltip" data-placement="right" data-original-title="全部"><i class="fa fa-bars"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link" href="#"  data-toggle="tooltip" data-placement="right" data-original-title="最近使用"><i class="fa fa-bookmark"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link" href="project-management-share.html"  data-toggle="tooltip" data-placement="right" data-original-title="共享"><i class="fa fa-share-alt"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link active" href="project-management-synergy.html"  data-toggle="tooltip" data-placement="right" data-original-title="协同工作"><i class="fa fa-users"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link" href="#"  data-toggle="tooltip" data-placement="right" data-original-title="归档"><i class="fa fa-book"></i></a>
+                          </li>
+                          <li class="nav-item">
+                              <a class="nav-link" href="project-management-Recycle.html" data-toggle="tooltip" data-placement="right" data-original-title="回收站"><i class="fa fa-trash"></i></a>
+                          </li>
+                      </ul>
+                  </div>
+              </div>
+                <div class="col">
                     <div class="toolsbar">
                         <!-- <div class="tools-btn btn-group align-top">
                             <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj1" class="btn btn-sm">新建 <i class="fa fa-cubes"></i> 建设项目</a>

+ 18 - 9
project-management.html

@@ -69,7 +69,7 @@
                     <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-buy.html" target="_blank">产品激活</a>
                         <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
                         <div class="dropdown-divider"></div>
                         <a class="dropdown-item" href="#" target="_blank">退出登录</a>
@@ -84,27 +84,36 @@
     <div class="main">
         <div class="poj-manage container-fluid">
             <div class="row">
-                <div class="col-auto">
+                <div class="col-auto p-0">
                     <div class="poj-cate">
-                        <input type="text" class="my-2 form-control form-control-sm" placeholder="搜索所有工程">
+                      <div class="dropdown">
+                        <a class="btn btn-light dropdown-toggle" data-toggle="dropdown">
+                          <i class="fa fa-search"></i>
+                        </a>
+                        <div class="dropdown-menu p-3" aria-labelledby="dropdownMenuButton">
+                          <div class="form-group m-0">
+                            <input type="text" class="form-control form-control-sm" placeholder="搜索所有工程"style="width:300px">
+                          </div>
+                        </div>
+                      </div>
                         <ul class="nav nav-pills flex-column">
                             <li class="nav-item">
-                                <a class="nav-link active" href="project-management.html">全部</a>
+                                <a class="nav-link active" href="project-management.html" data-toggle="tooltip" data-placement="right" data-original-title="全部"><i class="fa fa-bars"></i></a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="#">最近使用</a>
+                                <a class="nav-link" href="#"  data-toggle="tooltip" data-placement="right" data-original-title="最近使用"><i class="fa fa-bookmark"></i></a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="project-management-share.html">共享</a>
+                                <a class="nav-link" href="project-management-share.html"  data-toggle="tooltip" data-placement="right" data-original-title="共享"><i class="fa fa-share-alt"></i></a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="project-management-synergy.html">协同工作</a>
+                                <a class="nav-link" href="project-management-synergy.html"  data-toggle="tooltip" data-placement="right" data-original-title="协同工作"><i class="fa fa-users"></i></a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="#">归档</a>
+                                <a class="nav-link" href="#"  data-toggle="tooltip" data-placement="right" data-original-title="归档"><i class="fa fa-book"></i></a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="project-management-Recycle.html">回收站</a>
+                                <a class="nav-link" href="project-management-Recycle.html" data-toggle="tooltip" data-placement="right" data-original-title="回收站"><i class="fa fa-trash"></i></a>
                             </li>
                         </ul>
                     </div>

+ 69 - 176
user-buy.html

@@ -31,7 +31,7 @@
                   <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-buy.html" target="_blank">产品激活</a>
                       <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
                       <div class="dropdown-divider"></div>
                       <a class="dropdown-item" href="#" target="_blank">退出登录</a>
@@ -47,7 +47,7 @@
         <div class="poj-manage container-fluid">
             <div class="row">
                 <div class="col-lg-2">
-                    <div class="poj-cate mt-3">
+                    <div class="mt-3">
                         <ul class="nav nav-pills flex-column">
                             <li class="nav-item">
                                 <a class="nav-link" href="user-info.html">账号资料</a>
@@ -56,7 +56,7 @@
                                 <a class="nav-link" href="user-safe.html">账号安全</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link active" href="user-buy.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>
@@ -66,193 +66,86 @@
                 </div>
                 <div class="col-lg-10 side-content">
                     <div class="col-lg-12 my-3">
-                        <legend>购买企业版</legend>
+                        <!-- <legend>购买企业版</legend>
                         <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>
-                        </div>
-                        <legend>购买地区版本</legend>
-                        <div class="row mb-5">
-                            <div class="col-sm-6">
-                                <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> -->
+                        <legend class=" mb-4">激活专业版</legend>
+                        <div class="row">
+                            <div class="col-sm-6 mb-5">
+                                <div class="card">
+                                  <div class=" card-body">
+                                    <h3 class="card-title">免费版 </h3>
+                                    <a class="btn btn-outline-secondary disabled"><i class="fa fa-check"></i> 已激活</a>
+                                    <p class="card-text">
+                                      <ul class="pl-3">
+                                        <li>只可创建 50 个单位工程</li>
+                                        <li>报表带水印</li>
+                                      </ul>
+                                      </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>
+                                   </ul>
                                 </div>
                             </div>
-                            <div class="col-sm-6">
-                                <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 class="col-sm-6 mb-5">
+                                <div class="card">
+                                  <div class=" card-body">
+                                    <h3 class="card-title">专业版</h3>
+                                    <a class="btn btn-primary" href="activ" data-toggle="modal" data-target="#activ">立即激活</a>
+                                    <p class="card-text">
+                                      <ul class="pl-3">
+                                        <li>创建单位工程无限制</li>
+                                        <li>报表无水印</li>
+                                      </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">重庆版</li>
+                                   </ul>
                                 </div>
                             </div>
                         </div>
-                        <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>
-                        <div class="card card-body">
-                          <table class="table table-hover">
-                            <thead>
-                                <th>功能</th>
-                                <th>免费版</th>
-                                <th>专业版</th>
-                                <th width="200">选购</th>
-                                <th width="130">到期</th>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <th>功能1</th>
-                                    <td></td>
-                                    <td>
-                                        <h5 class="text-success"><i class="fa fa-check-square" aria-hidden="true"></i></h5></td>
-                                    <td>
-                                      <label class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input">
-                                        <span class="custom-control-indicator"></span>
-                                        <span class="custom-control-description">添加购物车</span>
-                                      </label>
-                                    </td>
-                                    <td>2018-01-10</td>
-                                </tr>
-                                <tr>
-                                    <th>功能2</th>
-                                    <td></td>
-                                    <td>
-                                        <h5 class="text-success"><i class="fa fa-check-square" aria-hidden="true"></i></h5></td>
-                                    <td>
-                                      <label class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input">
-                                        <span class="custom-control-indicator"></span>
-                                        <span class="custom-control-description">添加购物车</span>
-                                      </label>
-                                    </td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <th>功能4</th>
-                                    <td></td>
-                                    <td></td>
-                                    <td>
-                                      <label class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input">
-                                        <span class="custom-control-indicator"></span>
-                                        <span class="custom-control-description">添加购物车</span>
-                                      </label>
-                                    </td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <th>功能5</th>
-                                    <td></td>
-                                    <td></td>
-                                    <td>
-                                      <label class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input">
-                                        <span class="custom-control-indicator"></span>
-                                        <span class="custom-control-description">添加购物车</span>
-                                      </label>
-                                    </td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <th>功能6</th>
-                                    <td></td>
-                                    <td></td>
-                                    <td>
-                                      <label class="custom-control custom-checkbox">
-                                        <input type="checkbox" class="custom-control-input">
-                                        <span class="custom-control-indicator"></span>
-                                        <span class="custom-control-description">添加购物车</span>
-                                      </label>
-                                    </td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <th>功能7</th>
-                                    <td></td>
-                                    <td>
-                                        <h5 class="text-success"><i class="fa fa-check-square" aria-hidden="true"></i></h5></td>
-                                        <td>
-                                          <label class="custom-control custom-checkbox">
-                                            <input type="checkbox" class="custom-control-input">
-                                            <span class="custom-control-indicator"></span>
-                                            <span class="custom-control-description">添加购物车</span>
-                                          </label>
-                                        </td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <th>功能8</th>
-                                    <td></td>
-                                    <td>
-                                        <h5 class="text-success"><i class="fa fa-check-square" aria-hidden="true"></i></h5></td>
-                                    <td>您已购买专业版</td>
-                                    <td></td>
-                                </tr>
-                            </tbody>
-                        </table>
-                          <legend><i class="fa fa-shopping-cart" aria-hidden="true"></i> 购物车</legend>
-                          <table class="table table-sm">
-                            <tbody>
-                                <tr>
-                                    <th class="">清单</th>
-                                    <td class="text-lg-right">
-                                        <ul class="list-unstyled">
-                                            <li>功能1 ¥200.00</li>
-                                            <li>功能2 ¥200.00</li>
-                                            <li>功能3 ¥200.00</li>
-                                            <li>功能6 ¥200.00</li>
-                                            <li>功能7 ¥200.00</li>
-                                            <li>功能8 ¥200.00</li>
-                                        </ul>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <th class="">周期</th>
-                                    <td class="text-lg-right">
-                                        <div class="row">
-                                            <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>
-                                                  <span class="custom-control-description">年付(最高7折)</span>
-                                                </label>
-                                                <label class="custom-control custom-radio">
-                                                  <input id="radio2" name="radio" type="radio" class="custom-control-input">
-                                                  <span class="custom-control-indicator"></span>
-                                                  <span class="custom-control-description">月付</span>
-                                                </label>
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-lg-2 ml-auto">
-                                                <select class="form-control "><option>一年(9折)</option><option>三年(8折)</option><option>五年(7折)</option></select>
-                                            </div>
-                                        </div>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <th class="">总价</th>
-                                    <td class="text-lg-right">
-                                        <h4><span  class="text-danger">优惠价¥999.00</span> <del>原价¥1399.00</del></h4></td>
-                                </tr>
-                                <tr>
-                                    <th></th>
-                                    <td class="text-lg-right"><button class="btn btn-primary">立即支付</button></td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
+    <!--激活产品-->
+    <div class="modal fade" id="activ" data-backdrop="static" style="display: none;" aria-hidden="true">
+        <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">×</span>
+                  </button>
+                </div>
+                <div class="modal-body">
+                  <div class="form-group">
+                    <input class="form-control" placeholder="输入激活码">
+                  </div>
+                  <div class="alert alert-danger" role="alert">
+                    激活码无效
+                  </div>
+                  <div class="alert alert-success" role="alert">
+                    输入激活码为 「广东专业版」 确认是否激活
+                  </div>
+                  <div class="alert alert-warning" role="alert">
+                    输入激活码为 「广东专业版」 您已经激活该版本
+                  </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <a href="" 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>

+ 3 - 3
user-info.html

@@ -31,7 +31,7 @@
                   <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-buy.html" target="_blank">产品激活</a>
                       <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
                       <div class="dropdown-divider"></div>
                       <a class="dropdown-item" href="#" target="_blank">退出登录</a>
@@ -47,7 +47,7 @@
         <div class="poj-manage container-fluid">
             <div class="row">
                 <div class="col-lg-2">
-                    <div class="poj-cate mt-3">
+                    <div class="mt-3">
                         <ul class="nav nav-pills flex-column">
                             <li class="nav-item">
                                 <a class="nav-link active" href="user-info.html">账号资料</a>
@@ -56,7 +56,7 @@
                                 <a class="nav-link" href="user-safe.html">账号安全</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="user-buy.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>

+ 3 - 3
user-safe.html

@@ -31,7 +31,7 @@
                   <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-buy.html" target="_blank">产品激活</a>
                       <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
                       <div class="dropdown-divider"></div>
                       <a class="dropdown-item" href="#" target="_blank">退出登录</a>
@@ -47,7 +47,7 @@
         <div class="poj-manage container-fluid">
             <div class="row">
                 <div class="col-lg-2">
-                    <div class="poj-cate mt-3">
+                    <div class="mt-3">
                         <ul class="nav nav-pills flex-column">
                             <li class="nav-item">
                                 <a class="nav-link" href="user-info.html">账号资料</a>
@@ -56,7 +56,7 @@
                                 <a class="nav-link active" href="user-safe.html">账号安全</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="user-buy.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>

+ 3 - 3
user-set.html

@@ -31,7 +31,7 @@
                   <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-buy.html" target="_blank">产品激活</a>
                       <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
                       <div class="dropdown-divider"></div>
                       <a class="dropdown-item" href="#" target="_blank">退出登录</a>
@@ -47,7 +47,7 @@
         <div class="poj-manage container-fluid">
             <div class="row">
                 <div class="col-lg-2">
-                    <div class="poj-cate mt-3">
+                    <div class="mt-3">
                         <ul class="nav nav-pills flex-column">
                             <li class="nav-item">
                                 <a class="nav-link" href="user-info.html">账号资料</a>
@@ -56,7 +56,7 @@
                                 <a class="nav-link" href="user-safe.html">账号安全</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="user-buy.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>