diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
index b6fe8d6d7..a3cce5ce4 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
@@ -335,7 +335,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
         giftNumLayout.setOnClickListener(this);
         List<GiftTab> tabInfoList = new ArrayList<>();
         tabInfoList.add(new GiftTab(GiftIndicator.TYPE_NORMAL, "礼物", "礼物"));
-        tabInfoList.add(new GiftTab(GiftIndicator.TYPE_LUCKY, "星球", "星球"));
+        tabInfoList.add(new GiftTab(GiftIndicator.TYPE_LUCKY, "幸运礼物", "幸运礼物"));
         tabInfoList.add(new GiftTab(GiftIndicator.TYPE_NOBLE, "贵族", "贵族"));
         tabInfoList.add(new GiftTab(GiftIndicator.TYPE_MAGIC, "魔法", "魔法"));
         tabInfoList.add(new GiftTab(GiftIndicator.TYPE_KNAP, "背包", "背包"));
@@ -624,8 +624,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
             return;
         }
         showDataView();
-        btnSendMagic.setVisibility(View.GONE);
-        sendContainer.setVisibility(View.VISIBLE);
         currentMagicInfo = null;
         // 获得对应的普通礼物/贵族礼物/背包礼物
         List<GiftInfo> nobleGiftInfos = getNobleGiftInfos();
@@ -644,14 +642,13 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
         } else {
             giftIndicator.showPosition(GiftIndicator.TYPE_NOBLE);
         }
-
         //是否背包礼物
         final boolean isKnap = (position == GiftIndicator.TYPE_KNAP);
+        initEasyPop(isKnap);
         if (ListUtils.isListEmpty(currentGiftInfoList)) {
             if (isKnap) {
                 tvGiftValue.setVisibility(View.VISIBLE);
                 showEmptyView();
-                initEasyPop(true);
             } else if (position == GiftIndicator.TYPE_LUCKY) {
                 showEmptyView();
             } else {
@@ -660,19 +657,18 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
             return;
         }
         current = currentGiftInfoList.get(0);
-        etSendMessage.setVisibility(current.isSendMsg() ? View.VISIBLE : View.GONE);
-        tvLuckyBagIntro.setVisibility(TextUtils.isEmpty(current.getGiftExplainUrl()) ? View.GONE : View.VISIBLE);
-
+        if (current.isSendMsg()) {
+            etSendMessage.setVisibility(View.VISIBLE);
+        }
+        if (!TextUtils.isEmpty(current.getGiftExplainUrl())) {
+            tvLuckyBagIntro.setVisibility(View.VISIBLE);
+        }
         pagerList = beanTransformVm(context, currentGiftInfoList, isKnap, 8);
         setGridViewData(pagerList);
         if (isKnap) {
             tvGiftValue.setVisibility(View.VISIBLE);
-            easyPopup.getView(R.id.number_all).setVisibility(View.VISIBLE);
-            initEasyPop(true);
             updateTotalPrice();
         } else {
-            tvGiftValue.setVisibility(View.GONE);
-            initEasyPop(false);
             if (giftNumber == -1) {
                 updateNumber(1);
             }
@@ -726,9 +722,14 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
         layoutLoading.setVisibility(View.GONE);
         layoutLoadFiled.setVisibility(View.GONE);
         layoutEmpty.setVisibility(View.GONE);
-        gridView.setVisibility(View.VISIBLE);
         etSendMessage.setVisibility(View.GONE);
+        tvLuckyBagIntro.setVisibility(View.GONE);
+        tvGiftValue.setVisibility(View.GONE);
+        btnSendMagic.setVisibility(View.GONE);
+
+        gridView.setVisibility(View.VISIBLE);
         indicatorView.setVisibility(View.VISIBLE);
+        sendContainer.setVisibility(View.VISIBLE);
     }
 
     private void setGridViewData(List<List<IItem>> pagerList) {