上线 零散 bug修改

application/api/model/DailyTasks.php

@@ -342,10 +342,10 @@ class DailyTasks extends Model
     public function gift_bag_receive_list($user_id){
         //查询每日任务礼盒记录
         $gift_bag_receive_list = Db::name('vs_gift_bag_receive_log')
-            ->field('bag.name as gift_bag_name,de.name as gift_name,re.createtime as createtime,de.quantity,de.type,de.foreign_id,de.days,de.gold')
+            ->field('bag.name as gift_bag_name,re.createtime as createtime,de.name as gift_name,de.quantity,de.type,de.foreign_id,de.days,de.gold')
             ->alias('re')
             ->join('vs_gift_bag bag', 'bag.id = re.gift_bag_id', 'LEFT')
-            ->join('vs_gift_bag_detail de', 'de.gift_bag_id = re.gift_bag_id','LEFT')
+            ->join('vs_gift_bag_detail de', 'de.id = re.parent_id', 'LEFT')
             ->where(['re.user_id'=>$user_id,'bag.activities_id'=>2,'bag.status'=>1])
             ->order('re.createtime desc')
             ->select();