diff --git a/application/adminapi/controller/Activities.php b/application/adminapi/controller/Activities.php
index 68b63a5..cc0f500 100644
--- a/application/adminapi/controller/Activities.php
+++ b/application/adminapi/controller/Activities.php
@@ -424,6 +424,7 @@ class Activities extends adminApi
             'money' => $ext['money'],
             'money_str' => $ext['money_str'],
             'diamond' => $ext['diamond'],
+            'activity_end_time' => $ext['activity_end_time'],
         ];
         return V(1,"成功",$data);
     }
diff --git a/application/api/controller/Activities.php b/application/api/controller/Activities.php
index a1c428d..840dea0 100644
--- a/application/api/controller/Activities.php
+++ b/application/api/controller/Activities.php
@@ -200,7 +200,7 @@ class Activities extends BaseCom
     public function drop_gift_send()
     {
         $uid = input('uid',$this->uid);
-        $reslut = model('Activities')->drop_gift_send($uid);
+        $reslut = model('Activities')->drop_gift_send($uid,16);
         return  V($reslut['code'],$reslut['msg'], $reslut['data']);
     }
 
diff --git a/application/api/model/Activities.php b/application/api/model/Activities.php
index c279db4..64d37a8 100644
--- a/application/api/model/Activities.php
+++ b/application/api/model/Activities.php
@@ -25,7 +25,7 @@ class Activities extends Model
     public static function first_charge_gift_send($user_id,$money=0)
     {
         //礼包
-        $gift_bag = DB::name('vs_gift_bag')->where(['activities_id'=>1,'status'=>1,'delete_time'=>0,'money'=>['>=',$money]])->order('money desc')->find();
+        $gift_bag = DB::name('vs_gift_bag')->where(['activities_id'=>1,'status'=>1,'delete_time'=>0,'money'=>['<=',$money]])->order('money desc')->find();
         $gift_bag_id = $gift_bag['id'] ?? 0;
         if (!$gift_bag_id) {
             return ['code' => 0, 'msg' => '礼包不存在','data' => null];
diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php
index 34b4753..cbeeed0 100644
--- a/application/api/model/Decorate.php
+++ b/application/api/model/Decorate.php
@@ -206,6 +206,9 @@ class Decorate extends Model
                     if($decorate_price_info['price']<=0 && $user_decorate_data['end_time'] > $now_time + $change_time){
                         return ['code' => 0, 'msg' => '您已购买过此装扮，请勿重复购买', 'data' => null];
                     }
+                    if($user_decorate_data['end_time'] < $now_time){
+                        $user_decorate_data['end_time'] = 0;
+                    }
                     $change_time = $day * 24 * 3600;
                     $update['is_using'] = 2;
                     $update['end_time'] = $user_decorate_data['end_time'] + $change_time;
diff --git a/application/api/model/UserGiftPack.php b/application/api/model/UserGiftPack.php
index 8e9251a..04ed0c3 100644
--- a/application/api/model/UserGiftPack.php
+++ b/application/api/model/UserGiftPack.php
@@ -107,6 +107,7 @@ class UserGiftPack extends Model
             self::DRAW_GIFT,
             self::XLH_DRAW_GIFT_GET
             ,self::HOUR_RANK_GET
+            ,self::NEW_CHARGE_GIFT
         ];
         //获取背包日志列表
         $log_model = Db::name('vs_user_gift_pack_log')->where(['user_id'=>$uid])->whereIn('type', $type)
@@ -121,7 +122,7 @@ class UserGiftPack extends Model
             $gift_info = db::name('vs_gift')->where(['gid'=>$v['gid']])->find();
             $list[$k]['remarks'] = $v['remarks'];
             $list[$k]['gift_num'] = $v['change_num'];
-            $list[$k]['gift_name'] = "X".$v['change_num'].$gift_info['gift_name'];
+            $list[$k]['gift_name'] = $gift_info['gift_name']." X ".$v['change_num'];
             $list[$k]['gift_image'] = $gift_info['play_image'];
             $list[$k]['time'] = date('Y-m-d H:i:s', $v['createtime']);
         }
@@ -148,7 +149,7 @@ class UserGiftPack extends Model
             $gift_info = db::name('vs_gift')->where(['gid'=>$v['gid']])->find();
             $list[$k]['remarks'] = $v['remarks'];
             $list[$k]['gift_num'] = $v['change_num'];
-            $list[$k]['gift_name'] = "-".$v['change_num'].$gift_info['gift_name'];
+            $list[$k]['gift_name'] = $gift_info['gift_name']." - ".$v['change_num'];
             $list[$k]['gift_image'] = $gift_info['play_image'];
             $list[$k]['time'] = date('Y-m-d H:i:s', $v['createtime']);
         }
diff --git a/application/common.php b/application/common.php
index bd3882a..85cc18e 100644
--- a/application/common.php
+++ b/application/common.php
@@ -1203,6 +1203,12 @@ function handelCharge($where,$data){
         if($is_first_charge == 0){
             model('Activities')->first_charge_gift_send($orderModel['user_id'],$orderModel['money']);
         }
+        //活动
+        if($orderModel['type_id'] == 6){
+            $orderModel['type_params'] = 2;
+        }elseif(in_array($orderModel['type_id'],[14,15,16])){
+            $orderModel['type_params'] = 3;
+        }
         switch ($orderModel['type_params']){
             case 2:
                 //天降好礼