ufo / ufo-platform · Commits

Go to a project

Authored by mali
Commit 447569c8c4f5ae142bc4a14910d1a46958d8ba8c 2 parents c9442e41 ca29bd6f

Merge branch 'master' of http://git.yoho.cn/ufo/ufo-platform

Inline Side-by-side
Showing 8 changed files with 14 additions and 13 deletions
... ... @@ -157,11 +157,11 @@
width: 120,
align: "center",
formatter: function (value, rowData) {
var str = "<a role='edit' dataId='" + rowData.id + "' style='margin-left:10px'>编辑</a>";
var str = "<a role='edit' dataId='" + rowData.id + "' style='margin-left:10px;background-color: #5bc0de'>编辑</a>";
if (1 == rowData.status) {
str += "<a role='closeBrand' dataId='" + rowData.id + "' style='margin-left:10px'>关闭品牌</a>";
str += "<a role='closeBrand' dataId='" + rowData.id + "' style='margin-left:10px;background-color: red'>关闭品牌</a>";
} else {
str += "<a role='openBrand' dataId='" + rowData.id + "' style='margin-left:10px'>开启品牌</a>";
str += "<a role='openBrand' dataId='" + rowData.id + "' style='margin-left:10px;background-color: orange'>开启品牌</a>";
}
return str;
}
... ...
... ... @@ -143,11 +143,11 @@
width: 80,
align: "center",
formatter: function (value, rowData) {
var str = "<a role='edit' dataId='" + rowData.id + "' style='margin-left:10px'>编辑</a>";
var str = "<a role='edit' dataId='" + rowData.id + "' style='margin-left:10px;background-color: #5bc0de'>编辑</a>";
if (1 == rowData.status) {
str += "<a role='closeBrandSeries' dataId='" + rowData.id + "' style='margin-left:10px'>关闭</a>";
str += "<a role='closeBrandSeries' dataId='" + rowData.id + "' style='margin-left:10px;background-color: red'>关闭</a>";
} else {
str += "<a role='openBrandSeries' dataId='" + rowData.id + "' style='margin-left:10px'>开启</a>";
str += "<a role='openBrandSeries' dataId='" + rowData.id + "' style='margin-left:10px;background-color: orange'>开启</a>";
}
return str;
}
... ...
... ... @@ -101,7 +101,7 @@
width: 80,
align: "center",
formatter: function (value, rowData) {
return "<a role='edit' dataId='" + rowData.id + "' style='margin-left:10px'>编辑</a>";
return "<a role='edit' dataId='" + rowData.id + "' style='margin-left:10px;background-color: #5bc0de'>编辑</a>";
}
}]],
cache: false,
... ...
... ... @@ -122,11 +122,11 @@
width: 80,
align: "center",
formatter: function (value, rowData) {
var str = "<a role='edit' dataId='" + rowData.id + "' style='margin-left:10px'>编辑</a>";
var str = "<a role='edit' dataId='" + rowData.id + "' style='margin-left:10px;background-color: #5bc0de'>编辑</a>";
if (0 == rowData.status) {
str += "<a role='closeProductName' dataId='" + rowData.id + "' style='margin-left:10px' parentId = '" + rowData.parentId + "'>关闭</a>";
str += "<a role='closeProductName' dataId='" + rowData.id + "' style='margin-left:10px;background-color: red' parentId = '" + rowData.parentId + "'>关闭</a>";
} else {
str += "<a role='openProductName' dataId='" + rowData.id + "' style='margin-left:10px' parentId = '" + rowData.parentId + "'>开启</a>";
str += "<a role='openProductName' dataId='" + rowData.id + "' style='margin-left:10px; background-color: orange' parentId = '" + rowData.parentId + "'>开启</a>";
}
return str;
}
... ...
... ... @@ -46,6 +46,7 @@
contentType: "application/json",
dataType: "json",
type: "GET",
async:false,
url: contextPath + '/productSort/getLevel2SortIdAndName',
success: function (data) {
if (data.code != 200 || !data.data || data.data.length == 0) {
... ...
... ... @@ -114,7 +114,7 @@
width: 80,
align: "center",
formatter: function (value, rowData) {
return "<a role='edit' dataId='" + rowData.id + "' style='margin-left:10px'>编辑</a>";
return "<a role='edit' dataId='" + rowData.id + "' style='margin-left:10px;background-color: #5bc0de'>编辑</a>";
}
}]],
cache: false,
... ...
... ... @@ -126,7 +126,7 @@
align: "center",
formatter: function (value, rowData) {
if (rowData.delStatus == 0) {
return "<a role='delete' dataId='" + rowData.id + "' style='margin-left:10px'>删除</a>";
return "<a role='delete' dataId='" + rowData.id + "' style='margin-left:10px;background-color: red'>删除</a>";
}
return '';
}
... ...
... ... @@ -100,7 +100,7 @@
width: 80,
align: "center",
formatter: function (value, rowData) {
var str = "<a role='detail' dataId='" + rowData.id + "' style='margin-left:10px'>详情</a>";
var str = "<a role='detail' dataId='" + rowData.id + "' style='margin-left:10px;background-color: #5bc0de'>详情</a>";
return str;
}
}]],
... ...