Authored by xuhongyun

Merge branch 'dev_decorator_list' into grey

@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 5
6 findShopsDecorator:{ 6 findShopsDecorator:{
7 title:"店铺装修列表", 7 title:"店铺装修列表",
8 - url:"/ShopsDecoratorRest/findShopsDecorator", 8 + url:"/ShopsDecoratorRest/findShopsDecorator2",
9 params: [ 9 params: [
10 {name: 'page', type: 'number'}, 10 {name: 'page', type: 'number'},
11 {name: 'size', type: 'number'}, 11 {name: 'size', type: 'number'},
@@ -42,7 +42,7 @@ var g = new common.grid({ @@ -42,7 +42,7 @@ var g = new common.grid({
42 name: "shopsId" 42 name: "shopsId"
43 }, { 43 }, {
44 display: "店铺名称", 44 display: "店铺名称",
45 - name: "shopsName" 45 + name: "shopName"
46 }, { 46 }, {
47 display: "包含品牌", 47 display: "包含品牌",
48 name: "brands", 48 name: "brands",
@@ -60,24 +60,24 @@ var g = new common.grid({ @@ -60,24 +60,24 @@ var g = new common.grid({
60 } 60 }
61 }, { 61 }, {
62 display: "创建时间", 62 display: "创建时间",
63 - name: "createTime"  
64 - // render: function(item) {  
65 - // if (item.createTime) {  
66 - // return common.util.__dateFormat(new Date(item.createTime * 1000), "yyyy-MM-dd hh:mm:ss");  
67 - // } else {  
68 - // return '';  
69 - // }  
70 - // } 63 + name: "createTime",
  64 + render: function(item) {
  65 + if (item.createTime) {
  66 + return common.util.__dateFormat(new Date(item.createTime * 1000), "yyyy-MM-dd hh:mm:ss");
  67 + } else {
  68 + return '';
  69 + }
  70 + }
71 }, { 71 }, {
72 display: "更新时间", 72 display: "更新时间",
73 - name: "updateTime"  
74 - // render: function(item) {  
75 - // if (item.updateTime) {  
76 - // return common.util.__dateFormat(new Date(item.updateTime * 1000), "yyyy-MM-dd hh:mm:ss");  
77 - // } else {  
78 - // return '';  
79 - // }  
80 - // } 73 + name: "updateTime",
  74 + render: function(item) {
  75 + if (item.updateTime) {
  76 + return common.util.__dateFormat(new Date(item.updateTime * 1000), "yyyy-MM-dd hh:mm:ss");
  77 + } else {
  78 + return '';
  79 + }
  80 + }
81 }, { 81 }, {
82 display: "有货状态", 82 display: "有货状态",
83 name: "checkStatus", 83 name: "checkStatus",
@@ -213,4 +213,4 @@ $(document).on('click', '.closeshops_blk', function() { @@ -213,4 +213,4 @@ $(document).on('click', '.closeshops_blk', function() {
213 $(document).on('click', '.openshops_blk', function() { 213 $(document).on('click', '.openshops_blk', function() {
214 var item=g.rows[$(this).data("index")]; 214 var item=g.rows[$(this).data("index")];
215 Bll.toast("确定要开启此BLK店铺吗?","/supplier/store/openBlkShops",item.shopsId); 215 Bll.toast("确定要开启此BLK店铺吗?","/supplier/store/openBlkShops",item.shopsId);
216 -});  
  216 +});