Authored by liuyue

搭配

@@ -101,22 +101,22 @@ grid.prototype = { @@ -101,22 +101,22 @@ grid.prototype = {
101 param.page = p.page; 101 param.page = p.page;
102 } else { 102 } else {
103 103
104 - if(location.hash.search(/page=(\d+)/g)>-1){ 104 + if (location.hash.search(/page=(\d+)/g) > -1) {
105 param.page = /page=(\d+)/g.exec(location.hash)[1]; 105 param.page = /page=(\d+)/g.exec(location.hash)[1];
106 } 106 }
107 - 107 +
108 } 108 }
109 - if(param.page&&p.hash){  
110 - if(location.hash.search(/page=(\d+)/g)>-1){  
111 - location.hash=location.hash.replace(/page=(\d+)/g,function(source,$1){  
112 - return "page="+param.page; 109 + if (param.page && p.hash) {
  110 + if (location.hash.search(/page=(\d+)/g) > -1) {
  111 + location.hash = location.hash.replace(/page=(\d+)/g, function(source, $1) {
  112 + return "page=" + param.page;
113 }) 113 })
114 - }else{  
115 - location.hash+="page="+param.page; 114 + } else {
  115 + location.hash += "page=" + param.page;
116 } 116 }
117 } 117 }
118 -  
119 - 118 +
  119 +
120 if (param.productStatusStr == 'all') { 120 if (param.productStatusStr == 'all') {
121 param.productStatusStr = ''; 121 param.productStatusStr = '';
122 } 122 }
@@ -125,6 +125,10 @@ grid.prototype = { @@ -125,6 +125,10 @@ grid.prototype = {
125 param.isInfoMiss = ''; 125 param.isInfoMiss = '';
126 } 126 }
127 127
  128 + if (p.size) {
  129 + param.size = p.size;
  130 + }
  131 +
128 return param; 132 return param;
129 }, 133 },
130 __pagination: function(pagination) { 134 __pagination: function(pagination) {
@@ -194,6 +198,7 @@ grid.prototype = { @@ -194,6 +198,7 @@ grid.prototype = {
194 dataType: 'json', 198 dataType: 'json',
195 beforeSend: function() { 199 beforeSend: function() {
196 //发送请求 200 //发送请求
  201 + g.tbody.html("<tr><td colspan=100><center>正在加载中...</center></td></tr>");
197 }, 202 },
198 success: function(res) { 203 success: function(res) {
199 var data = res.data.data; 204 var data = res.data.data;
@@ -248,7 +253,7 @@ grid.prototype = { @@ -248,7 +253,7 @@ grid.prototype = {
248 var num = _r_num() + _count; 253 var num = _r_num() + _count;
249 254
250 item._num = _count; 255 item._num = _count;
251 - item.rowid = "wqt_" + num + "_" + _count; 256 + // item.rowid = "wqt_" + num + "_" + _count;
252 if (!item) continue; 257 if (!item) continue;
253 g.records.push(_count); 258 g.records.push(_count);
254 item.__index = _count; 259 item.__index = _count;
@@ -110,6 +110,7 @@ common.util.__ajax({ @@ -110,6 +110,7 @@ common.util.__ajax({
110 var g = new common.grid({ 110 var g = new common.grid({
111 el: "#dapeiTable", 111 el: "#dapeiTable",
112 hash: false, 112 hash: false,
  113 + size: 5,
113 parms: function() { 114 parms: function() {
114 return { 115 return {
115 productSkn: productSkn 116 productSkn: productSkn
@@ -13,10 +13,10 @@ var config = { @@ -13,10 +13,10 @@ var config = {
13 redis: null, 13 redis: null,
14 apiKey: 'sd4H1ecAqlp', 14 apiKey: 'sd4H1ecAqlp',
15 port: 30016, 15 port: 30016,
16 - // domain: 'http://192.168.102.202:8088/platform', 16 + domain: 'http://192.168.102.202:8088/platform',
17 //domain: 'http://192.168.102.216:8088/platform', 17 //domain: 'http://192.168.102.216:8088/platform',
18 //domain: 'http://172.16.6.227:8088/platform', //马力 18 //domain: 'http://172.16.6.227:8088/platform', //马力
19 - domain: 'http://172.16.6.176:8088/platform', //王书生 19 + //domain: 'http://172.16.6.176:8088/platform', //王书生
20 loggers: { 20 loggers: {
21 api: { 21 api: {
22 level: 'verbose', 22 level: 'verbose',
1 <div class="panel panel-default"> 1 <div class="panel panel-default">
2 <form action="" class="form-horizontal form-bordered"> 2 <form action="" class="form-horizontal form-bordered">
3 - <a class="netsale-position" href="javascript:;" name="position13"></a> 3 +
4 <div class="panel-heading"> 4 <div class="panel-heading">
  5 + <a class="netsale-position" href="javascript:;" name="position13"></a>
5 <div class="panel-btns" style="display: none;"> 6 <div class="panel-btns" style="display: none;">
6 <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a> 7 <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
7 </div> 8 </div>