Authored by xuhongyun

Merge branch 'dev_2.2' into test

... ... @@ -16,8 +16,16 @@ var g1 = new common.grid({
};
},
columns: [
{display: "商品图片", render: function (item) {
return item.productPic ? '<img src="'+item.productPic+'">' : '';
{
display: '商品图片',
name: 'productPic',
render: function (item) {
if (item.productPic) {
return '<a class="list-img" target="_blank" href="' + item.productPic + '">' +
'<img src="' + item.productPic + '"></a>';
} else {
return '';
}
}},
{display: "SKN", name: "productSKN"},
{display: "厂家编号", name: "factoryCode"},
... ... @@ -61,8 +69,17 @@ var g2 = new common.grid({
};
},
columns: [
{display: "商品图片", render: function (item) {
return item.productPic ? '<img src="'+item.productPic+'">' : '';
{
display: '商品图片',
name: 'productPic',
render: function (item) {
if (item.productPic) {
return '<a class="list-img" target="_blank" href="' + item.productPic + '">' +
'<img src="' + item.productPic + '"></a>';
} else {
return '';
}
}},
{display: "SKN", name: "productSKN"},
{display: "厂家编号", name: "factoryCode"},
... ...