|
@@ -65,6 +65,7 @@ class CardController
|
|
|
if (!$id) return app('json')->fail('传入id');
|
|
if (!$id) return app('json')->fail('传入id');
|
|
|
|
|
|
|
|
$details = Card::order('id DESC')->where('id', $id)->find()->toArray();
|
|
$details = Card::order('id DESC')->where('id', $id)->find()->toArray();
|
|
|
|
|
+ $details['introduce'] = html_entity_decode($details['introduce']);
|
|
|
|
|
|
|
|
return app('json')->successful($details);
|
|
return app('json')->successful($details);
|
|
|
}
|
|
}
|
|
@@ -235,6 +236,7 @@ class CardController
|
|
|
if (!$list) return app('json')->fail('优惠卡不存在');
|
|
if (!$list) return app('json')->fail('优惠卡不存在');
|
|
|
$list = $list->toArray();
|
|
$list = $list->toArray();
|
|
|
$list['cards'] = [];
|
|
$list['cards'] = [];
|
|
|
|
|
+ $list['introduce'] = html_entity_decode(Card::where('id', $list['card_id'])->value('introduce'));
|
|
|
if ($list['status'] == 1){
|
|
if ($list['status'] == 1){
|
|
|
$card = UserEquity::where('user_card_id', $id)->select();
|
|
$card = UserEquity::where('user_card_id', $id)->select();
|
|
|
foreach ($card as &$item){
|
|
foreach ($card as &$item){
|
