Merge branch 'master' of coding.yundingshuyuan.com:pigbigbig/beyond-clouds-front

action/config.js

@@ -119,6 +119,10 @@ export default  {
       ProjectComment:{
         list:'/api/project/',//项目评论列表   +{projectId}/comments
       },
+      Message:{
+        detail:'/api/message/',//消息详情+{messageId}
+        list:'/api/my/messages'//我的消息列表
+      }
     },
     post:{
       Post:{
@@ -232,6 +236,12 @@ export default  {
       ProjectComment:{
         delete:'/api/project/comment/',//删除项目评论   +{commentId}
       },
+      Message:{
+        delete:'/api/message/',//删除消息  +{messageId}
+      },
+      Messages:{
+        delete:'/api/messages',//删除所有消息
+      }
     },
     put:{
       Blog:{
@@ -258,6 +268,10 @@ export default  {
       Project:{
         revise:'/api/project/',//修改项目  +{projectId}
       },
+      Message: {
+        read: '/api/message/',//标记信息为已读+{messageId}read
+        readAll: '/api/messages/read',//标记所有信息为已读
+      }
     },
   },
 

components/pc/alertsMessage/alertsCard.vue

@@ -3,8 +3,8 @@
     <div class="alerts-card">
       <div class="alerts-card__header">
         <div class="header-title">消息通知</div>
-        <div class="header-read" @click="handleRead" v-if="flag !== 4">标记已读</div>
-        <div class="header-delete" @click="handleClick" v-if="flag === 4">清空</div>
+        <div class="header-read"  @click="handleRead" v-if="flag !== 4">全部标记已读</div>
+        <div class="header-delete" @click="handleClick" v-if="flag === 4">全部清空</div>
       </div>
       <div class="alerts-card__content">
         <p v-if="message.length === 0">暂无消息</p>
@@ -12,11 +12,10 @@
           v-for="(item, index) in message"
           :key="`${item}${index}`"
           :info="item"
-          @read="handleReader"
           v-if="reload"
         ></alerts-content>
       </div>
-      <div class="alerts-card__footer">
+      <div class="alerts-card__footer" v-if="false">
         <nuxt-link to="/personal-center/message">查看全部 （ {{ unread }} ） </nuxt-link>
       </div>
     </div>
@@ -25,6 +24,7 @@
 
 <script>
 import AlertsContent from './alertsContent';
+import config from '../../../action/config'
 export default {
   name: "alertsCard",
   components: {
@@ -32,42 +32,30 @@ export default {
   },
   data(){
     return{
-      message: [
-        {
-          content: '啊啊啊啊啊啊1，谁关注了你，哈哈哈哈哈',
-          isRead: false
-        },
-        {
-          content: '啊啊啊啊啊啊2，谁关注了你，哈哈哈哈哈',
-          isRead: false
-        },{
-          content: '啊啊啊啊啊啊3，谁关注了你，哈哈哈哈哈',
-          isRead: false
-        },{
-          content: '啊啊啊啊啊啊4，谁关注了你，哈哈哈哈哈',
-          isRead: false
-        },
-        {
-          content: '啊啊啊啊啊啊5，谁关注了你，哈哈哈哈哈',
-          isRead: false
-        },
-        {
-          content: '啊啊啊啊啊啊6，谁关注了你，哈哈哈哈哈',
-          isRead: false
-        },{
-          content: '啊啊啊啊啊啊7，谁关注了你，哈哈哈哈哈',
-          isRead: false
-        },{
-          content: '啊啊啊啊啊啊8，谁关注了你，哈哈哈哈哈',
-          isRead: false
-        }
-      ],
       messageRead: new Set(),
+      message:[],
       isShow: true,
       reload: true,
       flag: 0
     }
   },
+  created(){
+    this.$axios.$get(config.api.get.Message.list,{params:{page:1,
+        size:7
+      }}).then((response)=>{
+     /* console.log(response);
+      let message1 = [];
+      response.data.dataList.forEach(item => {
+        message1.push({
+          content: item.mscContent,
+          status: item.status
+        })
+      });
+      console.log(message1);*/
+      this.message=response.data.dataList
+    });
+
+  },
   computed: {
     unread: function () {
       let flag = this.flag;
@@ -75,8 +63,37 @@ export default {
     }
   },
   methods:{
-    // 找到已读消息的下标
+    handleRead(){
+      this.$axios.$put(config.api.put.Message.readAll).then((response)=>{
+        if(this.message.length!==0) {
+          this.$message({
+            type: 'success',
+            message: '已全部标记已读'
+          });
+          this.flag = 4
+        }else{
+          this.$message({
+            type: 'warning',
+            message: '没有未读信息'
+          });
+        }
+      })
+    },
+    handleClick(){
+      this.$axios.$delete(config.api.delete.Messages.delete).then((response)=>{
+        this.$message({
+          type: 'success',
+          message: '已全部清空'
+        });
+       this.message.length=0;
+      })
+
+
+    }
+    /*// 找到已读消息的下标
     handleReader(index){
+
+      //this.$axios.$put(config.api.put.Message.read+)
       this.messageRead.add(index);
       console.log(this.messageRead);
       console.log(this.messageRead.size);
@@ -87,8 +104,9 @@ export default {
       this.message.forEach((item, index) => {
         this.messageRead.forEach((item2, e) => {
           if (item.content === item2){
-            item.isRead = true;
+            item.status = 1;
           }
+
         })
       });
       this.flag = this.messageRead.size; // 已读个数
@@ -114,7 +132,7 @@ export default {
       this.$nextTick(() =>{
         this.reload = true;
       });
-    }
+    }*/
   }
 }
 </script>

components/pc/alertsMessage/alertsContent.vue

@@ -3,7 +3,7 @@
     <p
       @click="handleRead"
       :style="{color: fontColor}"
-    >{{info.content}}</p>
+    >{{info.mscContent}}</p>
   </div>
 </template>
 

components/pc/select/selectCard.vue

@@ -313,7 +313,7 @@ export default {
   .class-list-box{
     position: absolute;
     width: 196*$length;
-    height: 122*$length;
+    height: 250*$length;
     overflow-y: auto;
     overflow-x: hidden;
     z-index: 999;