diff --git a/src/views/activity/ActTwelveStarConfigAdminView.vue b/src/views/activity/ActTwelveStarConfigAdminView.vue
index ad7d3c7..214b3d4 100644
--- a/src/views/activity/ActTwelveStarConfigAdminView.vue
+++ b/src/views/activity/ActTwelveStarConfigAdminView.vue
@@ -200,12 +200,16 @@ export default {
                             },
                             {
                                 field: 'giftIdList', title: '礼物清单', align: 'center', valign: 'middle', formatter: function (val, row, index) {
-                                    var giftArr = JSON.parse(val);
-                                    var str = '';
-                                    for (var i = 0; i < giftArr.length; i++) {
-                                        str += giftObj[giftArr[i]] + '，';
+                                    if (val && val.startsWith('{') && val.endsWith('}')) {
+                                        var giftArr = JSON.parse(val);
+                                        var str = '';
+                                        for (var i = 0; i < giftArr.length; i++) {
+                                            str += giftObj[giftArr[i]] + '，';
+                                        }
+                                        return str.substr(0, str.length - 2);
+                                    } else {
+                                        return val;
                                     }
-                                    return str.substr(0, str.length - 2);
                                 }
                             },
                             {
@@ -400,11 +404,24 @@ export default {
                     }
                 });
                 $('#table').on('click', '.opt-edit', function () {
+                    $('#editGiftId').val('');
+                    $('#editCharmAwardId').val('');
+                    $('#editLevelAwardId').val('');
                     var id = $(this).data('id');
                     var data = $('#table').bootstrapTable('getRowByUniqueId', id);
-                    var giftArr = JSON.parse(data.giftIdList);
-                    var charmAward = JSON.parse(data.charmAward);
-                    var levelAward = JSON.parse(data.levelAward);
+                    let giftArr = null;
+                    let giftIdList = data.giftIdList;
+                    if (giftIdList && giftIdList.startsWith('{') && giftIdList.endsWith('}')) {
+                        giftArr = JSON.parse(data.giftIdList);
+                    }
+                    let charmAward = null; 
+                    if (charmAward && charmAward.startsWith('{') && charmAward.endsWith('}')) {
+                        charmAward = JSON.parse(data.charmAward);
+                    }
+                    let levelAward = null; 
+                    if (levelAward && levelAward.startsWith('{') && levelAward.endsWith('}')) {
+                        levelAward = JSON.parse(data.levelAward);
+                    }
                     console.log(data);
                     $('#editId').val(data.id);
                     $('#editGiftId').multiselect('select', giftArr);