From c49b95fc3576f9a5dad5bcaa6874157d5091f6e0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 27 Aug 2020 09:19:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html
index 7e6454d..18cc3c8 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html
@@ -62,9 +62,9 @@
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token},
page: true,
cols: [[
- { field: 'username', width: "10%",align: 'center', title: '账号' },
- { field: 'nickname', width: "10%",align: 'center', title: '用户名' },
- { field: 'mobile', width: "10%",align: 'center', title: '手机号' },
+ { field: 'username', width: "150",align: 'center', title: '账号' },
+ { field: 'nickname', width: "150",align: 'center', title: '用户名' },
+ { field: 'mobile', width: "150",align: 'center', title: '手机号' },
{
sort: true, width: "10%",align: 'center', title: '性别', templet: function (d) {
var value="";
@@ -76,8 +76,8 @@
return value;
}, width: 100
},
- { field: 'createTime', width: "20%",align: 'center', sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
- { field: 'enabled', width: "10%",align: 'center', sort: true, templet: '#user-tpl-state', title: '状态' },
+ { field: 'createTime', width: "150",align: 'center', sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
+ { field: 'enabled', width: "10%",align: 'center', templet: '#user-tpl-state', title: '状态' },
{ fixed: 'right', width: "10%",align: 'center', toolbar: '#user-table-bar', title: '操作', width: 300 }
]],
done:function(res){
--
Gitblit v1.8.0