|
@@ -1673,6 +1673,7 @@ class Party extends Common
|
|
|
} else {
|
|
|
|
|
|
// 获取礼物信息
|
|
|
+
|
|
|
$giftInfo = Db::name('gift')->where('id',$gift_id)->find();
|
|
|
if (!$giftInfo) {
|
|
|
$this->error("请选择礼物!");
|
|
@@ -1681,8 +1682,9 @@ class Party extends Common
|
|
|
$getValue = $giftValue;
|
|
|
|
|
|
// 判断如果是礼物盒则随机开礼物盒礼物
|
|
|
- if($giftInfo->box_type > 0) {
|
|
|
- $boxgiftInfo = $this->getBoxGift($giftInfo->box_type);
|
|
|
+
|
|
|
+ if($giftInfo['box_type'] > 0) {
|
|
|
+ $boxgiftInfo = $this->getBoxGift($giftInfo['box_type']);
|
|
|
$getValue = $boxgiftInfo["price"];
|
|
|
}
|
|
|
|
|
@@ -1930,9 +1932,9 @@ class Party extends Common
|
|
|
$returnData["partyHot"] = $this->changeW($partyHot);
|
|
|
$returnData["partyUserTop"] = $partyUserTop;
|
|
|
if($is_back != 1) {
|
|
|
- if($giftInfo->box_type > 0) { // 不是背包,宝箱中赠送
|
|
|
- $returnData["box_type"] = $giftInfo->box_type;
|
|
|
- $returnData["box_image"] = $giftInfo->image;
|
|
|
+ if($giftInfo['box_type'] > 0) { // 不是背包,宝箱中赠送
|
|
|
+ $returnData["box_type"] = $giftInfo['box_type'];
|
|
|
+ $returnData["box_image"] = $giftInfo['image'];
|
|
|
$returnData["image"] = $boxgiftInfo["image"];
|
|
|
$returnData["name"] = $boxgiftInfo["gift_name"];
|
|
|
$returnData["gif_image"] = $boxgiftInfo["special"];
|