Authored by xuhongyun

Merge branch 'dev_2.2' into test

... ... @@ -17,15 +17,17 @@ var ENUM = {
'3|2': "大小童"
},
status: {
'8': '待上架',
'0': '已下架',
'1': '已上架',
'2': '待审核',
'3': '驳回',
'3': '上架驳回',
'4': '通过',
'1': '已上架',
'0': '已下架',
'5': '再上架待审核',
'6': '再上架驳回',
'7': '再上架通过'
'7': '再上架通过',
'8': '待上架',
'9': '下架驳回',
'10':'下架待审核'
},
attribute: {
1: '普通',
... ... @@ -72,7 +74,7 @@ var t = new common.tab2({
isInfoMiss = 'Y';
g.options.columns[11].hidden = false;
} else {
//isInfoMiss = 'N';
isInfoMiss = '';
g.options.columns[8].hidden = false;
}
... ... @@ -262,7 +264,7 @@ var g = new common.grid({
html += ENUM.status[item.status];
}
if (item.status == 3 || item.status == 6) {
if (item.status == 3 || item.status == 6 ||item.status == 9) {
html += '<p style="color:red;">(' + item.rejectReason + ')</p>'
}
if (item.status == 4||item.status == 1||item.status == 7) {
... ...