|
|
@@ -1226,8 +1226,9 @@ Q版卡通风格,头大身小,造型圆润可爱,线条简单,色彩明
|
|
|
$gender = getProp($data, 'gender');
|
|
|
$timbre_name = getProp($data, 'voice_name');
|
|
|
$category_id = getProp($data, 'category_id');
|
|
|
+ $age_stage = getProp($data, 'age_stage');
|
|
|
|
|
|
- $query = DB::table('mp_timbres')->where('is_enabled', 1)->select('timbre_name as voice_name', 'timbre_type as voice_type', 'gender', 'language', 'emotion', 'label', 'first_category_id', 'first_category_name', 'second_category_id', 'second_category_name', 'third_category_id', 'third_category_name', 'audio_url');
|
|
|
+ $query = DB::table('mp_timbres')->where('is_enabled', 1)->select('timbre_name as voice_name', 'timbre_type as voice_type', 'gender', 'age_stage', 'language', 'emotion', 'label', 'first_category_id', 'first_category_name', 'second_category_id', 'second_category_name', 'third_category_id', 'third_category_name', 'audio_url');
|
|
|
if ($gender) {
|
|
|
$query->where('gender', $gender);
|
|
|
}
|
|
|
@@ -1239,6 +1240,9 @@ Q版卡通风格,头大身小,造型圆润可爱,线条简单,色彩明
|
|
|
$query->where('first_category_id', $category_id)->orWhere('second_category_id', $category_id)->orWhere('third_category_id', $category_id);
|
|
|
});
|
|
|
}
|
|
|
+ if ($age_stage) {
|
|
|
+ $query->where('age_stage', $age_stage);
|
|
|
+ }
|
|
|
|
|
|
$list = $query->get()->map(function ($value) {
|
|
|
$value = (array)$value;
|