头部底色、用户信息修改

modules/pm/controllers/pm_controller.js

@@ -322,7 +322,6 @@ module.exports = {
         rationValuation = await engineeringLibModel.getLib(rationValuation);
         let absoluteUrl = compilationData.overWriteUrl ? request.app.locals.rootDir + compilationData.overWriteUrl : request.app.locals.rootDir;
         let overWriteUrl = fs.existsSync(absoluteUrl) && fs.statSync(absoluteUrl).isFile()? compilationData.overWriteUrl : null;
-        //let valuationOpts = billValuation.map(data => {return {name: data.name, id: data.id}}).reverse();
         let renderData = {
             isFirst: isFirst,
             userAccount: request.session.userAccount,

modules/users/controllers/login_controller.js

@@ -242,6 +242,7 @@ class LoginController {
 
             let sessionUser = {
                 ssoId: userData.id,
+                company: userInfo.company,
                 username: userData.username,
                 email: userData.useremail,
                 mobile: userData.mobile,

modules/users/controllers/user_controller.js

@@ -57,7 +57,9 @@ class UserController extends BaseController {
                 real_name: request.body.real_name,
                 province: request.body.province,
                 company: request.body.company,
-                version: request.body.version
+                version: request.body.version,
+                company_type: request.body.company_type,
+                company_scale: request.body.company_scale,
             };
             let sessionUser = request.session.sessionUser;
             // 切换验证场景

web/common/html/header.html

@@ -1,5 +1,6 @@
 <img id="f_btn" src="/web/dest/css/img/feeRate_btn.jpg" alt="" style="display: none" />
-<nav class="navbar p-0 ">
+<!-- <nav class="navbar p-0 "> -->
+<nav class="navbar navbar-expand-lg p-0 d-flex <%= versionName.includes('免费') ? 'free-version' : 'pro-version' %>">
     <% if(controller === 'boot' || controller === 'pm'){ %>
     <!--<a style="text-decoration: none" href="javascript:void(0);" class="header-logo">-->
     <% }else { %>
@@ -29,9 +30,10 @@
                 </div>
             </li>
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" id="link_userName"><%= sessionUser.real_name === '' ? sessionUser.mobile : sessionUser.real_name %></a>
+                <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>
                 <div class="dropdown-menu dropdown-menu-right">
-                    <a class="dropdown-item" href="/user/info" target="_blank">账号资料</a>
+                    <a class="dropdown-item" href="/user/info" target="_blank">企业资料</a>
+                    <a class="dropdown-item" href="/user/safe" target="_blank">账号安全</a>
                     <a class="dropdown-item" href="/user/buy" target="_blank">产品激活</a>
                     <a class="dropdown-item" href="/user/preferences" target="_blank">登录设置</a>
                     <div class="dropdown-divider"></div>
@@ -77,9 +79,10 @@
                 </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.real_name === '' ? sessionUser.mobile : sessionUser.real_name %></button>
+                        <button class="dropdown-item dropdown-toggle" type="button" data-toggle="dropdown"><%= 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/info" target="_blank">企业资料</a>
+                            <a class="dropdown-item" href="/user/safe" target="_blank">账号安全</a>
                             <a class="dropdown-item" href="/user/buy" target="_blank">产品激活</a>
                             <a class="dropdown-item" href="/user/preferences" target="_blank">登录设置</a>
                             <div class="dropdown-divider"></div>
@@ -280,7 +283,6 @@
 <div style="display: none">
     <%include dataStatistics.html %>
 </div>
-
 <!-- inject:js -->
 <script src="/lib/jquery/jquery-3.2.1.min.js"></script>
 <script type="text/javascript" src="/lib/jquery-ui/jquery-ui.min.js"></script>

web/users/html/user-buy.html

@@ -24,7 +24,7 @@
                     <div class="mt-3">
                         <ul class="nav nav-pills flex-column">
                             <li class="nav-item">
-                                <a class="nav-link" href="/user/info">账号资料</a>
+                                <a class="nav-link" href="/user/info">企业资料</a>
                             </li>
                             <li class="nav-item">
                                 <a class="nav-link" href="/user/safe">账号安全</a>
@@ -49,7 +49,7 @@
                         <legend class=" mb-4">激活专业版</legend>
                         <div class="row">
                             <div class="col-sm-4 mb-5">
-                                <div class="card">
+                                <div class="card free-version">
                                   <div class=" card-body">
                                     <h3 class="card-title">免费版 </h3>
                                       <p class="card-text">
@@ -74,7 +74,7 @@
                                 </div>
                             </div>
                             <div class="col-sm-4 mb-5">
-                                <div class="card">
+                                <div class="card pro-version">
                                   <div class=" card-body">
                                     <h3 class="card-title">专业版</h3>
                                       <p class="card-text">

web/users/html/user-info.html

@@ -1,11 +1,11 @@
-    <!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="zh-CN">
 
 <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>账号资料-大司空云计价</title>
+    <title>企业资料-大司空云计价</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
@@ -24,7 +24,7 @@
                 <div class="mt-3">
                     <ul class="nav nav-pills flex-column">
                         <li class="nav-item">
-                            <a class="nav-link active" href="/user/info">账号资料</a>
+                            <a class="nav-link active" href="/user/info">企业资料</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" href="/user/safe">账号安全</a>
@@ -40,13 +40,9 @@
             </div>
             <div class="col-lg-10">
                 <div class="col-lg-4">
-                    <legend class="my-3">账号资料</legend>
+                    <legend class="my-3">企业资料</legend>
                     <form id="info-form" method="post" action="/user/info">
                         <div class="form-group">
-                            <label class="form-control-label">您的姓名</label>
-                            <input class="form-control" value="<%= userData.real_name %>" placeholder="输入您的姓名" id="name" name="real_name" autocomplete="off">
-                        </div>
-                        <div class="form-group">
                             <label class="form-control-label">企业名称</label>
                             <input class="form-control" value="<%= userData.company %>" placeholder="输入您的企业名称" id="company" name="company" autocomplete="off">
                         </div>
@@ -58,6 +54,30 @@
                                 <% })%>
                             </select>
                         </div>
+                        <div class="form-group">
+                            <label class="form-control-label">企业类型</label>
+                            <select class="form-control" name="company_type">
+                                <% companyTypeList.forEach(function(company_type, index) {%>
+                                <option value="<%= index %>" <% if(index === userData.company_type) {%>selected="selected"<% } %>><%= company_type %></option>
+                                <% })%>
+                            </select>
+                        </div>
+                        <div class="form-group">
+                            <label class="form-control-label">企业规模</label>
+                            <select class="form-control" name="company_scale">
+                                <% companyScaleList.forEach(function(company_scale, index) {%>
+                                <option value="<%= index %>" <% if(index === userData.company_scale) {%>selected="selected"<% } %>><%= company_scale %></option>
+                                <% })%>
+                            </select>
+                        </div>
+                        <div class="form-group">
+                            <label class="form-control-label">联系人</label>
+                            <input class="form-control" value="<%= userData.real_name %>" placeholder="输入您的姓名" id="name" name="real_name" autocomplete="off">
+                        </div>
+                        <div class="form-group">
+                            <label class="form-control-label">当前管理账号（登录账号）</label>
+                            <input class="form-control" value="<%= userData.mobile %>" readonly>
+                        </div>
                     <!--    <div class="form-group">
                             <label class="form-control-label">企业类型</label>
                             <select class="form-control" name="company_type">
@@ -80,6 +100,7 @@
                             <button class="btn btn-primary" type="submit">确认</button>
                         </div>
                     </form>
+
                 </div>
             </div>
         </div>

web/users/html/user-safe.html

@@ -24,7 +24,7 @@
                 <div class="mt-3">
                     <ul class="nav nav-pills flex-column">
                         <li class="nav-item">
-                            <a class="nav-link" href="/user/info">账号资料</a>
+                            <a class="nav-link" href="/user/info">企业资料</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link active" href="/user/safe">账号安全</a>
@@ -43,10 +43,9 @@
                     <legend class="my-3">账号安全</legend>
                     <from>
                         <div class="form-group">
-                            <label class="form-control-label">登录密码</label>
-                            <div class="form-control-static">
-                                <a class="btn btn-outline-primary btn-sm" href="https://sso.smartcost.com.cn/chpasswd" target="_blank">修改密码</a>
-                            </div>
+                            <label class="form-control-label">手机号码（登录账号）</label>
+                            <p class="form-control-static mb-0"><%= userData.mobile %> <span class="badge badge-success">已验证</span></p>
+                            <a class="btn btn-outline-primary btn-sm" href="https://sso.smartcost.com.cn/changeMobile" target="_blank">更换手机</a>
                         </div>
                         <div class="form-group">
                             <label class="form-control-label">邮箱地址</label>
@@ -55,7 +54,7 @@
                                     class="badge badge-default">未验证</span><% } else { %><span
                                     class="badge badge-success">已验证</span><% } %></p>
                             <% if (userData.isUserActive === 0) { %><a class="btn btn-outline-primary btn-sm" target="_blank" href="https://sso.smartcost.com.cn/profile">验证邮箱</a>
-                            <a class="btn btn-outline-primary btn-sm" target="_blank" href="https://sso.smartcost.com.cn/nactchm">更换邮箱</a>
+                            <a class="btn btn-secondary btn-sm" target="_blank" href="https://sso.smartcost.com.cn/nactchm">更换邮箱</a>
                             <% } else { %>
                             <a class="btn btn-outline-primary btn-sm" href="https://sso.smartcost.com.cn/changeMail" target="_blank">更换邮箱</a>
                             <% } %>
@@ -64,9 +63,10 @@
                             <% } %>
                         </div>
                         <div class="form-group">
-                            <label class="form-control-label">手机号码</label>
-                            <p class="form-control-static mb-0"><%= userData.mobile %> <span class="badge badge-success">已验证</span></p>
-                            <a class="btn btn-outline-primary btn-sm" href="https://sso.smartcost.com.cn/changeMobile" target="_blank">更换手机</a>
+                            <label class="form-control-label">登录密码</label>
+                            <div class="form-control-static">
+                                <a class="btn btn-outline-primary btn-sm" href="https://sso.smartcost.com.cn/chpasswd" target="_blank">修改密码</a>
+                            </div>
                         </div>
                         <div class="form-group">
                             <label class="form-control-label">异常登录提醒</label>
@@ -93,6 +93,7 @@
                             </div>
                         </div>
                     </from>
+
                 </div>
                 <div class="mt-5">
                     <legend>访问日志</legend>

web/users/html/user-set.html

@@ -25,7 +25,7 @@
                     <div class="mt-3">
                         <ul class="nav nav-pills flex-column">
                             <li class="nav-item">
-                                <a class="nav-link" href="/user/info">账号资料</a>
+                                <a class="nav-link" href="/user/info">企业资料</a>
                             </li>
                             <li class="nav-item">
                                 <a class="nav-link" href="/user/safe">账号安全</a>