Merge branch 'add-message-tip' into 'master'

添加消息颜色

See merge request pigbigbig/beyond-clouds-front!119

components/pc/noticeCard.vue

@@ -218,6 +218,9 @@
               @include fontStyle(12,20,500,#333,left);
               height:auto;
               word-break: break-word;
+              a {
+                color: #00AAE6;
+              }
             }
 
           }
@@ -308,9 +311,6 @@
           .info2{
             margin-top: 10*$length;
             @include fontStyle(12,16,500,#999,left)
-            a {
-              color: #00AAE6;
-            }
           }
         }
       }

pages/personal-center/message/all.vue

@@ -19,7 +19,8 @@
     data(){
       return{
         message:[],
-        pages:1
+        pages:1,
+        currentPage: 1
       }
     },
     components:{
@@ -28,7 +29,8 @@
     sockets: {
       push_event(data) {
         console.log(data)
-        if (this.pages === 1) {
+        console.log(this.pages)
+        if (this.currentPage === 1) {
           this.dataGetMessages(1)
         }
       }
@@ -67,6 +69,7 @@
       changePage(currentPage){
         //返回页数 请求新的数据
         this.dataGetMessages(currentPage)
+        this.currentPage = currentPage
       }
     },
   }