From e2e97b3153d4c2e052763ffed3710e12848c995d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 17 二月 2023 20:41:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js
index 77e7147..f3a2634 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js
@@ -17,7 +17,17 @@
{title: '用户ID', field: 'id', visible: true, align: 'center', valign: 'middle'},
{title: '用户昵称', field: 'nickname', visible: true, align: 'center', valign: 'middle'},
{title: '手机号', field: 'phone', visible: true, align: 'center', valign: 'middle'},
- {title: '性别', field: 'sex', visible: true, align: 'center', valign: 'middle'},
+ {title: '性别', field: 'sex', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ if (row.sex === 1){
+ return '<span>男</span>'
+ }else if (row.sex === 2){
+ return '<span>女</span>'
+ }else {
+ return '<span>未知</span>'
+ }
+ }
+ },
{title: '头像', field: 'avatar', visible: true, align: 'center', valign: 'middle'},
{title: '微信openid', field: 'openid', visible: true, align: 'center', valign: 'middle'},
{title: '微信unionid', field: 'unionid', visible: true, align: 'center', valign: 'middle'},
@@ -25,7 +35,15 @@
{title: '紧急联系电话', field: 'emergencyPhone', visible: true, align: 'center', valign: 'middle'},
{title: '账户余额', field: 'accountBalance', visible: true, align: 'center', valign: 'middle'},
{title: '用户标签id', field: 'userTagId', visible: true, align: 'center', valign: 'middle'},
- {title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle'},
+ {title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ if (row.status === 1){
+ return '<span>正常</span>'
+ }else if (row.status === 2){
+ return '<span>冻结</span>'
+ }
+ }
+ },
{title: '添加时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'},
// {title: '是否异常', field: 'isException', hidden:true, visible: true, align: 'center', valign: 'middle'},
// {title: '启用冻结理由', field: 'remark', hidden:true,visible: true, align: 'center', valign: 'middle'},
@@ -247,6 +265,7 @@
$("#createTime").val('');
$("#id").val('');
$("#status").val('');
+ TAppUser.search();
}
$(function () {
--
Gitblit v1.7.1