|
@@ -75,7 +75,6 @@ var tableGird = new common.grid({ |
|
@@ -75,7 +75,6 @@ var tableGird = new common.grid({ |
|
75
|
|
75
|
|
|
76
|
return obj;
|
76
|
return obj;
|
|
77
|
},
|
77
|
},
|
|
78
|
-<<<<<<< HEAD
|
|
|
|
79
|
columns:[
|
78
|
columns:[
|
|
80
|
{
|
79
|
{
|
|
81
|
display: "名称",
|
80
|
display: "名称",
|
|
@@ -93,22 +92,8 @@ var tableGird = new common.grid({ |
|
@@ -93,22 +92,8 @@ var tableGird = new common.grid({ |
|
93
|
} else {
|
92
|
} else {
|
|
94
|
return '-';
|
93
|
return '-';
|
|
95
|
}
|
94
|
}
|
|
96
|
-=======
|
|
|
|
97
|
- columns: [{
|
|
|
|
98
|
- display: "名称",
|
|
|
|
99
|
- name: "productName"
|
|
|
|
100
|
- }, {
|
|
|
|
101
|
- display: "热门排序",
|
|
|
|
102
|
- name: "hotSort",
|
|
|
|
103
|
- render: function(item) {
|
|
|
|
104
|
- if (item.hotFlag) {
|
|
|
|
105
|
- return ('<input class="order-input width50" data-id="' + item.id + '" data-type="orderBy" type="text" value="' + item.orderBy + '"/>');
|
|
|
|
106
|
- } else {
|
|
|
|
107
|
- return '-';
|
|
|
|
108
|
->>>>>>> ab68be0c67e4456aa77357afd5d64fc8218d2b69
|
|
|
|
109
|
}
|
95
|
}
|
|
110
|
- }
|
|
|
|
111
|
- }, {
|
96
|
+ }, {
|
|
112
|
display: "未发售排序",
|
97
|
display: "未发售排序",
|
|
113
|
name: "notSaleSort",
|
98
|
name: "notSaleSort",
|
|
114
|
render: function(item) {
|
99
|
render: function(item) {
|
