diff --git a/application/adminapi/controller/Nobility.php b/application/adminapi/controller/Nobility.php index 742a220..c347ac4 100644 --- a/application/adminapi/controller/Nobility.php +++ b/application/adminapi/controller/Nobility.php @@ -34,7 +34,7 @@ class Nobility extends adminApi $page_limit = input('page_limit', 30); $count = db::name('vs_nobility')->where('delete_time', 0)->count(); $lists = db::name('vs_nobility') - ->field('lid,name,image,images,pay_price,pay_price,renew_price,pay_coin,renew_coin,day,power_ids,nick_name_color,createtime,updatetime') + ->field('lid,name,image,images,pay_price,pay_price,renew_price,pay_coin,renew_coin,day,power_ids,nick_name_color,nick_name_color_name,createtime,updatetime') ->where('delete_time', 0) ->order($order, $sort) ->page($page, $page_limit) @@ -67,6 +67,7 @@ class Nobility extends adminApi $renew_coin = input('renew_coin', ''); $day = input('day', ''); $nick_name_color = input('nick_name_color', ''); + $nick_name_color_name = input('nick_name_color_name', ''); $power_ids = input('power_ids', ''); if (empty($name)) { return V(0, "请输入爵位名称"); @@ -85,6 +86,7 @@ class Nobility extends adminApi 'renew_coin' => $renew_coin, 'day' => $day, 'nick_name_color' => $nick_name_color, + 'nick_name_color_name' => $nick_name_color_name, 'createtime' => time(), 'power_ids' => $power_ids ]; @@ -107,6 +109,7 @@ class Nobility extends adminApi $renew_coin = input('renew_coin', ''); $day = input('day', ''); $nick_name_color = input('nick_name_color', ''); + $nick_name_color_name = input('nick_name_color_name', ''); $power_ids = input('power_ids', ''); $lid = input('lid', ''); $nobility_info = db::name('vs_nobility')->where('lid', $lid)->find(); @@ -145,6 +148,9 @@ class Nobility extends adminApi if(!empty($nick_name_color)){ $data['nick_name_color'] = $nick_name_color; } + if(!empty($nick_name_color_name)){ + $data['nick_name_color_name'] = $nick_name_color_name; + } if(!empty($power_ids)){ $data['power_ids'] = $power_ids; } diff --git a/application/api/model/Nobility.php b/application/api/model/Nobility.php index 270e6a1..1c7e6b5 100644 --- a/application/api/model/Nobility.php +++ b/application/api/model/Nobility.php @@ -86,7 +86,7 @@ class Nobility extends Model $return['nobility_power_list'] = []; //爵位列表 $nobility_list = db::name('vs_nobility') - ->field('lid,name,power_ids,nick_name_color') + ->field('lid,name,power_ids,nick_name_color,nick_name_color_name') ->where('delete_time', 0) ->select(); //权限列表 @@ -114,11 +114,13 @@ class Nobility extends Model if($value['id']==2){ $v['type'] = 2; $v['value'] = $v['nick_name_color'] ?? ''; + $v['color_name'] = $v['nick_name_color_name'] ?? ''; }else{ $v['type'] = 1; $v['value'] = ''; } unset($v['nick_name_color']); + unset($v['nick_name_color_name']); $return['nobility_power_list'][$key]['nobility_list'][$k] = $v; } } @@ -309,7 +311,7 @@ class Nobility extends Model ->find(); if($user_nobility_info){ $nobility_info = db::name('vs_nobility') - ->field('lid,name,image,pay_price,renew_price,day,power_ids') + ->field('lid,name,image,pay_price,renew_price,day,power_ids,nick_name_color,nick_name_color_name') ->where('delete_time', 0) ->where('lid', $user_nobility_info['lid']) ->find(); @@ -328,6 +330,8 @@ class Nobility extends Model 'lid' => $user_nobility_info['lid'] ?? 0, 'nobility_name' => $nobility_info['name'] ?? '', 'nobility_image' => $nobility_info['image'] ?? '', + 'nick_name_color' => $nobility_info['nick_name_color'] ?? '', + 'nick_name_color_name' => $nobility_info['nick_name_color_name'] ?? '', 'end_time' => $user_nobility_info['end_time'] ?? 0, 'power_list' => $power_list ?? [], ];