Merge branch 'main' of http://192.168.0.75:3000/bonus/hn_cloud_web

# Conflicts:
#	public/public.js

czl-web/index.html

@@ -28,8 +28,8 @@
 	<div class="layui-header header header-demo">
 		<div class="layui-main">
 			<div class="admin-login-box">
-				<a class="logo" style="left: 0;" href="/">
+				<a class="logo" style="left: 0;" href="#">
-					<span style="font-size: 22px;">后台管理系统</span>
+					<span style="font-size: 20px;color:#ffffff;">后台管理系统</span>
 				</a>
 				<div class="admin-side-toggle">
 					<i class="fa fa-bars" aria-hidden="true"></i>

czl-web/login.html

@@ -95,7 +95,6 @@
 <script src="js/layui2.7.6/layui.js"></script>
 <script src="js/aes.js"></script>
 <script type="text/javascript" src="../public/public.js"></script>
-<script src="js/publicJs.js"></script>
 <script type="text/javascript">
     layui.use('layer', function () {
         var layer = layui.layer;

public/html/userForm.html

@@ -6,13 +6,13 @@
     <link rel="stylesheet" type="text/css" media="screen" href="../../smz-web/layui/css/layui.css">
     <link rel="stylesheet" href="../../smz-web/css/ztree/zTreeStyle/zTreeStyle.css" type="text/css">
     <style>
-        #orgContent {
+        #orgContent, #orgContentldlz, #orgContentCzl {
             z-index: 99;
             background-color: #fff;
             box-shadow: 1px 1px 5px #888888;
         }
 
-        #orgName {
+        #orgName, #departmentldlz, #department {
             border: 0;
             margin-top: 1%;
             width: 100%;
@@ -203,11 +203,12 @@
                     <div class="layui-input-inline" style="width: 100%;">
                         <div style="border: 0.5px solid #E6E6E6;height: 37px;text-indent: 10px;">
                             <input class="FormElement ui-widget-content ui-corner-all" id="departmentldlz"
-                                   readonly="readonly" value="点击进行部门选择" jyValidate="required" type="text"
+                                   readonly="readonly" value="请选择部门" jyValidate="required" type="text"
 
-                                   style="border: 0; margin-top: 1%;width: 100%; color: #757575;"/>
+                                   style="border: 0; margin-top: 1%;width: 100%; "/>
-                            <input type="hidden" id="departmentIdldlz" name="departmentIdldlz">
+                            <input type="hidden" id="departmentIdldlz" name="departmentIdldlz" value="">
-                            <div id='orgContentldlz' class="menuContent ztreeMC">
+                            <div id='orgContentldlz' class="menuContent ztreeMC"
+                                 style="display: none;position: absolute;width: 99%;">
                                 <ul id="departmentTreeldlz" class="ztree accountOrgTree"></ul>
                             </div>
                         </div>
@@ -220,7 +221,7 @@
                 <label class="layui-form-label"><i class="tip-required"
                                                    style="color: red;font-size: 20px">*</i>角色：</label>
                 <div class="layui-input-block">
-                    <select id="roleIdLdlz" class="layui-select" name="roleIdLdlz" lay-verify="required"></select>
+                    <select id="roleIdldlz" class="layui-select" name="roleIdldlz" lay-verify="required"></select>
                 </div>
             </div>
         </div>
@@ -236,9 +237,10 @@
                             <input class="FormElement ui-widget-content ui-corner-all" id="department"
                                    readonly="readonly" value="点击进行部门选择" jyValidate="required" type="text"
 
-                                   style="border: 0; margin-top: 1%;width: 100%; color: #757575;"/>
+                                   style="border: 0; margin-top: 1%;width: 100%; "/>
                             <input type="hidden" id="departmentId" name="departmentId">
-                            <div id='orgContentCzl' class="menuContent ztreeMC" style="display: none;position: absolute;width: 99%;">
+                            <div id='orgContentCzl' class="menuContent ztreeMC"
+                                 style="display: none;position: absolute;width: 99%;">
                                 <ul id="departmentTree" class="ztree accountOrgTree"></ul>
                             </div>
                         </div>
@@ -305,6 +307,8 @@
                 }
             },
         });
+        initRolesCzl();
+        initRolesLdlz();
 
         // initTree();
 
@@ -354,109 +358,63 @@
         });
 
         form.on('submit(formDemo)', function (data) {
-            clearErrors(); // 先清除所有错误样式
+            clearErrors(); // 清除所有错误
-            var dataType = data.field.permissionType;
-            if (dataType) {
-                if ($('#smz_1').is(':checked') || $('#smz_2').is(':checked')) {
-                    var hasError = false;
-                    if (!$('#userName').val()) {
-                        showError($('#userName'), '请输入用户名！');
-                        hasError = true;
-                    } else if (!/^1\d{10}$/.test($('#phone').val())) {
-                        showError($('#phone'), '手机号格式不正确！');
-                        hasError = true;
-                    } else if (!$('#orgId').val()) {
-                        showError($('#orgName'), '请选择分公司！');
-                        hasError = true;
-                    } else if (!$('#roles').val()) {
-                        showError($('#roles'), '请选择角色！');
-                        hasError = true;
-                    } else if (!$('#proId').val() && $('#idNumber').val()) {
-                        showError($('#proId'), '请选择工程名称！');
-                        hasError = true;
-                    } else if (!$('#subId').val() && $('#idNumber').val()) {
-                        showError($('#subId'), '请选择分包商！');
-                        hasError = true;
-                    } else if (!$('#teamId').val() && $('#idNumber').val()) {
-                        showError($('#teamId'), '请选择班组！');
-                        hasError = true;
-                    }
-                    if (hasError) {
-                        return false; // 阻止提交
-                    }
-                }
 
-                if ($('#czl_1').is(':checked') || $('#czl_2').is(':checked')) {
-                    var hasError = false;
-                    if (!$('#departmentId').val()) {
-                        showError($('#department'), '请选择部门！');
-                        hasError = true;
-                    }else if (!$('#roleIdCzl').val()) {
-                        showError($('#roleIdCzl'), '请选择角色！');
-                        hasError = true;
-                    }
-                    if (hasError) {
-                        return false; // 阻止提交
-                    }
-                }
-                if ($('#ldlz').is(':checked')){
-                    var hasError = false;
-                    if (!$('#departmentIdldlz').val()) {
-                        showError($('#departmentldlz'), '请选择部门！');
-                        hasError = true;
-                    }else if (!$('#roleIdLdlz').val()) {
-                        showError($('#roleIdLdlz'), '请选择角色！');
-                        hasError = true;
-                    }
-                    if (hasError) {
-                        return false; // 阻止提交
-                    }
-                }
-
-               if ($('#czl_1').is(':checked') || $('#czl_2').is(':checked')) {
-                   addCzl(data); // 触发你的提交函数
-               }
-               if ($('#ldlz').is(':checked')) {
-                   addLdlz(data); // 触发你的提交函数
-                   if ($('#smz_1').is(':checked') || $('#smz_2').is(':checked')) {
-                       add(data); // 触发你的提交函数
-                   }
-               }
-            } else {
-                layer.msg('请选择系统类型！', {icon: 5});
-            }
-            return false; // 阻止默认跳转
-        });
-    });
-
-    function add(data) {
             var fieldData = data.field || {};
+            var addType = [];
+            if ($('#smz_1').is(':checked') || $('#smz_2').is(':checked')) addType.push("1");
+            if ($('#czl_1').is(':checked') || $('#czl_2').is(':checked')) addType.push("2");
+            if ($('#ldlz').is(':checked')) addType.push("3");
 
-        //构建实名制json数据
+            if (addType.length === 0) {
+                layer.msg('请选择系统类型！', {icon: 5});
+                return false;
+            }
+
+            // 先校验必填项
+            var hasError = false;
+            if (!$('#userName').val()) { showError($('#userName'), '请输入用户名！'); hasError = true; }
+            if (!/^1\d{10}$/.test($('#phone').val())) { showError($('#phone'), '手机号格式不正确！'); hasError = true; }
+            if ($('#smz_1').is(':checked') || $('#smz_2').is(':checked')) {
+                if (!$('#orgId').val()) { showError($('#orgName'), '请选择分公司！'); hasError = true; }
+                if (!$('#roles').val()) { showError($('#roles'), '请选择角色！'); hasError = true; }
+            }
+            if ($('#czl_1').is(':checked') || $('#czl_2').is(':checked')) {
+                if (!$('#departmentId').val()) { showError($('#department'), '请选择部门！'); hasError = true; }
+                if (!$('#roleIdCzl').val()) { showError($('#roleIdCzl'), '请选择角色！'); hasError = true; }
+            }
+            if ($('#ldlz').is(':checked')) {
+                if (!$('#departmentIdldlz').val()) { showError($('#departmentldlz'), '请选择部门！'); hasError = true; }
+                if (!$('#roleIdldlz').val()) { showError($('#roleIdldlz'), '请选择角色！'); hasError = true; }
+            }
+            if (hasError) return false;
+
+            var loadIndex = layer.msg('加载中', {icon: 16, shade: 0.01});
+
+            var selectedTypes = [];
+            $('input[name="permissionType"]:checked').each(function() {
+                selectedTypes.push($(this).val());
+            });
+            var dataTypeStr = selectedTypes.join(',');
+
+            // 构建 JSON 数据
             var smzJson = {
                 userName: fieldData.userName || null,
                 loginName: fieldData.loginName || null,
                 userPhone: fieldData.phone || null,
                 orgId: fieldData.orgId || null,
+                companyId: fieldData.companyId || null,
                 proId: fieldData.proId || null,
                 subId: fieldData.subId || null,
                 roleId: fieldData.roleId || null,
-            type: roleType || null, // 注意：后端可能期望 "type" 而不是 "permissionType"
+                type: roleType || null,
-            dataType: fieldData.permissionType || null, // 注意：后端可能期望 "type" 而不是 "permissionType"
+                dataType: dataTypeStr || null,
                 sex: fieldData.sex || null,
                 teamId: fieldData.teamId || null,
                 idCard: fieldData.idNumber || null,
                 isAdmin: fieldData.isAdmin || null
             };
-        // 构建承载力json数据
+
-        var ldlzJson = {
-            userName: fieldData.userName || null,
-            loginName: fieldData.loginName || null,
-            userPhone: fieldData.phone || null,
-            orgId: fieldData.departmentIdldlz || null,
-            roleId: fieldData.roleIdLdlz || null
-        };
-        // 承载力
             var czlJson = {
                 userName: fieldData.userName || null,
                 loginName: fieldData.loginName || null,
@@ -465,102 +423,95 @@
                 roleId: fieldData.roleIdCzl || null
             };
 
-        var jsonData = {
+            var ldlzJson = {
-            smz: smzJson,
-            ldlz: ldlzJson,
-            czl: czlJson
-        }
-
-        // 构建请求参数
-        var requestData = {
-            userName: fieldData.userName || null,
-            loginName: fieldData.loginName || null,
-            userPhone: fieldData.phone || null,
-            orgId: fieldData.orgId || null,
-            proId: fieldData.proId || null,
-            subId: fieldData.subId || null,
-            roleId: fieldData.roleId || null,
-            type: roleType || null, // 注意：后端可能期望 "type" 而不是 "permissionType"
-            dataType: fieldData.permissionType || null, // 注意：后端可能期望 "type" 而不是 "permissionType"
-            sex: fieldData.sex || null,
-            teamId: fieldData.teamId || null,
-            idCard: fieldData.idNumber || null,
-            isAdmin: fieldData.isAdmin || null,
-            jsonData: JSON.stringify(jsonData)
-        };
-        $.ajax({
-            type: 'post',
-            url: request_url + '/realname/publicLogin/addUserData',
-            contentType: "application/json; charset=utf-8",
-            data: JSON.stringify(requestData),
-            success: function (data) {
-                if (data.code != 200) {
-                    layer.msg(data.msg);
-                    return;
-                } else {
-                    layer.msg(data.msg);
-                    parent.layer.close();
-                }
-            }
-        });
-    }
-
-    // 承载力添加用户
-    function addCzl(data) {
-        var fieldData = data.field || {};
-        // 构建请求参数
-        var requestData = {
-            userName: fieldData.userName || null,
-            loginName: fieldData.loginName || null,
-            userPhone: fieldData.phone || null,
-            orgId: fieldData.departmentId || null,
-            roleId: fieldData.roleIdCzl || null
-        };
-        $.ajax({
-            type: 'post',
-            url: czl_ht_url + '/publicLogin/addUser',
-            contentType: "application/json; charset=utf-8",
-            data: JSON.stringify(requestData),
-            success: function (data) {
-                if (data.code != 200) {
-                    layer.msg(data.msg);
-                    return;
-                } else {
-                    layer.msg(data.msg);
-                    parent.layer.close();
-                }
-            }
-        });
-    }
-
-    // 领导履职添加用户
-    function addLdlz(data) {
-        var fieldData = data.field || {};
-        // 构建请求参数
-        var requestData = {
                 userName: fieldData.userName || null,
                 loginName: fieldData.loginName || null,
                 userPhone: fieldData.phone || null,
                 orgId: fieldData.departmentIdldlz || null,
-            roleId: fieldData.roleIdLdlz || null
+                roleId: fieldData.roleIdldlz || null
             };
-        $.ajax({
+
+            var jsonData = { smz: smzJson, czl: czlJson, ldlz: ldlzJson };
+
+
+            smzJson.jsonData = JSON.stringify(jsonData);
+            console.log(smzJson)
+            // Promise 封装
+            function addSmz() {
+                return $.ajax({
                     type: 'post',
                     url: request_url + '/realname/publicLogin/addUserData',
                     contentType: "application/json; charset=utf-8",
-            data: JSON.stringify(requestData),
+                    headers: {
-            success: function (data) {
+                        Authorization: "Bearer " + localStorage.getItem("public_token"),
-                if (data.code != 200) {
+                    },
-                    layer.msg(data.msg);
+                    data: JSON.stringify(smzJson)
-                    return;
-                } else {
-                    layer.msg(data.msg);
-                    parent.layer.close();
-                }
-            }
                 });
             }
 
+            function addCzl() {
+                return $.ajax({
+                    type: 'post',
+                    url: czl_ht_url + '/publicLogin/addUser',
+                    contentType: "application/json; charset=utf-8",
+                    headers: {
+                        Authorization: "Bearer " + localStorage.getItem("public_token"),
+                    },
+                    data: JSON.stringify(czlJson)
+                });
+            }
+
+            function addLdlz() {
+                return $.ajax({
+                    type: 'post',
+                    url: request_url + '/ldlz/publicLogin/addUser',
+                    contentType: "application/json; charset=utf-8",
+                    headers: {
+                        Authorization: "Bearer " + localStorage.getItem("public_token"),
+                    },
+                    data: JSON.stringify(ldlzJson)
+                });
+            }
+
+            // 先执行必走 addSmz
+            addSmz().done(function (data) {
+                if (data.code !== 200) {
+                    layer.close(loadIndex);
+                    layer.msg(data.msg, {icon: 5});
+                    return;
+                }
+
+                // 构建后续请求数组
+                var requests = [];
+                if ($('#czl_1').is(':checked') || $('#czl_2').is(':checked')) requests.push(addCzl());
+                if ($('#ldlz').is(':checked')) requests.push(addLdlz());
+
+                if (requests.length > 0) {
+                    $.when.apply($, requests).done(function () {
+                        layer.close(loadIndex);
+                        layer.msg('新增成功', {icon: 1});
+                        setTimeout("reloading()", 2100);
+                    }).fail(function () {
+                        layer.close(loadIndex);
+                        layer.msg('新增失败，请检查！', {icon: 5});
+                    });
+                } else {
+                    layer.close(loadIndex);
+                    layer.msg('新增成功', {icon: 1});
+                    setTimeout("reloading()", 2100);
+                }
+
+            }).fail(function () {
+                layer.close(loadIndex);
+                layer.msg('新增失败，请检查！', {icon: 5});
+            });
+
+            return false;
+        });
+
+
+    });
+
 
     // 获取工程列表
     function getProInfo(companyId, proId) {
@@ -571,6 +522,9 @@
             type: 'post',
             url: request_url + '/realname/publicLogin/getProList',
             data: {companyId: companyId},
+            headers: {
+                Authorization: "Bearer " + localStorage.getItem("public_token"),
+            },
             async: false,
             success: function (data) {
                 var data = data.data;
@@ -603,6 +557,9 @@
             data: {proId: proId},
             async: false,
             dataType: 'json',
+            headers: {
+                Authorization: "Bearer " + localStorage.getItem("public_token"),
+            },
             success: function (data) {
                 var data = data.data;
                 if (data.length <= 0) {
@@ -632,6 +589,9 @@
             data: {companyId: companyId},
             async: false,
             dataType: 'json',
+            headers: {
+                Authorization: "Bearer " + localStorage.getItem("public_token"),
+            },
             success: function (data) {
                 data.forEach(function (d) {
                     select.append('<option value="' + d.id + '">' + d.name + '</option>');
@@ -653,6 +613,9 @@
             url: request_url + '/realname/publicLogin/getRoleList',
             data: {companyId: companyId, orgId: orgId},
             async: false,
+            headers: {
+                Authorization: "Bearer " + localStorage.getItem("public_token"),
+            },
             success: function (data) {
                 var data = data.data;
                 if (data.length > 0) {
@@ -685,6 +648,9 @@
                 url: request_url + '/realname/publicLogin/findRoleType',
                 data: {roleId: roleId},
                 dataType: "json",
+                headers: {
+                    Authorization: "Bearer " + localStorage.getItem("public_token"),
+                },
                 success: function (data) {
                     var type = data.type;
                     var roleLevel = data.roleLevel;
@@ -791,6 +757,9 @@
             data: {subId: subId},
             async: false,
             dataType: 'json',
+            headers: {
+                Authorization: "Bearer " + localStorage.getItem("public_token"),
+            },
             success: function (data) {
                 if (data.code == 200) {
                     var data = data.data;
@@ -820,6 +789,9 @@
                 roles: roles
             },
             dataType: 'json',
+            headers: {
+                Authorization: "Bearer " + localStorage.getItem("public_token"),
+            },
             success: function (data) {
                 if (data.code == 200) {
                     var pro = document.getElementById("pro");
@@ -900,6 +872,12 @@
             }
         }, 150);
     }
+
+    function reloading() {
+        var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+        parent.layer.close(index); //再执行关闭
+        window.parent.location.reload();
+    }
 </script>
 
 </body>

public/login/js/companyTreeCzl.js

@@ -10,3 +10,30 @@ bindTreeSelector({
         typeId = node.type;
     }
 });
+
+function initRolesCzl(orgId){
+    var select = $('#roleIdCzl');
+    select.empty();
+    select.append('<option value="">请选择角色</option>');
+    $.ajax({
+        type: 'post',
+        url: request_url + '/czl/publicLogin/getRoleList',
+        data: {},
+        async: false,
+        headers: {
+            Authorization: "Bearer " + localStorage.getItem("public_token"),
+        },
+        success: function (data) {
+            var data = data.obj;
+            if (data.length > 0) {
+                data.forEach(function (d) {
+                    select.append('<option value="' + d.key + '">' + d.value + '</option>');
+                });
+                layui.form.render('select');
+            } else {
+                select.append('<option value="">暂无数据</option>');
+                layui.form.render('select');
+            }
+        }
+    });
+}

public/login/js/companyTreeLdlz.js

@@ -1,7 +1,7 @@
 bindTreeSelector({
     inputTextId: "departmentldlz",
     inputValueId: "departmentIdldlz",
-    panelId: "orgContentLdlz",
+    panelId: "orgContentldlz",
     treeId: "departmentTreeldlz",
     ajaxUrl: request_url + "/ldlz/publicLogin/getDeptTree",
     extraSet: function (node) {
@@ -10,3 +10,32 @@ bindTreeSelector({
         typeIdLdlz = node.type;
     }
 });
+
+
+// 初始化角色列表
+function initRolesLdlz(orgId) {
+    var select = $('#roleIdldlz');
+    select.empty();
+    select.append('<option value="">请选择角色</option>');
+    $.ajax({
+        type: 'post',
+        url: request_url + '/ldlz/publicLogin/getRoleList',
+        data: {},
+        async: false,
+        headers: {
+            Authorization: "Bearer " + localStorage.getItem("public_token"),
+        },
+        success: function (data) {
+            var data = data.data;
+            if (data.length > 0) {
+                data.forEach(function (d) {
+                    select.append('<option value="' + d.roleId + '">' + d.roleName + '</option>');
+                });
+                layui.form.render('select');
+            } else {
+                select.append('<option value="">暂无数据</option>');
+                layui.form.render('select');
+            }
+        }
+    });
+}

public/login/js/treeBind.js

@@ -21,6 +21,7 @@ function bindTreeSelector(options) {
                 Authorization: "Bearer " + localStorage.getItem("public_token"),
             },
             success: function (res) {
+                console.log("树加载成功：" ,treeId);
                 $.fn.zTree.init($("#" + treeId), {
                     view: { dblClickExpand: false, selectedMulti: false, nameIsHTML: true },
                     data: { simpleData: { enable: true } },

public/login/js/user.js

@@ -26,7 +26,7 @@ function init(){
             "serverSide": true,
             "pagingType": "full_numbers", //首页|尾页
             "language": {
-                "url": contentPath + "/public/login/js/plugin/datatables/Chinese.lang"
+                "url": "../login/js/plugin/datatables/Chinese.lang"
             },
             "ajax": {
                 "url": request_url + "/realname/publicLogin/getUserList",
@@ -98,21 +98,27 @@ function init(){
                 },
                 {"data": "userName", "defaultContent": ""},
                 {"data": "loginName", "defaultContent": ""},
-                { "data": "", "defaultContent": "", "render":function(data, type, row){
+                {
+                    "data": "", "defaultContent": "", "render": function (data, type, row) {
                         var dataType = row['dataType'];
-                        var html = '';
+                        // 如果 data 是空或 undefined，返回空
-                        if(dataType == 1){
+                        if (!dataType) return '';
-                            html += '<span class="label label-success">承载力后台</span>';
+
-                        }else if(dataType == 2){
+                        // 定义映射关系
-                            html += '<span class="label label-success">承载力大屏</span>';
+                        const labelMap = {
-                        }else if(dataType == 3){
+                            '1': '承载力后台',
-                            html += '<span class="label label-success">领导履职</span>';
+                            '2': '承载力大屏',
-                        }else if(dataType == 4){
+                            '3': '领导履职',
-                            html += '<span class="label label-success">自有人员</span>';
+                            '4': '自有人员',
-                        }else if(dataType == 5){
+                            '5': '自有人员大屏'
-                            html += '<span class="label label-success">自有人员大屏</span>';
+                        };
-                        }
+
-                        return html;
+                        // 分割字符串为数组，去空格并过滤无效值
+                        const types = String(dataType).split(',').map(item => item.trim()).filter(item => item in labelMap);
+                        // 转换为对应的中文标签
+                        const labels = types.map(type => `<span>${labelMap[type]}</span>`);
+                        // 用空格、逗号或其他方式拼接（这里用空格）
+                        return labels.join(', ');
                     }
                 },
                 {"data": "userPhone", "defaultContent": ""},
@@ -128,6 +134,8 @@ function init(){
                         var html = '';
                         html += buttonEdits(id,);
                         html += buttonDel(id);
+                        html += buttonReset(id);
+                        html += buttonPassword(id);
                         return html;
                     }
                 },
@@ -173,45 +181,18 @@ function insertTeamManager() {
  * */
 function del(id) {
     var data = {"id": id};
-    layer.confirm("确定删除吗？",{
+    layer.confirm("确定删除吗？",function () {
-        title: '删除确认',
-        btn: ['确定', '取消'],
-        // 关键：固定位置在屏幕中央
-        offset: '200px', // 距离顶部的固定偏移
-        fixed: true, // 固定定位
-        scrollbar: false, // 不锁定滚动条
-        // 或者使用百分比
-        // offset: '30%',
-        // 或者自动计算
-        // offset: 'auto',
-        // 或者限制在可视区域内
-        success: function(layero) {
-            // 对话框创建后的回调，确保在可视区域内
-            var $layer = $(layero);
-            var top = $layer.css('top');
-            var topNum = parseInt(top);
-
-            // 如果 top 值太大，调整到合理位置
-            if (topNum > 500) {
-                $layer.css('top', '200px');
-            }
-
-            // 确保对话框可见
-            $layer.css({
-                'display': 'block',
-                'visibility': 'visible'
-            });
-        }
-    },function(index) {
-        layer.close(index);
         $.ajax({
             type: 'post',
             contentType: "application/json; charset=utf-8",
-            url: ctxPath + '/TeamManager/deleteSubTeam',
+            url: request_url + '/realname/publicLogin/delUserData',
+            headers: {
+                Authorization: "Bearer " + localStorage.getItem("public_token"),
+            },
             data: JSON.stringify(data),
             dataType: 'json',
             success: function (data) {
-                if (data.resMsg == "删除成功") {
+                if (data.code == 200) {
                     layer.alert('删除成功', {icon: 1});
                     example.ajax.reload(null, false); // 刷新页面
                 } else {
@@ -222,6 +203,7 @@ function del(id) {
         })
     })
 }
+
 // 删除按钮
 function buttonDel(id) {
     var btn = $("<button class='layui-btn layui-btn-xs' title='删除' onclick='del(\"" + id + "\")' style='background-color: transparent;color: #ff4d4f;'>删除</button>");
@@ -234,23 +216,104 @@ function buttonEdits(id) {
     return btn.prop("outerHTML");
 }
 
+// 重置密码
+function buttonReset(id) {
+    var btn = $("<button class='layui-btn layui-btn-xs' title='重置密码' onclick='reset(\"" + id + "\")' style='background-color: transparent;color: #009688;'>重置密码</button>");
+    return btn.prop("outerHTML");
+}
+
+// 修改密码
+function buttonPassword(id) {
+    var btn = $("<button class='layui-btn layui-btn-xs' title='修改密码' onclick='updatePassword(\"" + id + "\")' style='background-color: transparent;color: #009688;'>修改密码</button>");
+    return btn.prop("outerHTML");
+}
+
+/**
+ * 修改密码
+ * @param id
+ */
+function updatePassword(id){
+    layer.prompt({
+        formType: 0,
+        value: '',
+        title: '请输入重置后密码',
+        btn:['确定','取消'],
+        btnAlign:'c',
+    }, function(value, index, elem){
+        if (!password_reg(value)){
+            layer.msg("您的密码复杂度太低（密码中必须包含大小字母、数字、特殊字符）！",{icon:0});
+            return false;
+        }else{
+            $.ajax({
+                type: 'post',
+                url: request_url + '/realname/publicLogin/resetPassword',
+                contentType: "application/json; charset=utf-8",
+                headers: {
+                    Authorization: "Bearer " + localStorage.getItem("public_token"),
+                },
+                data: JSON.stringify({"id": id,"password":value}),
+                success: function (data) {
+                    // 无论成功失败都关闭弹窗
+                    layer.close(index);
+                    if (data.code == 200) {
+                        layer.alert(data.msg, {icon: 1});
+                        example.ajax.reload(); // 刷新页面
+                    } else {
+                        layer.msg("修改失败", {icon: 2});
+                        example.ajax.reload(); // 刷新页面
+                    }
+                }
+            })
+        }
+    });
+}
+
+/**
+ * 重置密码
+ * @param id
+ */
+function reset(id) {
+    layer.confirm("确定重置密码吗？",function () {
+        $.ajax({
+            type: 'post',
+            url: request_url + '/realname/publicLogin/resetPassword',
+            contentType: "application/json; charset=utf-8",
+            headers: {
+                Authorization: "Bearer " + localStorage.getItem("public_token"),
+            },
+            data: JSON.stringify({"id": id}),
+            success: function (data) {
+                if (data.code == 200) {
+                    layer.alert(data.msg, {icon: 1});
+                    example.ajax.reload(); // 刷新页面
+                } else {
+                    layer.msg("重置失败", {icon: 2});
+                    example.ajax.reload(); // 刷新页面
+                }
+            }
+        })
+    });
+}
+
 /**
  * 编辑页面
  */
 function edit(id) {
     $.ajax({
         type: 'POST',
-        contentType: "application/x-www-form-urlencoded",
+        url: request_url + '/realname/publicLogin/getDetails',
-        url: ctxPath + '/TeamManager/getTeamById',
+        contentType: "application/json; charset=utf-8",
-        data: {"id": id},
+        headers: {
-        dataType: 'json',
+            Authorization: "Bearer " + localStorage.getItem("public_token"),
+        },
+        data: JSON.stringify({"id": id}),
         success: function (data) {
             var height = '35%';
             var width = '75%';
             var index = layer.open({
                 title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
                 type: 2,
-                content: 'userForm.html',
+                content: 'userUpdate.html',
                 area: [width, height],
                 maxmin: false,
                 offset: '80px', // 固定偏移量，避免太靠下
@@ -274,3 +337,12 @@ function edit(id) {
         }
     })
 }
+
+
+const password_reg = function (str) {
+    var str_reg = new RegExp('(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,20}');
+    if (!str_reg.test(str)) {
+        return false;
+    }
+    return true;
+}

public/public.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 //内网测试环境
 // let web_url="http://20.56.230.91:10080"
 // let request_url="http://20.56.230.91:10080/bnscloud"
@@ -7,6 +8,12 @@ let web_url="http://127.0.0.1:8849"
 let request_url="http://127.0.0.1:18080/bnscloud"
 
 
+=======
+let web_url="http://localhost:18080"
+
+let contentPath="/bonus_cloud_web";
+let request_url="http://localhost:18080/bnscloud"
+>>>>>>> 2910273ea71f09a59dc973dfe61a6811de865c71
 //承载力大屏
 let czl_url= request_url+"/czldp";
 //承载力后台