From 9b8781a87b6c3acc8769e52ba55cc82a8cf2e276 Mon Sep 17 00:00:00 2001
From: "kuang.yifei@iwhalecloud.com" <kuang.yifei@iwhalecloud.com>
Date: Thu, 21 Jul 2022 14:11:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/customer/customer.html  | 12 ++++++++----
 .../src/main/resources/templates/worker/worker.html  |  5 ++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ghy-admin/src/main/resources/templates/customer/customer.html b/ghy-admin/src/main/resources/templates/customer/customer.html
index e68a61bb..4cfb43c6 100644
--- a/ghy-admin/src/main/resources/templates/customer/customer.html
+++ b/ghy-admin/src/main/resources/templates/customer/customer.html
@@ -125,7 +125,12 @@
                 },
                 {
                     field: 'customerLogoUrl',
-                    title: '头像'
+                    title: '头像',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<img class="img-circle" src="' + row.customerLogoUrl + '"  alt="消费者头像" />');
+                        return actions.join('');
+                    }
                 },
                 {
                     visible: editFlag == 'hidden' ? false : true,
@@ -146,7 +151,6 @@
                     formatter: function(value, row, index) {
                         if (row.customerId != 1) {
                             var actions = [];
-                            actions.push("<a class='btn btn-success btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.customerId + ")'><i class='fa fa-edit'></i>重置密码</a> ");
                             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.customerId + '\')"><i class="fa fa-remove"></i>删除</a> ');
                             return actions.join('');
                         } else {
@@ -169,9 +173,9 @@
     /* 用户状态显示 */
     function statusTools(row) {
         if (row.status == 0) {
-            return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.customerId + '\')"></i> ';
-        } else {
             return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.customerId + '\')"></i> ';
+        } else {
+            return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.customerId + '\')"></i> ';
         }
     }
 
diff --git a/ghy-admin/src/main/resources/templates/worker/worker.html b/ghy-admin/src/main/resources/templates/worker/worker.html
index bb63c507..8117e335 100644
--- a/ghy-admin/src/main/resources/templates/worker/worker.html
+++ b/ghy-admin/src/main/resources/templates/worker/worker.html
@@ -152,7 +152,6 @@
                     formatter: function(value, row, index) {
                         if (row.workerId != 1) {
                             var actions = [];
-                            actions.push("<a class='btn btn-success btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.workerId + ")'><i class='fa fa-edit'></i>重置密码</a> ");
                             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.workerId + '\')"><i class="fa fa-remove"></i>删除</a> ');
                             return actions.join('');
                         } else {
@@ -175,9 +174,9 @@
     /* 用户状态显示 */
     function statusTools(row) {
         if (row.status == 0) {
-            return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.workerId + '\')"></i> ';
-        } else {
             return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.workerId + '\')"></i> ';
+        } else {
+            return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.workerId + '\')"></i> ';
         }
     }