|
@@ -92,7 +92,7 @@ class Usercenter extends Api
|
|
|
//合并
|
|
|
$userinfo = array_merge($userinfo,$new_data);
|
|
|
//枚举
|
|
|
- $userinfo['tag'] = Db::name('enum_tag')->where('id','IN',$userinfo['tag_ids'])->field(['id','name'])->select();
|
|
|
+ $userinfo['tag'] = Db::name('enum_tag')->where('id','IN',$userinfo['tag_ids'])->field(['id','name','color'])->select();
|
|
|
|
|
|
//vip
|
|
|
$userinfo['vip_endtime'] = Db::name('user_wallet')->where('user_id',$uid)->value('vip_endtime');
|
|
@@ -178,7 +178,7 @@ class Usercenter extends Api
|
|
|
//合并
|
|
|
$userinfo = array_merge($userinfo,$new_data);
|
|
|
//枚举
|
|
|
- $userinfo['tag'] = Db::name('enum_tag')->where('id','IN',$userinfo['tag_ids'])->field(['id','name'])->select();
|
|
|
+ $userinfo['tag'] = Db::name('enum_tag')->where('id','IN',$userinfo['tag_ids'])->field(['id','name','color'])->select();
|
|
|
|
|
|
//vip
|
|
|
$userinfo['vip_endtime'] = Db::name('user_wallet')->where('user_id',$uid)->value('vip_endtime');
|