Authored by 马力

Merge branch 'master' into dev_5.4.1

... ... @@ -367,13 +367,10 @@ var g = new common.grid({
display: "其他",
render: function(item) {
var html = [];
var grade = (item.grade == 1) ? "重点款" : "非重点款";
var limited = (item.isLimited == "Y") ? "限量款" : "非限量款";
var limitedPurchase = (item.isLimitbuy == "Y") ? "限购" : "非限购";
var replenishment = item.isSupplied ? ReplenishEnum.enum[item.isSupplied] : "";
var gender = GenderEnum.gender[item.gender];
html.push("<p>" + grade + "</p>");
html.push("<p>" + limited + "</p>");
// html.push("<p>" + limitedPurchase + "</p>");
html.push("<p>" + replenishment + "</p>");
... ...
... ... @@ -372,13 +372,10 @@ webpackJsonp([29],{
display: "其他",
render: function(item) {
var html = [];
var grade = (item.grade == 1) ? "重点款" : "非重点款";
var limited = (item.isLimited == "Y") ? "限量款" : "非限量款";
var limitedPurchase = (item.isLimitbuy == "Y") ? "限购" : "非限购";
var replenishment = item.isSupplied ? ReplenishEnum.enum[item.isSupplied] : "";
var gender = GenderEnum.gender[item.gender];
html.push("<p>" + grade + "</p>");
html.push("<p>" + limited + "</p>");
// html.push("<p>" + limitedPurchase + "</p>");
html.push("<p>" + replenishment + "</p>");
... ...