Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

ys_vue/src/views/Home.vue

@@ -230,7 +230,7 @@
             },
                 res => {
                     if (res.code == "ok") {
-                        this.popoverData = res.data.list;
+                        this.popoverData = res.data.list.list;
                     } else {
                         this.$message({
                         message: res.msg,
@@ -247,6 +247,25 @@
             },
             //点击消息的跳转
             locationHerf(id, type) {
+                this.http.post( this.port.notice.read, {
+                    "id": id
+                },
+                res => {
+                    if (res.code == "ok") {
+                        
+                    } else {
+                        this.$message({
+                        message: res.msg,
+                        type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
                 if (type == 0) {
                     //审批 跳转到模具详情
                     this.$router.push("/moldList/" + id);

ys_vue/src/views/message.vue

@@ -37,8 +37,7 @@
                 {},
                 res => {
                 if (res.code == "ok") {
-                    this.messages = res.data.list;
-                    console.log(this.messages);
+                    this.messages = res.data.list.list;
                 } else {
                     this.$message({
                     message: res.msg,