新需求-活动需求-天降好礼
This commit is contained in:
@@ -32,6 +32,7 @@ class Activities extends BaseCom
|
|||||||
$data['name'] = $activities_title??"";
|
$data['name'] = $activities_title??"";
|
||||||
$data['gift_bag'] = [];
|
$data['gift_bag'] = [];
|
||||||
foreach ($gift_bag as $k=>$v){
|
foreach ($gift_bag as $k=>$v){
|
||||||
|
$data['gift_bag'][$k]['gift_bag_id'] = $v['id']??0;
|
||||||
$data['gift_bag'][$k]['name'] = $v['title']??"";
|
$data['gift_bag'][$k]['name'] = $v['title']??"";
|
||||||
$ext = json_decode($v['ext'],true);
|
$ext = json_decode($v['ext'],true);
|
||||||
$data['gift_bag'][$k]['title1'] = $ext['title1']??"";
|
$data['gift_bag'][$k]['title1'] = $ext['title1']??"";
|
||||||
@@ -129,6 +130,7 @@ class Activities extends BaseCom
|
|||||||
//礼包
|
//礼包
|
||||||
$gift_bag = DB::name('vs_gift_bag')->where(['activities_id'=>$activities_id,'status'=>1])->find();
|
$gift_bag = DB::name('vs_gift_bag')->where(['activities_id'=>$activities_id,'status'=>1])->find();
|
||||||
$data = [];
|
$data = [];
|
||||||
|
$data['gift_bag_id'] = $gift_bag['id']??0;
|
||||||
$data['name'] = $activities['title']??"";
|
$data['name'] = $activities['title']??"";
|
||||||
$data['bag_name'] = $gift_bag['title']??"";
|
$data['bag_name'] = $gift_bag['title']??"";
|
||||||
$data['effective_time'] = $activities['effective_time']??"";
|
$data['effective_time'] = $activities['effective_time']??"";
|
||||||
@@ -214,6 +216,7 @@ class Activities extends BaseCom
|
|||||||
$data['name'] = $activities_title??"";
|
$data['name'] = $activities_title??"";
|
||||||
$data['gift_bag'] = [];
|
$data['gift_bag'] = [];
|
||||||
foreach ($gift_bag as $k=>$v){
|
foreach ($gift_bag as $k=>$v){
|
||||||
|
$data['gift_bag'][$k]['gift_bag_id'] = $v['id']??0;
|
||||||
$data['gift_bag'][$k]['name'] = $v['title']??"";
|
$data['gift_bag'][$k]['name'] = $v['title']??"";
|
||||||
$ext = json_decode($v['ext'],true);
|
$ext = json_decode($v['ext'],true);
|
||||||
$data['gift_bag'][$k]['title1'] = $ext['title1']??"";
|
$data['gift_bag'][$k]['title1'] = $ext['title1']??"";
|
||||||
|
|||||||
Reference in New Issue
Block a user