Merge remote-tracking branch 'origin/hotfix/v4.7.55.3' into hotfix/v4.7.55.3

src/web/staticres/me/js/push_setting.js

@@ -165,19 +165,20 @@ var pushSettingVueConf = {
             this.getUserInfo(function (info) {
                 // console.log(info)
                 if (_this.userInfo.subscribeVip > 0) {
-                    _this.settingList[0].show = false
                     _this.settingList[1].show = true
                 } else {
-                    _this.settingList[0].show = true
                     _this.settingList[1].show = false
                 }
                 if (_this.userInfo.bigmemberVip > 0) {
-                  _this.settingList[0].show = false
                   _this.settingList[4].show = true
                 } else {
-                  _this.settingList[0].show = true
                   _this.settingList[4].show = false
                 }
+                if (_this.userInfo.subscribeVip <= 0 && _this.userInfo.bigmemberVip <= 0) {
+                  _this.settingList[0].show = true
+                } else {
+                  _this.settingList[0].show = false
+                }
             })
         },
         toSettingDetail: function (item) {