修改礼物墙，修改爆币返回

application/admin/lang/zh-cn/gift/gift.php

@@ -17,6 +17,5 @@ return [
     'Is_baobi'      => '是否爆币',
     'Is_baobi 1'    => '是',
     'Is_baobi 0'    => '否',
-    'Back_json'     => '爆币数据',
     'Gifttype.name' => '礼物类型'
 ];

application/api/controller/Gift.php

@@ -124,7 +124,10 @@ class Gift extends Api
             }
 
             //返回爆币金额
-            return $baobi_total;
+            return [
+                'baobi_total' => $baobi_total,
+                'baobi_beilv' => $result['beilv'],
+            ];
         }
 
         //默认成功
@@ -205,11 +208,14 @@ class Gift extends Api
 
         $userid = $user_id ? $user_id : $this->auth->id;
 
-        $list = \app\common\model\GiftUserParty::alias('a')->join("hx_gift g", "g.id = a.gift_id", "inner")->field("gift_id,g.name,g.image,sum(number) as number")
-            ->where(["user_to_id" => $userid,])
-            ->group("gift_id")
+        $list = Db::name('gift_user_party')->alias('a')
+            ->join("gift g", "g.id = a.gift_id", "LEFT")
+            ->field("a.gift_id,g.name,g.image,sum(number) as number")
+            ->where(["a.user_to_id" => $userid,])
+            ->group("a.gift_id")
             ->order('g.value desc')
             ->select();
+        $list = list_domain_image($list,['image']);
         $this->success("获取成功！", $list);
     }
 
@@ -222,7 +228,8 @@ class Gift extends Api
         $userid = $user_id ? $user_id : $this->auth->id;
 
         $list = Db::name('gift_user_typing')->alias('log')
-            ->join('gift', 'gift.id = log.gift_id', 'LEFT')->field('log.*,sum(number) as number,gift.name,gift.image,gift.special')
+            ->join('gift', 'gift.id = log.gift_id', 'LEFT')
+            ->field('log.*,sum(number) as number,gift.name,gift.image,gift.special')
             ->where(['log.user_to_id' => $userid])
             ->group('log.gift_id')
             ->order('gift.price desc')