From 0ad75f90e6464b95bef06c88227f521c5c03d41d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 06 五月 2023 16:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/webapp/static/modular/system/tAppUser/tAppUser.js |   76 +++++++++++++++++++++++++++----------
 1 files changed, 55 insertions(+), 21 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..c881b64 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,22 +17,46 @@
             {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: 'avatar', 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',
+                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'},
             {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>'
+                    }else if (row.status === 3){
+                        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'},
             {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;' +
@@ -127,23 +151,32 @@
  * 提交启用冻结
  */
 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();
-        }, function (data) {
-            Feng.error("修改失败!" + data.responseJSON.message + "!");
-        });
-        ajax.set("id",$("#id").val());
-        ajax.set("status",$("#status").val());
-        if($("#status").val() == 1){
-            ajax.set("remark",$("#stopRemark").val());
-        }
-        if($("#status").val() == 2){
-            ajax.set("remark",$("#startRemark").val());
-        }
-        ajax.start();
+    var status = $("#status").val();
+    if(status == 1 && ($("#stopRemark").val() == '' || $("#stopRemark").val() == null)){
+        Feng.info("请输入冻结理由!")
+        return;
+    }
+    if(status == 2 && ($("#startRemark").val() == '' || $("#startRemark").val() == null)){
+        Feng.info("请输入启用理由!")
+        return;
+    }
+
+    var ajax = new $ax(Feng.ctxPath + "/tAppUser/update-status", function (data) {
+        Feng.success("修改成功!");
+        TAppUserInfoDlg.close();
+        parent.TAppUser.table.refresh();
+    }, function (data) {
+        Feng.error("修改失败!" + data.responseJSON.message + "!");
+    });
+    ajax.set("id",$("#id").val());
+    ajax.set("status",$("#status").val());
+    if($("#status").val() == 1){
+        ajax.set("remark",$("#stopRemark").val());
+    }
+    if($("#status").val() == 2){
+        ajax.set("remark",$("#startRemark").val());
+    }
+    ajax.start();
 };
 
 /**
@@ -247,6 +280,7 @@
     $("#createTime").val('');
     $("#id").val('');
     $("#status").val('');
+    TAppUser.search();
 }
 
 $(function () {

--
Gitblit v1.7.1