|
@@ -1126,7 +1126,10 @@ class Database
|
|
|
foreach ($config['manage']['search']['button'] as $k => $v) {
|
|
|
$i = 0;
|
|
|
foreach ($v['option'] as $k1 => $v1) {
|
|
|
- $value = $k . '_' . $v['sum'] . '_' . $k1;
|
|
|
+ $value = $k . '~' . $v['sum'] . '~' . $k1;
|
|
|
+ if (isset($v['group'])) {
|
|
|
+ $value .= '~' . $v['group'];
|
|
|
+ }
|
|
|
if (!isset($search['search_button']) && $i == 0) {
|
|
|
$search['search_button'] = $value;
|
|
|
}
|
|
@@ -1136,7 +1139,7 @@ class Database
|
|
|
$class = 'layui-btn-primary';
|
|
|
}
|
|
|
|
|
|
- $url = $this->url('list', 0, false, '&search_button=' . $k . '_' . $v['sum'] . '_' . $k1);
|
|
|
+ $url = $this->url('list', 0, false, '&search_button=' . $value);
|
|
|
$btn .= '<a class="btn btn-primary layui-btn layuiadmin-btn-list '.$class.'" href="'.$url.'" type="button" style="height: 38px;margin-left:0px;margin-top:-2px;">'.$v1.'</a> ';
|
|
|
}
|
|
|
}
|