1. 登录页面修改文字

2. 账号名称显示为“公司名称(联系人姓名)”
3. 右上角的Q群字体颜色改为白色，返回按钮和产品激活页部分文字改成白色

web/common/html/header.html

@@ -4,7 +4,7 @@
     <% if(controller === 'boot' || controller === 'pm'){ %>
     <!--<a style="text-decoration: none" href="javascript:void(0);" class="header-logo">-->
     <% }else { %>
-    <div class="mx-2"><a href="/pm" class="btn btn-sm" data-toggle="tooltip" title="返回项目管理"><i class="fa fa-angle-left" style="font-size:24px"></i></a></div>
+    <div class="mx-2"><a href="/pm" class="btn btn-sm text-white" data-toggle="tooltip" title="返回项目管理"><i class="fa fa-angle-left" style="font-size:24px"></i></a></div>
         <!--<a style="text-decoration: none" href="/pm" class="header-logo">-->
     <% } %>
     <div class="header-logo">
@@ -18,7 +18,7 @@
         <!--大屏菜单-->
         <ul class="nav navbar-nav" id="fluid-menu">
             <li class="nav-item dropdown" id="showqqgroup" >
-                <a class="nav-link text-danger" href="#"><i class="fa fa-qq" ></i> 群</a>
+                <a class="nav-link" href="#"><i class="fa fa-qq" ></i> 群</a>
                 <div class="dropdown-menu p-3 dropdown-menu-right" id="qqgroup" style="width: 200px;top:36px">
                     <p class="text-center">
                         <a href="https://jq.qq.com/?_wv=1027&k=5XivMJY" target="_blank" class="btn btn-sm btn-outline-primary">点击加入QQ交流群</a>
@@ -30,7 +30,7 @@
                 </div>
             </li>
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" id="link_userName"><%= sessionUser.company ? sessionUser.company : sessionUser.real_name ? sessionUser.real_name : sessionUser.mobile %></a>
+                <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" id="link_userName"><%= (sessionUser.company && sessionUser.real_name) ? (sessionUser.company + '（' + sessionUser.real_name + '）') : sessionUser.company ? sessionUser.company : sessionUser.real_name ? sessionUser.real_name : sessionUser.mobile %></a>
                 <div class="dropdown-menu dropdown-menu-right">
                     <a class="dropdown-item" href="/user/info" target="_blank">企业资料</a>
                     <a class="dropdown-item" href="/user/safe" target="_blank">账号安全</a>
@@ -79,7 +79,7 @@
                 </a>
                 <div class="dropdown-menu dropdown-menu-right">
                     <div class="dropdown dropleft dropdown-submenu">
-                        <button class="dropdown-item dropdown-toggle" type="button" data-toggle="dropdown"><%= sessionUser.company ? sessionUser.company : sessionUser.real_name ? sessionUser.real_name : sessionUser.mobile %></button>
+                        <button class="dropdown-item dropdown-toggle" type="button" data-toggle="dropdown"><%= (sessionUser.company && sessionUser.real_name) ? (sessionUser.company + '（' + sessionUser.real_name + '）') : sessionUser.company ? sessionUser.company : sessionUser.real_name ? sessionUser.real_name : sessionUser.mobile %></button>
                         <div class="dropdown-menu">
                             <a class="dropdown-item" href="/user/info" target="_blank">企业资料</a>
                             <a class="dropdown-item" href="/user/safe" target="_blank">账号安全</a>

web/users/html/login-sms.html

@@ -18,7 +18,7 @@
     <div class="container login-panel">
         <form class="form-signin">
             <h1 class="d-flex justify-content-center mb-0"><img src="/web/building_saas/img/building2.png" width="40" height="40" class="mr-3" style="margin-top: 5px"> 大司空云计价</h1>
-            <p class="text-center mb-4 text-muted">市政、房建、轨道、管廊管线等专业工程计价软件</p>
+            <p class="text-center mb-4 text-muted">市政、房建、轨道、管廊管线等建设工程计价软件</p>
             <p class="mb-1">您关闭了「账号登录」，请通过手机验证码登录。</p>
             <p class="">请点击“获取验证码”，验证码将发送至手机 <%= mobile.substr(0, 3) + '****' + mobile.substr(7, 11) %>，注意查收。</p>
             <div class="form-row sms-login-modal">

web/users/html/login-ver.html

@@ -18,7 +18,7 @@
     <div class="container login-panel ver-panel">
             <h1 class="d-flex justify-content-center mb-0">
                 <img src="/web/building_saas/img/building2.png" width="40" height="40" class="mr-3" style="margin-top: 5px"> 大司空云计价</h1>
-            <p class="text-center mb-4 text-muted">市政、房建、轨道、管廊管线等专业工程计价软件</p>
+            <p class="text-center mb-4 text-muted">市政、房建、轨道、管廊管线等建设工程计价软件</p>
             <div class="d-flex justify-content-between">
                 <h5 class="modal-title">选择费用定额</h5>
                 <p class=" text-warning"><i class="fa fa-exclamation-triangle"></i> <b>登录设置</b> 中可以修改您的登录习惯。</p>

web/users/html/login.html

@@ -21,7 +21,7 @@
                 <img src="/web/building_saas/img/building.png" width="40" height="40" class="mr-3" style="margin-top: 5px">
                 大司空云计价
             </h1>
-            <p class="text-center mb-4 text-muted">市政、房建、轨道、管廊管线等专业工程计价软件</p>
+            <p class="text-center mb-4 text-muted">市政、房建、轨道、管廊管线等建设工程计价软件</p>
             <p class="change-login-p">账号登录</p>
             <div class="form-group user-login-modal">
                 <input id="inputEmail" class="form-control " name="inputEmail" placeholder="邮箱/手机" autofocus="" />

web/users/html/user-buy.html

@@ -51,7 +51,7 @@
                             <div class="col-sm-4 mb-5">
                                 <div class="card free-version">
                                   <div class=" card-body">
-                                    <h3 class="card-title">免费版 </h3>
+                                    <h3 class="card-title text-white">免费版 </h3>
                                       <p class="card-text">
                                     <!--  <ul class="pl-3">
                                           <li>只可创建 50 个单位工程</li>
@@ -76,7 +76,7 @@
                             <div class="col-sm-4 mb-5">
                                 <div class="card pro-version">
                                   <div class=" card-body">
-                                    <h3 class="card-title">专业版</h3>
+                                    <h3 class="card-title text-white">专业版</h3>
                                       <p class="card-text">
                                       <!--<ul class="pl-3">
                                           <li>创建单位工程无限制</li>