装扮分类暂停-注释不用的
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -4,3 +4,4 @@
|
|||||||
*.log
|
*.log
|
||||||
.env
|
.env
|
||||||
.node_modules
|
.node_modules
|
||||||
|
node_modules/
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ class Decorate extends adminApi
|
|||||||
$return_list[$k]['id'] = $v['did'];
|
$return_list[$k]['id'] = $v['did'];
|
||||||
$return_list[$k]['name'] = $v['title'];
|
$return_list[$k]['name'] = $v['title'];
|
||||||
$return_list[$k]['type'] = $v['type'];
|
$return_list[$k]['type'] = $v['type'];
|
||||||
$return_list[$k]['type_str'] = model('api/Decorate')->TypeArray[$v['type']];
|
$return_list[$k]['type_str'] = model('api/Decorate')->TypeArray[$v['type']] ?? "--";
|
||||||
$return_list[$k]['base_image'] = $v['base_image'];
|
$return_list[$k]['base_image'] = $v['base_image'];
|
||||||
$return_list[$k]['file_type'] = $v['file_type'];
|
$return_list[$k]['file_type'] = $v['file_type'];
|
||||||
$return_list[$k]['file_type_str'] = $v['file_type']==1 ? "SVGA" : "MP4";
|
$return_list[$k]['file_type_str'] = $v['file_type']==1 ? "SVGA" : "MP4";
|
||||||
@@ -343,7 +343,7 @@ class Decorate extends adminApi
|
|||||||
$return_list[$k]['id'] = $v['udid'];
|
$return_list[$k]['id'] = $v['udid'];
|
||||||
$user_data = db::name('user')->where(['id'=>$v['user_id']])->find();
|
$user_data = db::name('user')->where(['id'=>$v['user_id']])->find();
|
||||||
$return_list[$k]['user_name'] = $user_data['user_code']."-".db::name('user')->where(['id'=>$v['user_id']])->value('nickname');
|
$return_list[$k]['user_name'] = $user_data['user_code']."-".db::name('user')->where(['id'=>$v['user_id']])->value('nickname');
|
||||||
$return_list[$k]['type'] = model('api/Decorate')->TypeArray[$v['type']];
|
$return_list[$k]['type'] = model('api/Decorate')->TypeArray[$v['type']] ?? "";
|
||||||
if($v['type'] >= 6){
|
if($v['type'] >= 6){
|
||||||
$return_list[$k]['name'] = $v['special_num'];
|
$return_list[$k]['name'] = $v['special_num'];
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ class Decorate extends Model
|
|||||||
protected $createTime = 'createtime';
|
protected $createTime = 'createtime';
|
||||||
protected $updateTime = 'updatetime';
|
protected $updateTime = 'updatetime';
|
||||||
// 定义字段类型 1头像框 2坐骑 3麦圈 6个人靓号 7房间靓号 8公会靓号
|
// 定义字段类型 1头像框 2坐骑 3麦圈 6个人靓号 7房间靓号 8公会靓号
|
||||||
public $TypeArray = [1=>'头像框',2=>'坐骑',9=>'聊天气泡',6=>'个人靓号',7=>'房间靓号',8=>'公会靓号',3=>'麦圈'];
|
public $TypeArray = [1=>'头像框',2=>'坐骑',9=>'聊天气泡'];//,6=>'个人靓号',7=>'房间靓号',8=>'公会靓号',3=>'麦圈'
|
||||||
protected $FromType = [1=>'购买',2=>'后台赠送',3=>'礼盒开奖',4=>'好友赠送',5=>'首充赠送',6=>'天降好礼获得',7=>'财富等级特权赠送',8=>'新人充值好礼',9=>'爵位购买赠送'];
|
protected $FromType = [1=>'购买',2=>'后台赠送',3=>'礼盒开奖',4=>'好友赠送',5=>'首充赠送',6=>'天降好礼获得',7=>'财富等级特权赠送',8=>'新人充值好礼',9=>'爵位购买赠送'];
|
||||||
public function __construct($data = [])
|
public function __construct($data = [])
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user