diff --git a/src/views/users/GiftManageView.vue b/src/views/users/GiftManageView.vue
index ad0bf35..0488a3e 100644
--- a/src/views/users/GiftManageView.vue
+++ b/src/views/users/GiftManageView.vue
@@ -201,7 +201,7 @@
                             <div class="form-group">
                                 <label for="subGiftType" class="col-sm-3 control-label">解锁礼物类型</label>
                                 <div class="col-sm-8">
-                                    <select name="subGiftType" id="subGiftType" data-btn-class="btn-warning" class="form-control" v-model="gift.subGiftType">
+                                    <select name="subGiftType" id="subGiftType" data-btn-class="btn-warning" class="form-control" v-model="gift.subGiftType"  @change="giftUnlockList">
                                         <option value="">无</option> 
                                         <option value="0">基础解锁礼物</option>
                                         <option value="1">被解锁礼物</option>
@@ -211,8 +211,8 @@
                             <div class="form-group" v-if="gift.subGiftType == 1">
                                 <label for="baseGiftId" class="col-sm-3 control-label">需要的基础解锁礼物</label>
                                 <div class="col-sm-8">
-                                    <select name="baseGiftId" id="baseGiftId" data-btn-class="btn-warning" class="form-control" v-model="gift.baseGiftId"> 
-                                        <option v-for="(baseGift, index) in unlockList" :key="baseGift" :data-index="index" :value="baseGift.value">{{ baseGift.text }}</option>
+                                    <select name="baseGiftId" id="baseGiftId" data-btn-class="btn-warning" class="form-control"> 
+                                        
                                     </select>
                                 </div>
                             </div>
@@ -692,7 +692,6 @@ export default {
     name: "GiftManageView",
     data() {
         return {
-            unlockList: [],
             giftLevel: [],
             gift: {
                 giftId: null,
@@ -861,13 +860,15 @@ export default {
         giftUnlockList() {
             getGiftUnlockList().then(res => {
                 let data = res.data;
-                let lockGifts = data.map(e => {
+                let options = data.map(e => {
                     return {
                         text: e.giftName,
                         value: e.giftId,
                     };
                 });
-                this.unlockList = lockGifts;
+                setTimeout(() => {
+                    ComboboxHelper.build(options, '#baseGiftId', this.gift.baseGiftId);  
+                }, 500);
             });            
         },
         levelList() {
@@ -1192,6 +1193,10 @@ export default {
                     window.selectConsumeChange($("#consumeType"));
                     $('#roomExcludeId').val('');
                     $('#giftLevel').val('');
+                    $('#giftTag').val('');
+                    $('#giftTagImage').attr("src", '');
+                    $("#giftTagUploadInfo").html('');
+                    $("#giftTagFile").val('');
                     $('#giftType').removeAttr('disabled');
                     $('#subGiftType').removeAttr('disabled');
                     $('#baseGiftId').removeAttr('disabled');
@@ -1209,9 +1214,7 @@ export default {
                     $('#bannerSkipUrl').val('');
                     $('#sendDressIdBak').val('');
                     $('#receiveDressIdBak').val('');
-                    setTimeout(() => {
-                        $this.giftUnlockList();
-                    }, 1000);
+                    $this.giftUnlockList();
                     $("#giftModal").modal('show');
                 });
                 $("#gift-version-save").click(function () {
@@ -1605,8 +1608,8 @@ export default {
                                         $('#baseGiftId').attr('disabled', 'disabled');
                                         $('#unlockNum').attr('disabled', 'disabled');
                                     }
-                                    $this.giftUnlockList();
                                 }, 1000);
+                                $this.giftUnlockList();
                                 // 打开编辑弹窗
                                 $("#giftModal").modal('show');
                             } else {
@@ -1672,7 +1675,7 @@ export default {
                                     $("#tipModal").modal('show');
                                     TableHelper.doRefresh("#table");
                                 } else {
-                                    $("#tipMsg").text("保存失败." + json.msg);
+                                    $("#tipMsg").text("保存失败." + json.message);
                                     $("#tipModal").modal('show');
                                 }
                             }