diff --git a/application/api/controller/Activities.php b/application/api/controller/Activities.php index 79939bc..8aba265 100644 --- a/application/api/controller/Activities.php +++ b/application/api/controller/Activities.php @@ -149,30 +149,30 @@ class Activities extends BaseCom if($v['type'] == 1){ $list[$k]['gift_name'] = "金币"; $list[$k]['num'] = $v['gold']; - $list[$k]['gold'] = $v['gold']; + $list[$k]['gift_price'] = $v['gold']; $list[$k]['type'] = 1; - $list[$k]['icon'] = localpath_to_netpath("static/image/icon/gold.png"); + $list[$k]['base_image'] = localpath_to_netpath("static/image/icon/gold.png"); }elseif($v['type'] == 2) { $gift = DB::name('vs_gift')->where(['gid'=>$v['foreign_id']])->find(); $list[$k]['gift_name'] = $gift['gift_name']; $list[$k]['num'] = $v['quantity']; - $list[$k]['gold'] = $gift['gift_price']; + $list[$k]['gift_price'] = $gift['gift_price']; $list[$k]['type'] =2; - $list[$k]['icon'] = $gift['play_image']; + $list[$k]['base_image'] = $gift['play_image']; } elseif($v['type'] == 3) { $decorate_price = DB::name('vs_decorate_price')->where(['id'=>$v['foreign_id']])->find(); $gift = DB::name('vs_decorate')->where(['did'=>$decorate_price['did']])->find(); $list[$k]['gift_name'] = $gift['title']; //装扮名称 $list[$k]['num'] = $decorate_price['day']; //天数 - $list[$k]['gold'] = $decorate_price['price']; //价格 + $list[$k]['gift_price'] = $decorate_price['price']; //价格 $list[$k]['type'] =3; - $list[$k]['icon'] = $gift['base_image']; + $list[$k]['base_image'] = $gift['base_image']; }elseif($v['type'] == 4) { $list[$k]['gift_name'] = "钻石"; $list[$k]['num'] = $v['quantity']; - $list[$k]['gold'] = $v['gold']; + $list[$k]['gift_price'] = $v['gold']; $list[$k]['type'] = 4; - $list[$k]['icon'] = localpath_to_netpath("static/image/icon/gold.png"); + $list[$k]['base_image'] = localpath_to_netpath("static/image/icon/gold.png"); } } $data['gift_list'] = $list;