Merge branch 'master' into develop

.gitignore

@@ -2,4 +2,5 @@
 /public/uploads/*
 .idea
 *.log
+.env
 

application/adminapi/controller/Activities.php

@@ -498,6 +498,7 @@ class Activities extends adminApi
         $meet = input('meet','');
         $num = input('num', 0);
         $content = input('content', 0);
+        $title = input('title', "");
         if($gift_bag_id==""){
             return V(0,"请选择礼包类型");
         }
@@ -516,6 +517,7 @@ class Activities extends adminApi
             'num' => $num
         ];
         $data['ext'] = json_encode($ext);
+        $data['title'] = $title;
         $res = db::name($this->table)->where(['id'=>$gift_bag_id])->update($data);
         if(!$res){
             return V(0,"失败");

application/adminapi/controller/Decorate.php

@@ -374,10 +374,11 @@ class Decorate extends adminApi
         $user_id = input('user_id', '');
         $decorate_id = input('decorate_id', '');
         $day = input('day', '');
-        $user = db::name('user')->where(['id'=>$user_id])->find();
+        $user = db::name('user')->where(['user_code'=>$user_id])->find();
         if(!$user){
             return V(0,"用户不存在");
         }
+        $user_id = $user['id'];
         $decorate = db::name('vs_decorate')->where(['did'=>$decorate_id])->find();
         if(!$decorate){
             return V(0,"装扮不存在");