najixian / xt_dc_admin · Commits

Go to a project

Commit 6283d21e3b4d21e1628ee47a07dcd7e48b260bda

Authored by pengye
1 parent f5ff6a04
build: skipped

no message

Inline Side-by-side
Showing 2 changed files with 20 additions and 1 deletions
... ... @@ -20,12 +20,18 @@ class Seller extends Common
$where = '';
$channel = $data['channel'] ? $data['channel'] : 1;
$version_expire = isset($data['version_expire']) ? $data['version_expire'] : 0;
$online = $data['online'] ? $data['channel'] : '';
if($version_expire){
$versionTime = array(7=>strtotime("+7 day",time()),15=>strtotime("+15 day",time()),30=>strtotime("+30 day",time()));
}
$where .= ($channel && $channel==4) ? ' re.type_id in (1,2,3)' : " re.type_id in ($channel)";
$where .= $data['address'] ? ' and s.map_address like "%'.$data['address'].'%"' : "";
$where .= $data['key'] ? ' and s.sellername like "%'.$data['key'].'%"' : "";
$where .= $data['area'] ? ' and a.key = 1 and a.district like "%'.$data['area'].'%"' : "";
$where .= $version_expire ? ' and ver.edate-'.$versionTime[$version_expire].'<'.time();
switch ($data['online']) {
case '1':
$where .= ' and s.is_online_reserve = 1';
... ... @@ -71,6 +77,7 @@ class Seller extends Common
LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_config AS scf ON s.id = scf.sid
LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_type_rel AS re ON re.sid = s.id
LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_address AS a ON a.sid = s.id
LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_versions_del AS ver ON s.id = ver.sid
WHERE
s.isopen_dc = 1
AND ".$where." GROUP BY s.id order by s.scale".$limit);
... ...
... ... @@ -33,6 +33,17 @@
</select>
</div>
</div>
到期时间：
<div class="layui-input-inline layui-form">
<div class="layui-input-8">
<select name="class" id="version_expire" lay-filter="myselect">
<option value="0" selected>请选择到期时间</option>
<option value="7" >7天</option>
<option value="15">15天</option>
<option value="30">30天</option>
</select>
</div>
</div>
在线预定：
<div class="layui-input-inline layui-form">
<div class="layui-input-8">
... ... @@ -232,12 +243,13 @@
var key = $('#key').val();
var address = $('#address').val();
var channel = $('#channel').val();
var version_expire = $('#version_expire').val();
var online = $('#online').val();
var prov = $("#provid").find("option:selected").text();
var city = $("#cityid").find("option:selected").text();
var area = $("#areaid").find("option:selected").text();
//传参
tableIn.reload({ page: {page: 1},where: {key: key,address: address,channel: channel,online: online,prov:prov,city: city,area: area}});
tableIn.reload({ page: {page: 1},where: {key: key,address: address,channel: channel,version_expire: version_expire,online: online,prov:prov,city: city,area: area}});
});
var $ = layui.$, active = {
... ...