|
@@ -19,6 +19,11 @@ $role = function()
|
|
|
}
|
|
}
|
|
|
return $array;
|
|
return $array;
|
|
|
};
|
|
};
|
|
|
|
|
+$new_shop = Dever::input('search_option_new_shop_id');
|
|
|
|
|
+$group = 't_1.mid,t_1.new_shop_id';
|
|
|
|
|
+if ($new_shop) {
|
|
|
|
|
+ $group = 't_1.mid';
|
|
|
|
|
+}
|
|
|
$admin = Dever::load('manage/auth.info');
|
|
$admin = Dever::load('manage/auth.info');
|
|
|
$admin_auth = false;
|
|
$admin_auth = false;
|
|
|
if ($admin && $admin['role'] == 24){
|
|
if ($admin && $admin['role'] == 24){
|
|
@@ -188,7 +193,7 @@ return array
|
|
|
),
|
|
),
|
|
|
),
|
|
),
|
|
|
'type' => 'all',
|
|
'type' => 'all',
|
|
|
- 'group' => 't_1.mid,t_1.new_shop_id',
|
|
|
|
|
|
|
+ 'group' => $group,
|
|
|
'order' => array('t_1.id' => 'desc'),
|
|
'order' => array('t_1.id' => 'desc'),
|
|
|
'page' => array(20, 'list'),
|
|
'page' => array(20, 'list'),
|
|
|
'col' => '*',
|
|
'col' => '*',
|
rabin