Commit e2c4b0a3 by 冷斌

fix bug

parent fa117fc2
...@@ -1585,8 +1585,6 @@ class Api_Live extends PhalApi_Api { ...@@ -1585,8 +1585,6 @@ class Api_Live extends PhalApi_Api {
// } // }
$giftlist=$domain->getGiftList(); $giftlist=$domain->getGiftList();
var_dump($giftlist);
die;
$data = []; $data = [];
foreach ($giftlist as $key => $item) { foreach ($giftlist as $key => $item) {
...@@ -1597,7 +1595,7 @@ class Api_Live extends PhalApi_Api { ...@@ -1597,7 +1595,7 @@ class Api_Live extends PhalApi_Api {
$giftlist = $data; $giftlist = $data;
$welfareGift = $domain->randomGift(); $welfareGift = $domain->randomGift();
if (!empty($welfareGift)) { if (!empty($welfareGift) && $this->type == 0) {
$welfare = DI()->notorm->welfare_rate->select('rate')->where('id=1')->fetchOne(); $welfare = DI()->notorm->welfare_rate->select('rate')->where('id=1')->fetchOne();
$info['welfare_price'] = $welfare['rate']; $info['welfare_price'] = $welfare['rate'];
$giftlist[] = [ $giftlist[] = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment