diff --git a/application/adminapi/controller/UserCp.php b/application/adminapi/controller/UserCp.php
index f3317ba..688248e 100644
--- a/application/adminapi/controller/UserCp.php
+++ b/application/adminapi/controller/UserCp.php
@@ -38,11 +38,17 @@ class UserCp extends adminApi
             return V(0,"数据不存在");
         }
         $dress = db::name('vs_decorate_price')->where('id',$list['dress_id'])->field('did,day')->find();
-        $jiajia = db::name('vs_decorate_price')->where('id',$list['jiajia_id'])->field('did,day')->find();
         $list['dress_title'] = '头像框-'.$dress['day'].'天-'.db::name('vs_decorate')->where('did',$dress['did'])->value('title');
         $list['dress_base_image'] = db::name('vs_decorate')->where('did',$dress['did'])->value('base_image');
-        $list['jiajia_title'] = '坐骑-'.$jiajia['day'].'天-'.db::name('vs_decorate')->where('did',$list['jiajia_id'])->value('title');
-        $list['jiajia_base_image'] = db::name('vs_decorate')->where('did',$list['jiajia_id'])->value('base_image');
+        $jiajia = db::name('vs_decorate_price')->where('id',$list['jiajia_id'])->field('did,day')->find();
+        $list['jiajia_title'] = '坐骑-'.$jiajia['day'].'天-'.db::name('vs_decorate')->where('did',$jiajia['did'])->value('title');
+        $list['jiajia_base_image'] = db::name('vs_decorate')->where('did',$jiajia['did'])->value('base_image');
+        $pendant = db::name('vs_decorate_price')->where('id',$list['pendant_id'])->field('did,day')->find();
+        $list['pendant_title'] = '装扮-'.$pendant['day'].'天-'.db::name('vs_decorate')->where('did',$pendant['did'])->value('title');
+        $list['pendant_base_image'] = db::name('vs_decorate')->where('did',$pendant['did'])->value('base_image');
+        $rights_icon = db::name('vs_decorate_price')->where('id',$list['rights_icon_id'])->field('did,day')->find();
+        $list['rights_icon_title'] = '装扮-'.$rights_icon['day'].'天-'.db::name('vs_decorate')->where('did',$rights_icon['did'])->value('title');
+        $list['rights_icon_base_image'] = db::name('vs_decorate')->where('did',$rights_icon['did'])->value('base_image');
         return V(1,"成功", $list);
     }
 
@@ -55,10 +61,10 @@ class UserCp extends adminApi
             'name' => input('name', ''),
             'image' => input('image', ''),
             'change_value' => input('change_value', ''),
-            'rights_icon' => input('rights_icon', ''),
+            'rights_icon_id' => input('rights_icon_id', ''),//特效id 11
             'dress_id' => input('dress_id', ''),
             'jiajia_id' => input('jiajia_id', ''),
-            'pendant' => input('pendant', ''),//挂件（装扮）地址
+            'pendant_id' => input('pendant_id', ''),//挂件（装扮）id  10
             'direction' => input('direction', 0),//挂件上的头像位置：0-上，1-右上，2-右，3-右下，4-下，5-左下，6-左，7-左上
         ];
         //没有 id就是新增