Merge branch 'feature/停复机' into dev

# Conflicts:
#	src/components/notice/request.js

src/components/notice/notice.vue

@@ -34,8 +34,8 @@ export default {
     return {
       showNotice: false,
       expireTip: {
-        show: false,
-        content: ''
+        show: true,
+        content: '过期过期'
       },
       rechargeTip: {
         show: false
@@ -54,8 +54,9 @@ export default {
   },
   methods: {
     getAccountState() {
-      this.loadAccountStateInfo();
-      this.loadExpireData();
+      // this.loadAccountStateInfo();
+      // this.loadExpireData();
+      console.log('getAccountState');
     },
     loadAccountStateInfo() {
       getAccountStateInfo().then(res => {

src/components/notice/request.js

@@ -11,10 +11,9 @@ function getRequest(url, params) {
 }
 
 export function getAccountStateInfo() {
-  return Promise.reject();
-  //   return getRequest('api-marketing/account-state-info', {
-  //     requestProject: 'haoban-manage-web'
-  //   });
+  return getRequest('api-marketing/account-state-info', {
+    requestProject: 'haoban-manage-web'
+  });
 }
 
 export function getExpireData(params) {