新增通知消息模块

src/main/resources/static/css/supplier-center/message.css

@@ -4,23 +4,29 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .pageWrap{width: 968px;margin: auto;padding: 32px 0}
+    .navLayout{min-height: 500px;}
     .content .empty{background-color:#FFF;}
     .content{width: 100%;min-height: 370px;background-color: #FFFFFF;box-sizing: border-box;padding:0 20px 20px 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin:0 0 10px 0;}
-    .content .title{width: 100%;height: 56px;border-bottom: solid 1px #e2e7ef;line-height: 56px;color: #22272e;font-size: 16px;}
+    .content .title{width: 100%;height: 56px;border-bottom: solid 1px #e2e7ef;box-sizing: border-box;padding:9px 0;}
+    .content .title .tabs-item{width:15%;height: 38px;float: left;}
+    .content .title .tabs-item a{width:100%;height: 100%;display: block;font-size: 16px;line-height: 38px;text-align: left;color: #9aa5b5;}
+    .content .title .tabs-item.active a{color: #E15616;}
     .content .section .section-top{width: 100%;height: 54px;float: left;box-sizing: border-box;padding: 9px 0;border-bottom: solid 1px #e2e7ef;}
     .content .section .section-top .cheacked{width: 100px;height: 36px;float: left;cursor: pointer;}
+    .content .section .section-top .cheacked .check{margin: 8px 15px;}
     .content .section .section-top .cheacked .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px 15px}
     .content .section .section-top .cheacked span{display: inline-block;line-height: 36px;font-size: 16px;color: #22272e;}
     .content .section .section-top .button{width: 250px;height: 36px;float: right;}
     .content .section .section-top .button .btn{width: 90px;height: 34px;float: right;margin-left: 16px;border-radius: 2px;background-color: #ffe6dc;line-height: 34px;text-align: center;font-size: 14px;color: #E15616;border: solid 1px #e15616;}
     .content .section .section-content{width: 100%;height: auto;float: left;box-sizing: border-box;padding: 10px 0;}
-    .content .section .section-content .new-list{width: 100%;height: 36px;float: left;box-sizing: border-box;}
-    .content .section .section-content .new-list .text{line-height: 36px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;word-break: break-all;float: left;}
+    .content .section .section-content .new-list{width: 100%;height:80px;float: left;box-sizing: border-box;padding: 15px 0;}
+    .content .section .section-content .new-list .text{line-height: 36px;float: left;}
     .content .section .section-content .new-list .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px 15px;line-height: 16px;cursor: pointer;}
-    .content .section .section-content .new-list .text p{line-height: 36px;font-size: 14px;color: #627386;float: left;width: 600px;overflow: hidden;word-wrap: normal;vertical-align: middle;text-overflow: ellipsis}
+    .content .section .section-content .new-list .text p{width: 700px;height: 48px;line-height: 24px;font-size: 14px;color: #627386;float: left;text-overflow: ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
+    .content .section .section-content .new-list .text p .link{color: #E15621;cursor: pointer;text-decoration: underline;}
+    .content .section .section-content .new-list .text p .link:hover{text-decoration: underline;}
     .content .section .section-content .new-list .time{line-height: 36px;font-size: 14px;color: #b8bfca;float: right;}
-    .check{float: left;margin: 8px}
+    .check{float: left;margin: 4px 15px;}
     .notclick{opacity: .6}
 }
 
@@ -28,21 +34,28 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-    .content{width: 100%;background-color: #FFFFFF;box-sizing: border-box;padding:3.3vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);margin:0 0 2.7vw 0;}
-    .content .title{width: 100%;height: 10vw;line-height: 10vw;color: #22272e;font-size: 3.4vw;}
-    .section-top{width: 100%;height: 54px;float: left;box-sizing: border-box;padding: 10px;background: #fff}
+    footer{display: none;}
+    .content{width: 100%;background-color: #FFFFFF;box-sizing: border-box;padding:3.3vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);margin:0 0 2.7vw 0;padding-bottom:10px;}
+    .content .title{width: 100%;height: 8.4vw;line-height: 8.4vw;color: #22272e;font-size: 3.4vw;}
+    .content .title .tabs-item.active a{color: #E15616;}
+    .content .title .tabs-item{display:inline-block;height:8.4vw;border:1px solid #b8bfca;line-height:8.4vw;padding:0 3vw;border-radius:4.2vw;margin-right:2.6vw}
+    .content .title .tabs-item a{color:#627386}
+    .content .title .tabs-item a span{color:#e15616}
+    .content .title .tabs-item.active{background-color:#ffe6dc;border-color:#e15616;color:#e15616}
+    .header-tabs .tabs-item.active a{color:#e15616}
+    .section-top{width: 100%;height: 54px;box-sizing: border-box;padding: 10px;background: #fff;position: fixed;bottom: 0;left: 0;z-index: 999;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);}
     .section-top .cheacked{width: 100px;height: 36px;float: left;cursor: pointer;}
     .section-top .cheacked .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px 15px}
     .section-top .cheacked span{display: inline-block;line-height: 36px;font-size: 16px;color: #22272e;}
     .section-top .button{height: 36px;float: right;}
-    .section-top .button .btn{width: 90px;height: 34px;float: right;margin-left: 16px;border-radius: 2px;background-color: #ffd8d8;
-    line-height: 34px;text-align: center;font-size: 14px;color: #f94b4b;border: solid 1px #f94b4b;border-radius: 6.4vw}
+    .section-top .button .btn{width: 90px;height: 34px;float: right;margin-left: 16px;border-radius: 2px;background-color: #ffd8d8;line-height: 34px;text-align: center;font-size: 14px;color: #f94b4b;border: solid 1px #f94b4b;border-radius: 6.4vw}
     .section-top .button .btn.Read{border: .27vw solid #1890f9;color: #1890f9;background: #e0f1ff}
     .content .section .section-content{width: 100%;height: auto;float: left;box-sizing: border-box;padding: 10px 0;}
-    .content .section .section-content .new-list{width: 100%;box-sizing: border-box;}
-    .content .section .section-content .new-list .text{line-height: 36px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;word-break: break-all;float: left;}
+    .content .section .section-content .new-list{width: 100%;box-sizing: border-box;float: left;margin-bottom: 4vw;}
+    .content .section .section-content .new-list .text{line-height: 36px;}
     .content .section .section-content .new-list .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px;line-height: 16px;cursor: pointer;}
-    .content .section .section-content .new-list .text p{line-height: 36px;font-size: 3.4vw;color: #627386;float: left;width: 77.6vw;overflow: hidden;word-wrap: normal;vertical-align: middle;text-overflow: ellipsis}
+    .content .section .section-content .new-list .text p{line-height: 6vw;font-size: 3.4vw;color: #627386;float: left;width: 77.6vw;}
+    .content .section .section-content .new-list .text p .link{color: #E15621;cursor: pointer;text-decoration: underline;}
     .content .section .section-content .new-list .time{font-size: 3.1vw;color: #b8bfca;float: left;padding-left: 37px}
     input.check {width: 3.5vw;height: 3.5vw;line-height: 3.5vw;vertical-align: top;margin: 3vw 3vw 1.3vw 3.3vw;float: left;}
     .notclick{pointer-events: none;opacity: .6}

src/main/resources/static/css/supplier-center/shop/goods.css

@@ -5,54 +5,58 @@ li{list-style: none}
     form>div {float: left; height: 40px;font-size: 12px;color: #627386;line-height: 40px;margin-right: 10px;margin-bottom: 10px}
     .Buyer {width:156px; height: 34px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;padding-left: 10px;cursor: pointer;}
     .state {width: 168px;height: 36px;background-color: #ffffff;border-radius: 2px;border: solid 1px #b8bfca;padding-left: 10px;color: #627386;cursor: pointer; margin-right: 10px}
-     .state.small{width: 140px;}
-     input::placeholder{color: #9aa5b5;font-size: 12px;}
-     textarea::placeholder{color: #9aa5b5;}
-     #newBtn div{height: 36px;border-radius: 2px;display: inline-block;text-align: center;cursor: pointer}
-      #newBtn{float: left;margin: 0}
-      .query-btn{background-color: #e15616;color: #fff;width: 88px;border: 1px solid #e15616}
-      .goods-main{width: 100%; height: auto; float: left; margin:10px 0;background: #fff;}
-      .goods-main-empty{width: 100%;height: 60px;line-height: 60px;text-align: center;float: left;margin-top: 20px;}
-      .goods-main-empty p{font-size: 14px;color: #333;}
-      .goods-main-empty p a{color: #e15616;text-decoration: underline;margin: 0 3px;}
-      .goods-title{ height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;padding: 0 20px}
-      .goods-main .goods-table ul li{float:left;width: 8%;text-align: center;color: #22272e;position: inherit}
-      .goods-main .goods-table ul li:nth-child(2){ width: 20%;}
-      .goods-main .goods-table ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(4){width: 20%}
-      .goods-main .goods-table ul li:last-child{width: 22%;position: relative}
-      .tbody ul li{height: 96px;font-size: 12px;}
-      .tbody ul{padding: 0 20px;position: relative;height: 96px}
-      .tbodyle ul li:nth-child(2){width: 20%;}
-      .tbody ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(3){ width: 14%}
-      .tbody ul li:last-child{width: 22%}
-      .goods-main .checkbox {overflow: hidden; cursor: pointer;}
-      .tbody .checkbox .box{ display: inline-block; width: 20px;height: 90px;margin-top: 2px;float: left;}
-      .goods-main  .tbody .checkbox span{ display: inline-block;float: left;margin-left: 6px;}
-      .checkbox .icon-weigouxuan:before{ width: 16px;height: 16px; background-position: -332px -32px;}
-      .checkbox .icon-gouxuan:before{width: 16px; height: 16px;background-position: -210px 0px}
-      .goods-main  .tbody .good-info{display: inline-block}
-      .goods-main  .tbody .good-info img{width: 80px;height: 80px;margin-top: 8px}
-      .tbody ul li .good-classFly,.tbody ul li .good-price,.tbody ul li .status{position: relative;top: 50%;left: 50%;transform: translate(-50%, -50%);width: fit-content;}
-      .goods-main  .tbody .good-name{margin-left: 8px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;width: 90px;}
-      .goods-main  .tbody .good-handle{text-align: left;padding: 0 7px;line-height: 35px;position: absolute;width: 180px;top: 0;left: 30px;right: 0;bottom: 0;margin: auto;height: fit-content}
-      .goods-main  .tbody .btn{padding: 0 11px;margin-right: 8px;height: 24px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;display: inline-block;line-height: 24px;color: #e15616;}
-      .goods-container .good-footer{width: 95%;height: 56px;float: left;padding: 20px}
-      .goods-container .good-footer .footer-left{float: left;}
-      .goods-container .good-footer .checkbox {line-height: 70px;}
-      .goods-container .good-footer .checkbox .box{line-height: 74px;float: left;}
-      .goods-container .good-footer .checkbox span{display: inline-block;float: left;margin-left: 10px;}
-      .goods-container .good-footer .footer-right{float: right;margin-top: 20px;}
-      .goods-container .good-footer .footer-right .btn{width: 90px;height: 36px;display: block;line-height: 36px;text-align: center;font-size: 14px;border-radius: 2px;color: #FFF;}
-      .goods-container .good-footer .footer-right .btn.icon-weigouxuan{border: solid 1px #9aa5b5;color: #22272e;opacity: .5;}
-      .goods-container .good-footer .footer-right .btn.icon-gouxuan{background-color: #e15616;}
-      .bg-gouxuan{background-color: #f0f3f7;}
-      .good-price p {display: inline-block}
-      .priceTag{position: absolute;    top: 60px; right: 45px}
-      .pageWrap{width: 968px;margin: auto;padding: 32px 0}
-      .empty{background: #fff;margin-top: 10px;}
-      .navLayout{min-height: auto;}
-      .styleborder{border-top: 1px solid #e2e7ef}
-      .checkbox.checklist{line-height: 90px}
+    .state.small{width: 140px;}
+    input::placeholder{color: #9aa5b5;font-size: 12px;}
+    textarea::placeholder{color: #9aa5b5;}
+    #newBtn div{height: 36px;border-radius: 2px;display: inline-block;text-align: center;cursor: pointer}
+    #newBtn{float: left;margin: 0}
+    .query-btn{background-color: #e15616;color: #fff;width: 88px;border: 1px solid #e15616}
+    .goods-main{width: 100%; height: auto; float: left; margin:10px 0;background: #fff;}
+    .goods-main .goods-table .goods-tips{width: 100%;height: 44px;float: left;box-sizing: border-box;background: #FFFFFF;padding:0 16px 16px 16px;margin-top: 14px;}
+    .goods-main .goods-table .goods-tips .end-tips{width: 500px;height: 32px;background: #FFF3F3;border-radius: 2px;line-height: 32px;color: #F94B4B;font-size: 12px;}
+    .goods-main .goods-table .goods-tips .end-tips .tips{display:inline-block;width:32px;height:32px;line-height:32px;box-sizing:border-box;position:relative;color:#333;font-size:14px;text-align:center;white-space:nowrap}
+    .goods-main .goods-table .goods-tips .end-tips .tips:before{display:inline-block;width:20px;height:20px;vertical-align:middle;background-position:-24px 1px;margin-right:2px;}
+    .goods-main-empty{width: 100%;height: 60px;line-height: 60px;text-align: center;float: left;margin-top: 20px;}
+    .goods-main-empty p{font-size: 14px;color: #333;}
+    .goods-main-empty p a{color: #e15616;text-decoration: underline;margin: 0 3px;}
+    .goods-title{ height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;padding: 0 20px}
+    .goods-main .goods-table ul li{float:left;width: 8%;text-align: center;color: #22272e;position: inherit}
+    .goods-main .goods-table ul li:nth-child(2){ width: 20%;}
+    .goods-main .goods-table ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(4){width: 20%}
+    .goods-main .goods-table ul li:last-child{width: 22%;position: relative}
+    .tbody ul li{height: 96px;font-size: 12px;}
+    .tbody ul{padding: 0 20px;position: relative;height: 96px}
+    .tbodyle ul li:nth-child(2){width: 20%;}
+    .tbody ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(3){ width: 14%}
+    .tbody ul li:last-child{width: 22%}
+    .goods-main .checkbox {overflow: hidden; cursor: pointer;}
+    .tbody .checkbox .box{ display: inline-block; width: 20px;height: 90px;margin-top: 2px;float: left;}
+    .goods-main  .tbody .checkbox span{ display: inline-block;float: left;margin-left: 6px;}
+    .checkbox .icon-weigouxuan:before{ width: 16px;height: 16px; background-position: -332px -32px;}
+    .checkbox .icon-gouxuan:before{width: 16px; height: 16px;background-position: -210px 0px}
+    .goods-main  .tbody .good-info{display: inline-block}
+    .goods-main  .tbody .good-info img{width: 80px;height: 80px;margin-top: 8px}
+    .tbody ul li .good-classFly,.tbody ul li .good-price,.tbody ul li .status{position: relative;top: 50%;left: 50%;transform: translate(-50%, -50%);width: fit-content;}
+    .goods-main  .tbody .good-name{margin-left: 8px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;width: 90px;}
+    .goods-main  .tbody .good-handle{text-align: left;padding: 0 7px;line-height: 35px;position: absolute;width: 180px;top: 0;left: 30px;right: 0;bottom: 0;margin: auto;height: fit-content}
+    .goods-main  .tbody .btn{padding: 0 11px;margin-right: 8px;height: 24px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;display: inline-block;line-height: 24px;color: #e15616;}
+    .goods-container .good-footer{width: 95%;height: 56px;float: left;padding: 20px}
+    .goods-container .good-footer .footer-left{float: left;}
+    .goods-container .good-footer .checkbox {line-height: 70px;}
+    .goods-container .good-footer .checkbox .box{line-height: 74px;float: left;}
+    .goods-container .good-footer .checkbox span{display: inline-block;float: left;margin-left: 10px;}
+    .goods-container .good-footer .footer-right{float: right;margin-top: 20px;}
+    .goods-container .good-footer .footer-right .btn{width: 90px;height: 36px;display: block;line-height: 36px;text-align: center;font-size: 14px;border-radius: 2px;color: #FFF;}
+    .goods-container .good-footer .footer-right .btn.icon-weigouxuan{border: solid 1px #9aa5b5;color: #22272e;opacity: .5;}
+    .goods-container .good-footer .footer-right .btn.icon-gouxuan{background-color: #e15616;}
+    .bg-gouxuan{background-color: #f0f3f7;}
+    .good-price p {display: inline-block}
+    .priceTag{position: absolute;    top: 60px; right: 45px}
+    .pageWrap{width: 968px;margin: auto;padding: 32px 0}
+    .empty{background: #fff;margin-top: 10px;}
+    .navLayout{min-height: auto;}
+    .styleborder{border-top: 1px solid #e2e7ef}
+    .checkbox.checklist{line-height: 90px}
   }
 
 /*移动*/

src/main/resources/static/css/user-center/message.css

@@ -19,11 +19,11 @@ li{list-style:none}
     .content .section .section-top .button{width: 250px;height: 36px;float: right;}
     .content .section .section-top .button .btn{width: 90px;height: 34px;float: right;margin-left: 16px;border-radius: 2px;background-color: #ffe6dc;line-height: 34px;text-align: center;font-size: 14px;color: #E15616;border: solid 1px #e15616;}
     .content .section .section-content{width: 100%;height: auto;float: left;box-sizing: border-box;padding: 10px 0;}
-    .content .section .section-content .new-list{width: 100%;height:80px;float: left;box-sizing: border-box;padding: 20px 0;}
+    .content .section .section-content .new-list{width: 100%;height:80px;float: left;box-sizing: border-box;padding: 15px 0;}
     .content .section .section-content .new-list .text{line-height: 36px;float: left;}
     .content .section .section-content .new-list .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px 15px;line-height: 16px;cursor: pointer;}
-    .content .section .section-content .new-list .text p{width: 700px;line-height: 24px;font-size: 14px;color: #627386;float: left;}
-    .content .section .section-content .new-list .text p .link{color: #E15621;cursor: pointer;}
+    .content .section .section-content .new-list .text p{width: 700px;height: 48px;line-height: 24px;font-size: 14px;color: #627386;float: left;text-overflow: ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;}
+    .content .section .section-content .new-list .text p .link{color: #E15621;cursor: pointer;text-decoration: underline;}
     .content .section .section-content .new-list .text p .link:hover{text-decoration: underline;}
     .content .section .section-content .new-list .time{line-height: 36px;font-size: 14px;color: #b8bfca;float: right;}
     .check{float: left;margin: 4px 15px;}
@@ -34,21 +34,28 @@ li{list-style:none}
 * 移动端
 */
 @media screen and (max-width:768px){
-    .content{width: 100%;background-color: #FFFFFF;box-sizing: border-box;padding:3.3vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);margin:0 0 2.7vw 0;}
-    .content .title{width: 100%;height: 10vw;line-height: 10vw;color: #22272e;font-size: 3.4vw;}
-    .section-top{width: 100%;height: 54px;float: left;box-sizing: border-box;padding: 10px;background: #fff}
+    footer{display: none;}
+    .content{width: 100%;background-color: #FFFFFF;box-sizing: border-box;padding:3.3vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);margin:0 0 2.7vw 0;padding-bottom:10px;}
+    .content .title{width: 100%;height: auto;line-height: 8.4vw;color: #22272e;font-size: 3.4vw;}
+    .content .title .tabs-item.active a{color: #E15616;}
+    .content .title .tabs-item{display:inline-block;height:8.4vw;border:1px solid #b8bfca;line-height:8.4vw;padding:0 3vw;border-radius:4.2vw;margin-right:4vw;margin-bottom: 2vw;}
+    .content .title .tabs-item a{color:#627386}
+    .content .title .tabs-item a span{color:#e15616}
+    .content .title .tabs-item.active{background-color:#ffe6dc;border-color:#e15616;color:#e15616}
+    .header-tabs .tabs-item.active a{color:#e15616}
+    .section-top{width: 100%;height: 54px;box-sizing: border-box;padding: 10px;background: #fff;position: fixed;bottom: 0;left: 0;z-index: 999;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);}
     .section-top .cheacked{width: 100px;height: 36px;float: left;cursor: pointer;}
     .section-top .cheacked .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px 15px}
     .section-top .cheacked span{display: inline-block;line-height: 36px;font-size: 16px;color: #22272e;}
     .section-top .button{height: 36px;float: right;}
-    .section-top .button .btn{width: 90px;height: 34px;float: right;margin-left: 16px;border-radius: 2px;background-color: #ffd8d8;
-    line-height: 34px;text-align: center;font-size: 14px;color: #f94b4b;border: solid 1px #f94b4b;border-radius: 6.4vw}
+    .section-top .button .btn{width: 90px;height: 34px;float: right;margin-left: 16px;border-radius: 2px;background-color: #ffd8d8;line-height: 34px;text-align: center;font-size: 14px;color: #f94b4b;border: solid 1px #f94b4b;border-radius: 6.4vw}
     .section-top .button .btn.Read{border: .27vw solid #1890f9;color: #1890f9;background: #e0f1ff}
     .content .section .section-content{width: 100%;height: auto;float: left;box-sizing: border-box;padding: 10px 0;}
-    .content .section .section-content .new-list{width: 100%;box-sizing: border-box;}
-    .content .section .section-content .new-list .text{line-height: 36px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;word-break: break-all;float: left;}
+    .content .section .section-content .new-list{width: 100%;box-sizing: border-box;float: left;margin-bottom: 4vw;}
+    .content .section .section-content .new-list .text{line-height: 36px;}
     .content .section .section-content .new-list .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px;line-height: 16px;cursor: pointer;}
-    .content .section .section-content .new-list .text p{line-height: 36px;font-size: 3.4vw;color: #627386;float: left;width: 77.6vw;overflow: hidden;word-wrap: normal;vertical-align: middle;text-overflow: ellipsis}
+    .content .section .section-content .new-list .text p{line-height: 6vw;font-size: 3.4vw;color: #627386;float: left;width: 77.6vw;}
+    .content .section .section-content .new-list .text p .link{color: #E15621;cursor: pointer;text-decoration: underline;}
     .content .section .section-content .new-list .time{font-size: 3.1vw;color: #b8bfca;float: left;padding-left: 37px}
     input.check {width: 3.5vw;height: 3.5vw;line-height: 3.5vw;vertical-align: top;margin: 3vw 3vw 1.3vw 3.3vw;float: left;}
     .notclick{pointer-events: none;opacity: .6}

src/main/resources/static/js/base.js

@@ -139,6 +139,14 @@ var globalHead = new Vue({
                 }
             });
         },
+        goMsgLinkFn:function (url) {
+            var _self = this;
+            if(_self.loginStatus){
+                window.location.href= url;
+            }else{
+                window.location.href='/login.html';
+            }
+        },
         goCartsLinkFn:function(){
             var _self = this;
             if(_self.loginStatus){

src/main/resources/static/js/supplier-center/dashboard.js

@@ -193,6 +193,7 @@
         var _this = this;
         if(globalUserData) {
             _this.userId = globalUserData.userId;
+            CAIMEI.Alert('您的供应商账号上架费将于30日后到期，到期后将无法发布和编辑商品，同时也会影响到其他采美提供的支持服务。请联系采美工作人员进行续费，联系电话0755-22907771 或15338851365', '确定', false);
             this.dashboardDataInfo();
         };
     }

src/main/resources/static/js/supplier-center/message.js

@@ -1,8 +1,16 @@
 ;var helpSuggestion = new Vue({
     el: "#dashboard",
+    mixins: [noticeMixin],
     data: {
         btnLoading: false,
         isRequset:false,
+        mssageTabBarIndex:0,
+        mssageTabBar: [
+            {state: 0,text: '全部消息',bages:0},
+            {state: 1,text: '账户通知',bages:0},
+            {state: 2,text: '服务通知',bages:0},
+        ],
+        list:[],
         listQuery:{
             userId: '',
             pageNum:1,
@@ -52,6 +60,28 @@
                 this.pageInput = 1;
             }
         },
+        changeTabsFn:function(index,status){//点击Tab切换消息通知
+            var  _self = this;
+            _self.mssageTabBarIndex = index;
+            _self.listQuery.orderState = status;
+            _self.listQuery.searchNo = '';
+            _self.listQuery.beginTime = '';
+            _self.listQuery.endTime = '';
+            _self.listQuery.pageNum = 1;
+            _self.isRequset = true;
+            switch (index) {
+                case 0:
+                    this.list = this.allNoticeList;
+                    break;
+                case 1:
+                    this.list = this.usersNoticeList;
+                    break;
+                case 2:
+                    this.list = this.serveNoticeList;
+                    break;
+            }
+            _self.isRequset = false;
+        },
         GetMyPcCenterInfo:function(){
             var _self = this;
            SupplierApi.GetMymessageList(_self.listQuery,function (response) {
@@ -155,7 +185,8 @@
     mounted: function () {
         if(globalUserData){
             this.listQuery.userId = globalUserData.userId;
-            this.GetMyPcCenterInfo();
+            this.list = this.allNoticeList;
+            // this.GetMyPcCenterInfo();
         }
          if(!isPC){
             $('footer').addClass("noneImportant");

src/main/resources/static/js/supplier-center/mixins/noticeMixin.js

@@ -0,0 +1,273 @@
+'use strict';
+var noticeMixin = function () {// 通知消息
+    return {
+        data(){
+            return{
+                allNoticeList:[
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:1,
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:2,
+                        wechatName:'@ZJY'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        name:'法诺智能美容工作平台-TM700...',
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:3,
+                        endTime:'7日后'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        name:'法诺智能美容工作平台-TM700...',
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:3,
+                        endTime:'今日'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        name:'法诺智能美容工作平台-TM700...',
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:4,
+                        endTime:'今日'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        name:'法诺智能美容工作平台-TM700...',
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:5,
+                        endtime:'3个月'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        name:'法诺智能美容工作平台-TM700...',
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:5,
+                        endtime:'1个月'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        name:'法诺智能美容工作平台-TM700...',
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:5,
+                        endtime:'7天'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        name:'法诺智能美容工作平台-TM700...',
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:5,
+                        endtime:'今天'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:1,
+                        endTime:'30日后到期'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:1,
+                        endTime:'7日后到期'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:1,
+                        endTime:'今日后到期'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:1,
+                        endTime:'已过期'
+                    }
+                ],
+                usersNoticeList: [
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:1,
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:2,
+                        wechatName:'@ZJY'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        name:'法诺智能美容工作平台-TM700...',
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:3,
+                        endTime:'7日后'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        name:'法诺智能美容工作平台-TM700...',
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:3,
+                        endTime:'今日'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        name:'法诺智能美容工作平台-TM700...',
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:4,
+                        endTime:'今日'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        name:'法诺智能美容工作平台-TM700...',
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:5,
+                        endtime:'3个月'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        name:'法诺智能美容工作平台-TM700...',
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:5,
+                        endtime:'1个月'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        name:'法诺智能美容工作平台-TM700...',
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:5,
+                        endtime:'7天'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:1,
+                        name:'法诺智能美容工作平台-TM700...',
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:5,
+                        endtime:'今天'
+                    },
+                ],
+                serveNoticeList: [
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:1,
+                        endTime:'30日后到期'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:1,
+                        endTime:'7日后到期'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:1,
+                        endTime:'今日后到期'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:1,
+                        endTime:'已过期'
+                    }
+                ],
+            }
+        },
+        computed: {
+
+        },
+        mounted() {
+            var _this = this;
+        },
+        methods: {
+            hanldeNoticeText(cell){ // 根据tab计算返回显示文案
+                const $EventFunction = {
+                    1:this.noticeUsersText(cell),
+                    2:this.noticeServeText(cell),
+                }
+                return $EventFunction[cell.noticeType]
+            },
+            noticeUsersText(cell) { // 账户通知文案
+                const linkMap = {
+                    3:`<span class="link">编辑商品</span>`,
+                    5:`<span class="link">上传</span>`
+                }
+                const map = {
+                    1: '您的注册信息已审核通过，恭喜您成为采美平台供应商用户。您可以上架商品到采美商城进行出售了。',
+                    2: `恭喜您（微信昵称：${cell.wechatName}）成功成为【采美信息技术有限公司】的运营人员。`,
+                    3: `商品”${cell.name}“,上架审核未通过，暂时不能上架采美商城，请重新${linkMap[cell.type]}进行提交。`,
+                    4: `商品”${cell.name}“,新品展示审核未通过，未能展示在采美商城新品橱窗。`,
+                    5: `商品”${cell.name}“,该商品的资质证书将于${cell.endtime}后失效，请及时${linkMap[cell.type]}新证书。`
+                }
+                return map[cell.type]
+            },
+            noticeServeText(cell){//服务通知文案处理
+                const map = {
+                    1: `您的供应商账号上架费将于${cell.endTime}后到期，到期后将无法发布和编辑商品，同时也会影响到其他采美提供的支持服务。请联系采美工作人员进行续费请联系采美工作人员进行续费请联系采美工作人员进行续费，联系电话0755-22907771 或15338851365`
+                }
+                return map[cell.type]
+            },
+            handleClick(cell){
+                console.log('cell',cell.noticeType);
+                let _self = this;
+                switch (cell.noticeType) {
+                    case 1:
+                        _self.handleUsersClick(cell);
+                        break
+                    case 2:
+                        _self.handleServeClick(cell);
+                        break
+                }
+            },
+            handleUsersClick(cell){
+                console.log('账户通知跳转');
+                if(cell.type === 1 || cell.type === 5 || cell.type === 7){
+                    return;
+                }
+                const linkJumpMap = {
+                    2:'/user/member.html',
+                    3:'/user/member.html',
+                    4:'/user/member.html',
+                    6:'/user/setting/upgrade.html',
+                }
+                console.log('url',linkJumpMap[cell.type])
+                window.open(linkJumpMap[cell.type]);
+            },
+            handleServeClick(cell){
+                console.log('服务通知跳转');
+            }
+        }
+    };
+}();

src/main/resources/static/js/user-center/message.js

@@ -13,6 +13,7 @@ var helpSuggestion = new Vue({
             {state: 3,text: '服务通知',bages:0},
             {state: 4,text: '优惠促销',bages:0},
         ],
+        list:[],
         listQuery:{
             userId: '',
             pageNum:1,
@@ -84,6 +85,25 @@ var helpSuggestion = new Vue({
             _self.listQuery.endTime = '';
             _self.listQuery.pageNum = 1;
             _self.isRequset = true;
+            switch (index) {
+                case 0:
+                    this.list = this.orderNoticeList;
+                    break;
+                case 1:
+                    this.list = this.orderNoticeList;
+                    break;
+                case 2:
+                    this.list = this.usersNoticeList;
+                    break;
+                case 3:
+                    this.list = this.orderNoticeList;
+                    break;
+                case 4:
+                    this.list = this.couponNoticeList;
+                    break;
+
+            }
+            _self.isRequset = false;
         },
         GetMyPcMymessageInfo:function(){
             var _self = this;
@@ -191,6 +211,7 @@ var helpSuggestion = new Vue({
         if(globalUserData){
             this.listQuery.userId = globalUserData.userId;
             this.isRequset = false;
+            this.list = this.orderNoticeList;
             // this.GetMyPcMymessageInfo();
         }
         if(!isPC){

src/main/resources/static/js/user-center/mixins/noticeMixin.js

@@ -3,19 +3,33 @@ var noticeMixin = function () {// 通知消息
     return {
         data(){
             return{
-                orderNaticeList: [
+                orderNoticeList: [
                     {
                         addTime: '2022-07-05 16:51:20',
                         content:'',
+                        noticeType:1,
                         image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
                         name:'华熙面膜面膜面膜面膜...',
                         cont:3,
                         orderId: 1234,
+                        onlinePayFlag:1,
                         type:1,
                     },
                     {
                         addTime: '2022-07-05 16:51:20',
                         content:'',
+                        noticeType:1,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        name:'华熙面膜面膜面膜面膜...',
+                        cont:3,
+                        orderId: 1234,
+                        onlinePayFlag:0,
+                        type:1,
+                    },
+                    {
+                        addTime: '2022-07-05 16:51:20',
+                        content:'',
+                        noticeType:1,
                         image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
                         name:'华熙面膜面膜面膜面膜...',
                         cont:3,
@@ -25,6 +39,7 @@ var noticeMixin = function () {// 通知消息
                     {
                         addTime: '2022-07-05 16:51:20',
                         content:'￥100000.00',
+                        noticeType:1,
                         image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
                         name:'华熙面膜面膜面膜面膜...',
                         cont:3,
@@ -36,6 +51,7 @@ var noticeMixin = function () {// 通知消息
                     {
                         addTime: '2022-07-05 16:51:20',
                         content:'￥100000.00',
+                        noticeType:1,
                         image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
                         name:'华熙面膜面膜面膜面膜...',
                         cont:3,
@@ -47,6 +63,7 @@ var noticeMixin = function () {// 通知消息
                     {
                         addTime: '2022-07-05 16:51:20',
                         content:'已成功取消！',
+                        noticeType:1,
                         image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
                         name:'华熙面膜面膜面膜面膜...',
                         cont:3,
@@ -57,6 +74,7 @@ var noticeMixin = function () {// 通知消息
                     {
                         addTime: '2022-07-05 16:51:20',
                         content:'因超时未确认，系统已自动取消订单！',
+                        noticeType:1,
                         image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
                         name:'华熙面膜面膜面膜面膜...',
                         cont:3,
@@ -67,6 +85,7 @@ var noticeMixin = function () {// 通知消息
                     {
                         addTime: '2022-07-05 16:51:20',
                         content:'因超时未付款，系统已自动取消订单！',
+                        noticeType:1,
                         image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
                         name:'华熙面膜面膜面膜面膜...',
                         cont:3,
@@ -77,6 +96,7 @@ var noticeMixin = function () {// 通知消息
                     {
                         addTime: '2022-07-05 16:51:20',
                         content:'',
+                        noticeType:1,
                         image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
                         name:'华熙面膜面膜面膜面膜...',
                         cont:3,
@@ -86,6 +106,7 @@ var noticeMixin = function () {// 通知消息
                     {
                         addTime: '2022-07-05 16:51:20',
                         content:'',
+                        noticeType:1,
                         image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
                         name:'华熙面膜面膜面膜面膜...',
                         cont:3,
@@ -93,24 +114,156 @@ var noticeMixin = function () {// 通知消息
                         orderId: 1234,
                     },
                 ],
-                template:""
+                usersNoticeList: [
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:1,
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:2,
+                        vipTime:'3个月'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:3,
+                        endTime:'7日后'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:3,
+                        endTime:'今日'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:4,
+                        vipTime:'3个月'
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:5
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:6
+                    },
+                    {
+                        time: '2022-07-05 16:51:20',
+                        noticeType:2,
+                        image: 'https://img.caimei365.com/group1/M00/00/1E/rB-lF2JgwhiAWYBKAAE3BA2cBSY917.jpg',
+                        type:7,
+                        wechatName:'@ZJY'
+                    },
+                ],
+                couponNoticeList: [
+                    {
+                        type:1,
+                        noticeType:4,
+                        couponType:0,
+                        couponAmount:'50000.00',
+                        time: '2022-07-05 16:51:20',
+                    },
+                    {
+                        type:1,
+                        noticeType:4,
+                        couponType:1,
+                        categoryType:1,
+                        couponAmount:'50000.00',
+                        time: '2022-07-05 16:51:20',
+                    },
+                    {
+                        type:1,
+                        noticeType:4,
+                        couponType:1,
+                        categoryType:2,
+                        couponAmount:'50000.00',
+                        time: '2022-07-05 16:51:20',
+                    },
+                    {
+                        type:1,
+                        noticeType:4,
+                        couponType:2,
+                        couponAmount:'50000.00',
+                        time: '2022-07-05 16:51:20',
+                    },
+                    {
+                        type:1,
+                        noticeType:4,
+                        couponType:3,
+                        shopName:'采美信息技术有限公司',
+                        couponAmount:'50000.00',
+                        time: '2022-07-05 16:51:20',
+                    },
+                    {
+                        type:1,
+                        noticeType:4,
+                        couponType:4,
+                        couponAmount:'50000.00',
+                        time: '2022-07-05 16:51:20',
+                    },
+                    {
+                        type:2,
+                        noticeType:4,
+                        couponType:4,
+                        couponAmount:'50000.00',
+                        endTime:"3天",
+                        time: '2022-07-05 16:51:20',
+                    },
+                    {
+                        type:3,
+                        noticeType:4,
+                        couponAmount:'50000.00',
+                        endTime:"7天后",
+                        time: '2022-07-05 16:51:20',
+                    },
+                    {
+                        type:3,
+                        noticeType:4,
+                        couponAmount:'50000.00',
+                        endTime:"今日即将",
+                        time: '2022-07-05 16:51:20',
+                    },
+                ],
             }
+        },
+        computed: {
+
         },
         mounted() {
             var _this = this;
-            window.handleClick = function (cell) {
-                _this.handleClick(cell);
-            };
         },
         methods: {
+            hanldeNoticeText(cell){ // 根据tab计算返回显示文案
+                const $EventFunction = {
+                    1:this.noticeOrderText(cell),
+                    2:this.noticeUsersText(cell),
+                    3:this.noticeServeText(cell),
+                    4:this.noticeCouponText(cell)
+                }
+                return $EventFunction[cell.noticeType]
+            },
             noticeOrderText(cell) { // 交易物流通知文案
                 const linkMap = {
-                        1:`<span onclick="handleClick(cell)" class="link">去支付</span>`,
-                        2:`<span onclick="handleClick(cell)" class="link">查看订单</span>`,
-                        3:`<span onclick="handleClick(cell)" class="link">查看订单</span>`,
-                        4:`<span onclick="handleClick(cell)" class="link">查看订单</span>`,
-                        5:`<span onclick="handleClick(cell)" class="link">查看物流</span>`,
-                        6:`<span onclick="handleClick(cell)" class="link">查看订单</span>`
+                        1:`<span class="link">去支付</span>`,
+                        2:`<span class="link">查看订单</span>`,
+                        3:`<span class="link">查看订单</span>`,
+                        4:`<span class="link">查看订单</span>`,
+                        5:`<span class="link">查看物流</span>`,
+                        6:`<span class="link">查看订单</span>`
                 }
                 const map = {
                     1: `您已成功下单"${cell.name}"等${cell.cont}件商品，订单等待支付，点击${linkMap[cell.type]}进行付款，支付完成后采美将尽快安排发货。`,
@@ -123,43 +276,107 @@ var noticeMixin = function () {// 通知消息
                 return map[cell.type]
             },
             noticeUsersText(cell) { // 账户通知文案
+                const linkMap = {
+                    2:`<span class="link">会员中心</span>`,
+                    3:`<span class="link">会员中心</span>`,
+                    4:`<span class="link">会员中心</span>`,
+                    6:`<span class="link">修改资料</span>`
+                }
                 const map = {
                     1: '欢迎成为采美机构用户，祝您开启愉快的采购之旅。',
-                    2: `您已成功购买${cell.vipTime}采美平台超级会员服务，在服务期内每月可领多张大额优惠券，还有更多超级会员专属权益等您体验，快去看看吧 >>>`,
-                    3: `您的超级会员服务将于${cell.endTime}到期，到期后将无法享受专属会员权益，赶快去续费吧 >>>`,
-                    4: `您已获得采美平台赠送的${cell.vipTime}超级会员，在服务期内每月可领多张大额优惠券，还有更多超级会员专属权益等您体验，快去看看吧 >>>`,
+                    2: `您已成功购买${cell.vipTime}采美平台超级会员服务，在服务期内每月可领多张大额优惠券，还有更多超级会员专属权益等您体验，点击${linkMap[cell.type]}去体验吧。`,
+                    3: `您的超级会员服务将于${cell.endTime}到期，到期后将无法享受专属会员权益，赶快去${linkMap[cell.type]}续费吧 。`,
+                    4: `您已获得采美平台赠送的${cell.vipTime}超级会员，在服务期内每月可领多张大额优惠券，还有更多超级会员专属权益等您体验，点击${linkMap[cell.type]}去体验吧。`,
                     5: '恭喜您成功升级为资质机构用户！现在可以查看更多商品的信息啦，采美平台也将为您提供更多专业服务。',
-                    6: '您的账号升级资质机构失败！赶快去修改资料重新提交吧 >>>',
+                    6: `您的账号升级资质机构失败！点击${linkMap[cell.type]}重新提交吧。`,
                     7: `恭喜您（微信昵称：${cell.wechatName}）成功成为机构运营人员，祝您开启愉快的采购之旅。`
                 }
                 return map[cell.type]
             },
             noticeCouponText(cell) { // 优惠促销通知文案
+                const linkMap = {
+                    1:`<span class="link">领券中心</span>`,
+                    2:`<span class="link">领券中心</span>`,
+                    3:`<span class="link">优惠券中心</span>`,
+                }
                 const copunMap = {
-                    0: `采美平台送您${cell.couponAmount}元优惠券，众多大牌正品等着您，赶快去领取下单吧 >>>`,
-                    1: `采美平台${cell.categoryType == 1 ? '产品' : '仪器'}类商品大优惠，特送您${cell.couponAmount}元优惠券，赶快去领取下单吧 >>>`,
-                    2: `为了答谢您对采美平台的支持，采美送您${cell.couponAmount}元优惠券，赶快去领取下单吧 >>>`,
-                    3: `【${cell.shopName}】赠送您${cell.couponAmount}元的店铺专属优惠券，众多火爆商品等您来！赶快去领取下单吧 >>>`,
-                    4: `恭喜成功注册采美平台，现赠送您${cell.couponAmount}元新用户优惠券，赶快去领取下单吧 >>>`,
+                    0: `采美平台送您${cell.couponAmount}元优惠券，众多大牌正品等着您，赶快去${linkMap[cell.type]}领取下单吧。`,
+                    1: `采美平台${cell.categoryType == 1 ? '产品' : '仪器'}类商品大优惠，特送您${cell.couponAmount}元优惠券，赶快去${linkMap[cell.type]}领取下单吧。`,
+                    2: `为了答谢您对采美平台的支持，采美送您${cell.couponAmount}元优惠券，赶快去${linkMap[cell.type]}领取下单吧。`,
+                    3: `【${cell.shopName}】赠送您${cell.couponAmount}元的店铺专属优惠券，众多火爆商品等您来！赶快去${linkMap[cell.type]}领取下单吧。>`,
+                    4: `恭喜成功注册采美平台，现赠送您${cell.couponAmount}元新用户优惠券，赶快去${linkMap[cell.type]}领取下单吧。`,
                 }
                 const map = {
                     1: copunMap[cell.couponType],
-                    2: `您有${cell.couponAmount}元优惠券尚未领取，优惠券将于${cell.endTime}后下架，赶快去领取下单吧 >>>`,
-                    3: `您有${cell.couponAmount}元优惠券将于${cell.endTime}过期，赶快去查看使用吧 >>>`,
+                    2: `您有${cell.couponAmount}元优惠券尚未领取，优惠券将于${cell.endTime}后下架，赶快去${linkMap[cell.type]}领取下单吧0`,
+                    3: `您有${cell.couponAmount}元优惠券将于${cell.endTime}过期，赶快去${linkMap[cell.type]}查看使用吧。`,
                 }
                 return map[cell.type]
             },
+            noticeServeText(cell){//服务通知文案处理
+                console.log('服务通知文案处理');
+            },
             handleClick(cell){
-                console.log('cell',cell)
-                switch (cell.type) {
+                console.log('cell',cell.noticeType);
+                let _self = this;
+                switch (cell.noticeType) {
                     case 1:
-                        if(cell.onlinePayFlag == 1){
-                            window.location.href = '/pay/caimei-payunder.html?orderId='+cell.orderId;
-                        }else{
-                            window.location.href = '/pay/caimei-paylist.html?orderId='+cell.orderId;
-                        }
+                        _self.handleOrderClick(cell);
+                        break
+                    case 2:
+                        _self.handleUsersClick(cell);
+                        break
+                    case 3:
+                        _self.handleServeClick(cell);
+                        break
+                    case 4:
+                        _self.handleCouponClick(cell);
+                        break
                 }
-            }
+            },
+            handleOrderClick(cell){
+                const payLinkMap = {
+                    0:'/pay/caimei-paylist.html?orderId='+cell.orderId,
+                    1:'/pay/caimei-payunder.html?orderId='+cell.orderId,
+                }
+                const linkJumpMap = {
+                    1:payLinkMap[cell.onlinePayFlag],
+                    2:'/user/order/detail.html?orderId='+cell.orderId,
+                    3:'/user/order/detail.html?orderId='+cell.orderId,
+                    4:'/user/order/detail.html?orderId='+cell.orderId,
+                    5:'/user/order/logistics.html?orderId='+cell.orderId,
+                    6:'/user/order/detail.html?orderId='+cell.orderId
+                }
+                console.log('url',linkJumpMap[cell.type])
+                window.open(linkJumpMap[cell.type]);
+            },
+            handleUsersClick(cell){
+                console.log('账户通知跳转');
+                if(cell.type === 1 || cell.type === 5 || cell.type === 7){
+                    return;
+                }
+                const linkJumpMap = {
+                    2:'/user/member.html',
+                    3:'/user/member.html',
+                    4:'/user/member.html',
+                    6:'/user/setting/upgrade.html',
+                }
+                console.log('url',linkJumpMap[cell.type])
+                window.open(linkJumpMap[cell.type]);
+            },
+            handleServeClick(cell){
+                console.log('服务通知跳转');
+            },
+            handleCouponClick(cell){
+                console.log('优惠促销通知跳转');
+                const linkJumpMap = {
+                    1:`/user/coupon-collection.html`,
+                    2:`/user/coupon-collection.html`,
+                    3:`/user/coupon.html`,
+                }
+                console.log('url',linkJumpMap[cell.type])
+                window.open(linkJumpMap[cell.type]);
+            },
         }
     };
 }();

src/main/resources/templates/components/header.html

@@ -6,7 +6,8 @@
             <div class="header_top_left"></div>
             <ul class="header_top_ul" >
                 <li class="headmsg">
-                    <a href="/user/message/list.html" class="WEB-icon msg-btn">消息<em v-text="'('+headCart.cartCount+')'"></em></a>
+                    <a v-if="userIdentity===3" @click="goMsgLinkFn('/supplier/message/list.html')" href="javascript:void(0)" class="WEB-icon msg-btn">消息<em v-text="'('+headCart.cartCount+')'"></em></a>
+                    <a v-else  @click="goMsgLinkFn('/user/message/list.html')" href="javascript:void(0)" class="WEB-icon msg-btn">消息<em v-text="'('+headCart.cartCount+')'"></em></a>
                 </li>
                 <li class="headCart">
                     <a v-if="userIdentity!=3" href="javascript:void(0)" class="addBtn icon" @click="goCartsLinkFn" onclick="_czc.push(['_trackEvent','顶部导航','购物车','点击','','Um_Event_Cart'])">购物车<em v-text="'('+headCart.cartCount+')'"></em></a>

src/main/resources/templates/supplier-center/dashboard.html

@@ -63,12 +63,6 @@
                         <span class="perfect" v-if="homeData.dataIntegrity!='100%'" @click="perfect">立即完善</span>
                         <span class="ziliao">资料完整度：<span>{{homeData.dataIntegrity}}</span></span>
                     </div>
-                    <div class="message">
-                      <a href="/supplier/message/list.html">
-                        <span class="msg_num" v-if="msgFlag">{{homeData.unReadMessageCount}}</span>
-                        <span class="icon mIcon msg"></span>
-                        </a>
-                    </div>
                 </div>
                 <div class="product">
                     <p>商品数据</p>

src/main/resources/templates/supplier-center/message/list.html

@@ -25,7 +25,11 @@
             <template th:replace="supplier-center/components/tableft"></template>
             <div class="right">
                 <div class="content clear">
-                    <div class="title">所有消息</div>
+                    <div class="title">
+                        <div class="tabs-item"  v-for="(item, index) in mssageTabBar" :key="index" @click="changeTabsFn(index,item.state)" :class="mssageTabBarIndex == index ? 'active':''">
+                            <a href="javascript: void(0);">{{item.text}}<span v-if="index!=0">({{item.bages | NumBadge}})</span></a>
+                        </div>
+                    </div>
                     <div class="section">
                         <div class="section-top" v-if="isPC">
                             <div class="cheacked">
@@ -37,13 +41,13 @@
                                 <a href="javascript:void(0);" class="btn" @click="signMessageFn">标为已读</a>
                             </div>
                         </div>
-                        <div class="section-content" v-if="messagesList.length > 0">
-                            <div class="new-list" v-for="(item, index) in messagesList" :key="index" :class="item.readFlag==1?'notclick':''">
+                        <div class="section-content" v-if="list.length > 0">
+                            <div class="new-list" v-for="(item, index) in list" @click="handleClick(item)" :key="index" :class="item.readFlag==1?'notclick':''">
                                 <div class="text">
-                                 <input type="checkbox"  class="check" v-model="item.check" @change="checkedItemFn(item)" />
-                                    <p>{{item.content}}</p>
+                                    <input type="checkbox"  class="check" v-model="item.check" @change="checkedItemFn(item)" />
+                                    <p v-html="hanldeNoticeText(item)"></p>
                                 </div>
-                                <div class="time">{{item.addTime}}</div>
+                                <div class="time">{{item.time}}</div>
                             </div>
                         </div>
                         <div v-else class="empty">
@@ -76,6 +80,7 @@
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/mixins/noticeMixin.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/message.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/supplier-center/shop/goods.html

@@ -108,6 +108,12 @@
                             <li>新品展示</li>
                             <li>操作</li>
                         </ul>
+                        <div class="goods-tips">
+                            <div class="end-tips">
+                                <span class="WEB-icon tips"></span>
+                                <span>您的上架费已到期，已禁止商品的所有操作，支付账户上架费后才能继续操作。</span>
+                            </div>
+                        </div>
                         <div class="tbody">
                             <ul v-for="(product, index) in productsList" :key="index"
                                 :class="[product.isChecked ?'bg-gouxuan':'']">

src/main/resources/templates/user-center/message/list.html

@@ -44,13 +44,13 @@
                                 <a href="javascript:void(0);" class="btn" @click="signMessageFn">标为已读</a>
                             </div>
                         </div>
-                        <div class="section-content" v-if="orderNaticeList.length > 0">
-                            <div class="new-list" v-for="(item, index) in orderNaticeList" :key="index" :class="item.readFlag==1?'notclick':''">
+                        <div class="section-content" v-if="list.length > 0">
+                            <div class="new-list" v-for="(item, index) in list" @click="handleClick(item)" :key="index" :class="item.readFlag==1?'notclick':''">
                                 <div class="text">
                                     <input type="checkbox"  class="check" v-model="item.check" @change="checkedItemFn(item)" />
-                                    <p v-html="noticeOrderText(item)"></p>
+                                    <p v-html="hanldeNoticeText(item)"></p>
                                 </div>
-                                <div class="time">{{item.addTime}}</div>
+                                <div class="time">{{item.time}}</div>
                             </div>
                         </div>
                         <div v-else class="empty">