Commit 41ee49ad76f2f794f608c0663fcc8119a334ebcb

Authored by pengye
1 parent 7099cda1

no message

@@ -31,7 +31,7 @@ class Seller extends Common @@ -31,7 +31,7 @@ class Seller extends Common
31 $where .= $data['address'] ? ' and s.map_address like "%'.$data['address'].'%"' : ""; 31 $where .= $data['address'] ? ' and s.map_address like "%'.$data['address'].'%"' : "";
32 $where .= $data['key'] ? ' and s.sellername like "%'.$data['key'].'%"' : ""; 32 $where .= $data['key'] ? ' and s.sellername like "%'.$data['key'].'%"' : "";
33 $where .= $data['area'] ? ' and a.key = 1 and a.district like "%'.$data['area'].'%"' : ""; 33 $where .= $data['area'] ? ' and a.key = 1 and a.district like "%'.$data['area'].'%"' : "";
34 - $where .= $version_expire ? ' and ver.edate-'.$versionTime[$version_expire].'<'.time():''; 34 + $where .= $version_expire ? ' and v.edate-'.$versionTime[$version_expire].'<'.time():'';
35 switch ($data['online']) { 35 switch ($data['online']) {
36 case '1': 36 case '1':
37 $where .= ' and s.is_online_reserve = 1'; 37 $where .= ' and s.is_online_reserve = 1';
@@ -45,8 +45,7 @@ class Seller extends Common @@ -45,8 +45,7 @@ class Seller extends Common
45 } 45 }
46 46
47 $offset = ($data["page"] - 1) * $data["limit"]; 47 $offset = ($data["page"] - 1) * $data["limit"];
48 - $limit = " LIMIT $offset,".$data['limit'];  
49 - echo $where;die; 48 + $limit = " LIMIT $offset,".$data['limit'];
50 //商家基本数据 49 //商家基本数据
51 $rs = Db::query("SELECT 50 $rs = Db::query("SELECT
52 s.id, 51 s.id,
@@ -77,7 +76,7 @@ class Seller extends Common @@ -77,7 +76,7 @@ class Seller extends Common
77 LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_config AS scf ON s.id = scf.sid 76 LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_config AS scf ON s.id = scf.sid
78 LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_type_rel AS re ON re.sid = s.id 77 LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_type_rel AS re ON re.sid = s.id
79 LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_address AS a ON a.sid = s.id 78 LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_address AS a ON a.sid = s.id
80 - LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_versions_del AS ver ON ver.sid=s.id 79 + LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_versions_del AS v ON v.sid=s.id
81 WHERE 80 WHERE
82 s.isopen_dc = 1 81 s.isopen_dc = 1
83 AND ".$where." GROUP BY s.id order by s.scale".$limit); 82 AND ".$where." GROUP BY s.id order by s.scale".$limit);