Merge branch 'feature/停复机1' into dev

* feature/停复机1:
  好办功能即将到期提示

src/components/notice/notice.vue

@@ -82,10 +82,7 @@ export default {
         let { otherExpireServices, expireStatus, expireDayStr } = result;
         otherExpireServices = otherExpireServices || [];
         if (expireStatus == 1) {
-          this.expireTip.content = `${service.serviceName}将于 ${expireDayStr} 到期，到期后将被冻结无法登录，请及时联系运营人员续费。`;
-          this.expireTip.show = true;
-        } else if (otherExpireServices.length) {
-          this.expireTip.content = `${otherExpireServices[0].serviceName}将于 ${otherExpireServices[0].expireDayStr} 到期，到期后功能无法使用，请及时联系运营人员续费。`;
+          this.expireTip.content = `${service.serviceName}将于 ${expireDayStr} 到期，到期后功能无法使用，请及时联系运营人员续费。`;
           this.expireTip.show = true;
         }
         this.expireTip.showButton = otherExpireServices.length && serviceType == 11;