From 67bfacb03541ef2ee4c1496f4cc7600014cd1005 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 18 四月 2023 17:37:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 f3a2634..c820a68 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
@@ -28,7 +28,11 @@
                     }
                 }
             },
-            {title: '头像', field: 'avatar', visible: true, align: 'center', valign: 'middle'},
+            {title: '头像', field: 'avatar', visible: true, align: 'center', valign: 'middle',
+                formatter: function (value, row) {
+                        return '<img src="'+row.avatar+'" style="height: 60px;width: 60px"/>'
+                }
+            },
             {title: '微信openid', field: 'openid', visible: true, align: 'center', valign: 'middle'},
             {title: '微信unionid', field: 'unionid', visible: true, align: 'center', valign: 'middle'},
             {title: '紧急联系人', field: 'emergencyContact', visible: true, align: 'center', valign: 'middle'},
@@ -41,6 +45,8 @@
                         return '<span>正常</span>'
                     }else if (row.status === 2){
                         return '<span>冻结</span>'
+                    }else if (row.status === 3){
+                        return '<span>已删除</span>'
                     }
                 }
             },
@@ -50,7 +56,7 @@
             {title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
                 formatter: function (value, row) {
                     if (row.status === 1){
-                        return '<a href="#" onclick="TAppUser.stop('+row.id+','+row.status+')" style="color:red">停用</a>' +'&nbsp;' +
+                        return '<a href="#" onclick="TAppUser.stop('+row.id+','+row.status+')" style="color:red">冻结</a>' +'&nbsp;' +
                         '<a href="#" onclick="TAppUser.searchTAppUserDetail('+row.id+','+row.status+')" style="color:green">详情</a>'
                     }else if (row.status === 2){
                         return '<a href="#" onclick="TAppUser.start('+row.id+','+row.status+')" style="color:green">启用</a>' +'&nbsp;' +
@@ -146,7 +152,6 @@
  */
 TAppUser.updateStatus = function () {
         var ajax = new $ax(Feng.ctxPath + "/tAppUser/update-status", function (data) {
-            console.log(111111)
             Feng.success("修改成功!");
             TAppUserInfoDlg.close();
             parent.TAppUser.table.refresh();

--
Gitblit v1.7.1