|
@@ -149,7 +149,9 @@ class Eyemargin extends Common
|
|
$common_where['a.is_main'] = 1;
|
|
$common_where['a.is_main'] = 1;
|
|
}
|
|
}
|
|
$common_where['a.status'] = 1;
|
|
$common_where['a.status'] = 1;
|
|
- $common_where['u.city'] = $this->auth->city;
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ !$is_goddess && $common_where['u.city'] = $this->auth->city;
|
|
// $is_goddess && $common_where['u.is_goddess'] = 1;
|
|
// $is_goddess && $common_where['u.is_goddess'] = 1;
|
|
// $is_new && $common_where['u.createtime'] = ['gt',$time];
|
|
// $is_new && $common_where['u.createtime'] = ['gt',$time];
|
|
if ($this->auth->gender == 1) {
|
|
if ($this->auth->gender == 1) {
|