najixian / xt_dc_admin · Commits

Go to a project

Commit 2a3ee11f5d87d46df65f42b960be37064591b960

Authored by pengye
1 parent ecef2ea2
build: skipped

no message

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
@@ -29,7 +29,7 @@ class Seller extends Common @@ -29,7 +29,7 @@ class Seller extends Common
29 $where .= ($channel && $channel==4) ? ' re.type_id in (1,2,3)' : " re.type_id in ($channel)"; 29 $where .= ($channel && $channel==4) ? ' re.type_id in (1,2,3)' : " re.type_id in ($channel)";
30 $where .= $data['address'] ? ' and s.map_address like "%'.$data['address'].'%"' : ""; 30 $where .= $data['address'] ? ' and s.map_address like "%'.$data['address'].'%"' : "";
31 $where .= $data['key'] ? ' and s.sellername like "%'.$data['key'].'%"' : ""; 31 $where .= $data['key'] ? ' and s.sellername like "%'.$data['key'].'%"' : "";
32 - $where .= $data['area'] ? ' and a.key = 1 and a.district like "%'.$data['area'].'%"' : ""; 32 + $where .= $data['area'] && $data['area']!='请选择县/区'? ' and a.key = 1 and a.district like "%'.$data['area'].'%"' : "";
33 if($version_expire && $version_expire>1){ 33 if($version_expire && $version_expire>1){
34 $versionTime = array(7=>3600*24*7,15=>3600*24*15,30=>3600*24*30); 34 $versionTime = array(7=>3600*24*7,15=>3600*24*15,30=>3600*24*30);
35 $where .= $version_expire ? ' and ('.time().'-v.edate)>'.$versionTime[$version_expire]:''; 35 $where .= $version_expire ? ' and ('.time().'-v.edate)>'.$versionTime[$version_expire]:'';
@@ -249,9 +249,9 @@ @@ -249,9 +249,9 @@
249 var channel = $('#channel').val(); 249 var channel = $('#channel').val();
250 var version_expire = $('#version_expire').val(); 250 var version_expire = $('#version_expire').val();
251 var online = $('#online').val(); 251 var online = $('#online').val();
252 - var prov = $("#provid").find("option:selected").value();  
253 - var city = $("#cityid").find("option:selected").value();  
254 - var area = $("#areaid").find("option:selected").value(); 252 + var prov = $("#provid").find("option:selected").text();
  253 + var city = $("#cityid").find("option:selected").text();
  254 + var area = $("#areaid").find("option:selected").text();
255 //传参 255 //传参
256 tableIn.reload({ page: {page: 1},where: {key: key,address: address,channel: channel,version_expire: version_expire,online: online,prov:prov,city: city,area: area}}); 256 tableIn.reload({ page: {page: 1},where: {key: key,address: address,channel: channel,version_expire: version_expire,online: online,prov:prov,city: city,area: area}});
257 }); 257 });