clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
HH 2022-07-21 15:12:50 +08:00
parent d37f005b8d 999ab95487
commit 619595b08f
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghy-admin/src/main/resources/templates/customer/customer.html
View File

@ -125,7 +125,12 @@
}, },
{ {
field: 'customerLogoUrl', 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, visible: editFlag == 'hidden' ? false : true,
@ -146,7 +151,6 @@
formatter: function(value, row, index) { formatter: function(value, row, index) {
if (row.customerId != 1) { if (row.customerId != 1) {
var actions = []; 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> '); 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(''); return actions.join('');
} else { } else {
@ -169,9 +173,9 @@
/* 用户状态显示 */ /* 用户状态显示 */
function statusTools(row) { function statusTools(row) {
if (row.status == 0) { 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> '; 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> ';
} }
} }

5
ghy-admin/src/main/resources/templates/worker/worker.html
View File

@ -152,7 +152,6 @@
formatter: function(value, row, index) { formatter: function(value, row, index) {
if (row.workerId != 1) { if (row.workerId != 1) {
var actions = []; 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> '); 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(''); return actions.join('');
} else { } else {
@ -175,9 +174,9 @@
/* 用户状态显示 */ /* 用户状态显示 */
function statusTools(row) { function statusTools(row) {
if (row.status == 0) { 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> '; 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> ';
} }
} }