updated:短信推送

src/main/resources/static/css/encyclopedia/common.css

@@ -1,116 +1,118 @@
-html{font-size:16px;font-family:'Microsoft YaHei',SimSun,Arial,Helvetica,sans-serif;color:#333333}
-h1,h2,h3,h4,h5,h6{margin:0}
-p{margin:0}
-ul{margin:0;padding:0}
-ul li{margin:0;list-style-type:none}
-a{text-decoration:none}
-input{outline:none}
-.bk-mask{position:fixed;width:100vw;height:100vh;left:0;top:0;background:rgba(0,0,0,.6);z-index:90}
-.hidden{width:100vw;overflow:hidden}
-.jconfirm-content{overflow: hidden !important;}
-
-@media screen and (min-width:768px){.only-mobile{display:none !important}
-    ::-webkit-scrollbar{width:8px;height:8px;background-color:#f5f5f5}
-    ::-webkit-scrollbar-thumb{background-color:#aaa;border-radius:4px}
-    body{min-width:1200px}
-    header{position:sticky;top:0;z-index:99;background:#fff}
-    main{min-height:calc(100vh - 144px - 140px)}
-    .bk-container{width:1200px;margin:0 auto}
-    .bk-header{padding:26px 0 16px}
-    .bk-header .bk-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
-    .bk-header .bk-logo{-webkit-transform:translateY(-8px);-ms-transform:translateY(-8px);transform:translateY(-8px)}
-    .bk-header .bk-logo h1{font-size:0;text-indent:-99999px}
-    .bk-header .bk-logo img{display:block;width:200px;height:56px}
-    .bk-header .bk-search-container{width:640px}
-    .bk-header .bk-search-container .bk-search-control{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
-    .bk-header .bk-search-container .bk-search-control input{display:block;width:560px;height:36px;line-height:34px;-webkit-box-sizing:border-box;box-sizing:border-box;border:1px solid #F57C40;border-right:0;border-radius:2px 0 0 2px;font-size:14px;padding-left:16px}
-    .bk-header .bk-search-container .bk-search-control input::-webkit-input-placeholder{font-size:14px;color:#B2B2B2}
-    .bk-header .bk-search-container .bk-search-control input::-moz-placeholder{font-size:14px;color:#B2B2B2}
-    .bk-header .bk-search-container .bk-search-control input:-ms-input-placeholder{font-size:14px;color:#B2B2B2}
-    .bk-header .bk-search-container .bk-search-control input::-ms-input-placeholder{font-size:14px;color:#B2B2B2}
-    .bk-header .bk-search-container .bk-search-control input::placeholder{font-size:14px;color:#B2B2B2}
-    .bk-header .bk-search-container .bk-search-control button{display:block;width:80px;height:36px;line-height:36px;background:#FF5B00;border:0;border-radius:0 2px 2px 0;font-size:14px;color:#fff;text-align:center;cursor:pointer}
-    .bk-header .bk-search-container .bk-hot-keyword{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:6px}
-    .bk-header .bk-search-container .bk-hot-keyword li{font-size:12px;color:#B2B2B2}
-    .bk-header .bk-search-container .bk-hot-keyword li a{color:#B2B2B2;-webkit-transition:color .4s;-o-transition:color .4s;transition:color .4s}
-    .bk-header .bk-search-container .bk-hot-keyword li::after{content:"/";display:inline;margin:0 6px}
-    .bk-header .bk-search-container .bk-hot-keyword li:last-child::after{display:none}
-    .bk-header .bk-search-container .bk-hot-keyword li a:hover{color:#FF5B00}
-    .bk-nav{background:#F57C40}
-    .bk-nav .bk-navbar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
-    .bk-nav .bk-navbar li.active a{background:#FF5B00;color:#fff}
-    .bk-nav .bk-navbar li a{display:block;line-height:46px;padding:0 32px;color:#fff;font-size:16px;-webkit-transition:background .4s;-o-transition:background .4s;transition:background .4s}
-    .bk-nav .bk-navbar li a:hover{background:#FF5B00}
-    .bk-footer{background:#2C3038;height:140px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
-    .bk-footer h2{font-size:14px;color:#FFFFFF;font-weight:normal}
-    .bk-footer h2 a{color:#FFFFFF}
-    .bk-footer .beian{font-size:12px;color:#eee;margin-top:25px;font-weight:lighter}
-    .bk-footer .beian a{color:#eee}
-    .bk-footer .beian span{margin:0 4px}
-    .bk-footer .beian i{display:inline-block;width:16px;height:16px;vertical-align:-3px;font-size:0;background:url("/img/base/icon-icp@2x.png") no-repeat center;background-size:16px}
-    .bk-footer .copyright{font-size:12px;color:#eee;margin-top:16px;font-weight:lighter}
-    .bk-publish{position:fixed;width:86px;height:190px;background:url("/img/encyclopedia/assets/pc-icon-publish.png") no-repeat center;background-size:86px;right:80px;bottom:120px;cursor:pointer;z-index:30}
-    .bk-login{position:fixed;z-index:120;left:0;top:0;width:100vw;height:100vh;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
-    .bk-login .mask{position:absolute;left:0;top:0;width:100vw;height:100vh;background:rgba(0,0,0,.6);z-index:10}
-    .bk-login .bk-login-container{position:relative;z-index:20;width:540px;height:470px;background:#fff;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 70px}
-    .bk-login .bk-login-container .bk-tip{font-size:14px;color:#22272E;margin:56px 0 9px}
-    .bk-login .bk-login-container .bk-name{font-size:24px;color:#F57C40;margin-bottom:40px}
-    .bk-login .bk-login-container .bk-input{margin:20px 0}
-    .bk-login .bk-login-container .bk-input input{display:block;border:1px solid #E2E2E2;-webkit-box-sizing:border-box;box-sizing:border-box;width:100%;height:44px;line-height:42px;padding-left:16px;font-size:14px}
-    .bk-login .bk-login-container button{background:#F57C40;display:block;width:100%;height:44px;line-height:44px;text-align:center;border:0;color:#fff;font-size:14px;cursor:pointer;border-radius:2px}
-    .bk-login .bk-login-container .bk-tools{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:8px}
-    .bk-login .bk-login-container .bk-tools a{font-size:14px}
-    .bk-login .bk-login-container .bk-tools a:first-child{color:#F57C40}
-    .bk-login .bk-login-container .bk-tools a:last-child{color:#4A4F58}
-    .bk-login .bk-login-container .bk-agreement{position:absolute;bottom:44px;left:50%;-webkit-transform:translateX(-50%);-ms-transform:translateX(-50%);transform:translateX(-50%);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
-    .bk-login .bk-login-container .bk-agreement span{font-size:14px;color:#F57C40;margin-left:4px}
-    .bk-login .bk-login-container .bk-agreement span a{color:#F57C40}
-    .bk-login .bk-login-container .bk-agreement input{display:none}
-    .bk-login .bk-login-container .bk-agreement input:checked ~ label::before{display:block}
-    .bk-login .bk-login-container .bk-agreement label{position:relative;display:block;width:16px;height:16px;border:1px solid #F57C40;-webkit-box-sizing:border-box;box-sizing:border-box;border-radius:50%;cursor:pointer}
-    .bk-login .bk-login-container .bk-agreement label::before{position:absolute;content:"";display:none;width:8px;height:8px;background:#F57C40;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);border-radius:50%}
-    .bk-login .bk-login-container .verify-wrap{margin:32px 0 16px}
-    .bk-login button.bk-disabled{background: #999;}
-}
-
-@media screen and (max-width:768px){.only-pc{display:none !important}
-    html{font-size:100px}
-    body{font-size:0.26rem}
-    ::-webkit-scrollbar{width:0.08rem;height:0.08rem;background-color:#f5f5f5}
-    ::-webkit-scrollbar-thumb{background-color:#aaa;border-radius:0.04rem}
-    header{position:sticky;top:0;z-index:99}
-    main{min-height:calc(100vh - 1.04rem - 4rem)}
-    .bk-header{position:relative;height:1.04rem;background:#fff}
-    .bk-header .bk-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding-right:0.32rem}
-    .bk-header .bk-logo{width:2rem;height:1.04rem;background:#F57C40;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
-    .bk-header .bk-logo h1{font-size:0;text-indent:-99999px}
-    .bk-header .bk-logo img{display:block;width:1.6rem;height:0.64rem}
-    .bk-header .bk-menu{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-column-gap:0.16rem;-moz-column-gap:0.16rem;column-gap:0.16rem}
-    .bk-header .bk-menu .bk-search-btn{display:block;width:0.56rem;height:0.56rem;background:#FFF1EB url("/img/encyclopedia/assets/h5-icon-search.png") no-repeat center;border-radius:50%;background-size:0.32rem}
-    .bk-header .bk-menu .bk-menu-name{font-size:0.32rem;color:#F57C40}
-    .bk-header .bk-menu .bk-collapse-btn{display:block;width:0.48rem;height:0.48rem;background:url("/img/encyclopedia/assets/h5-icon-collapse.png") no-repeat center;background-size:0.48rem}
-    .bk-header .bk-menu.active .bk-collapse-btn{background-image:url("/img/encyclopedia/assets/h5-icon-close-hover.png")}
-    .bk-header .bk-search-container{position:absolute;left:0;top:1.04rem;background:#fff;width:100%;display:none}
-    .bk-header .bk-search-container .bk-search-menu{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding:0.68rem 0.32rem 0.4rem;background:-webkit-gradient(linear,left top,left bottom,from(rgba(0,0,0,.15)),color-stop(46%,#fff));background:-o-linear-gradient(top,rgba(0,0,0,.15) 0%,#fff 46%);background:linear-gradient(180deg,rgba(0,0,0,.15) 0%,#fff 46%)}
-    .bk-header .bk-search-container .bk-search-menu .bk-name{font-size:0.36rem;color:#333333;font-weight:bold}
-    .bk-header .bk-search-container .bk-search-menu .bk-search-close{display:block;width:0.48rem;height:0.48rem;background:url("/img/encyclopedia/assets/h5-icon-close.png") no-repeat center;background-size:0.48rem}
-    .bk-header .bk-search-container .bk-search-menu .bk-search-close:hover{background-image:url("/img/encyclopedia/assets/h5-icon-close-hover.png")}
-    .bk-header .bk-search-container .bk-search-control{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding:0 0.32rem}
-    .bk-header .bk-search-container .bk-search-control input{display:block;width:5.56rem;height:0.8rem;background:#F7F7F7;line-height:0.8rem;font-size:0.24rem;padding:0 0.24rem;border:0;-webkit-box-sizing:border-box;box-sizing:border-box;border-radius:0.08rem 0 0 0.08rem}
-    .bk-header .bk-search-container .bk-search-control button{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:1.3rem;height:0.8rem;background:#F57C40;color:#fff;font-size:0.28rem;border:0;border-radius:0 0.08rem 0.08rem 0}
-    .bk-header .bk-search-container .bk-search-control button::before{content:"";width:0.32rem;height:0.32rem;display:block;background:url("/img/encyclopedia/assets/h5-icon-search2.png") no-repeat center;background-size:0.32rem;margin-right:0.08rem}
-    .bk-header .bk-search-container .bk-hot-keyword{display:-webkit-box;display:-ms-flexbox;display:flex;gap:0.16rem;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:0.4rem 0.32rem 0.64rem}
-    .bk-header .bk-search-container .bk-hot-keyword li a{display:block;line-height:0.48rem;height:0.48rem;padding:0 0.18rem;background:#F7F7F7;color:#999999;font-size:0.24rem;border-radius:0.08rem}
-    .bk-nav{position:absolute;width:100vw;right:0;top:1.04rem;display:none}
-    .bk-nav .bk-navbar{padding-top:0.48rem;background:#fff;margin-left:1.34rem;-webkit-box-sizing:border-box;box-sizing:border-box;height:calc(100vh - 1.04rem)}
-    .bk-nav .bk-navbar li{border-bottom:0.01rem solid #D8D8D8}
-    .bk-nav .bk-navbar li a{display:block;color:#333;font-size:0.28rem;line-height:1rem;padding-left:0.48rem}
-    .bk-footer{background:#2C3038;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0 0.5rem 0.4rem;text-align:center;height:4rem;-webkit-box-sizing:border-box;box-sizing:border-box}
-    .bk-footer h2{font-size:0.26rem;color:#FFFFFF;font-weight:normal;padding:0.56rem 0 0.4rem}
-    .bk-footer h2 a{color:#FFFFFF}
-    .bk-footer .beian{font-size:0.24rem;color:#e1e1e1;font-weight:lighter;line-height:0.48rem}
-    .bk-footer .beian a{color:#e1e1e1}
-    .bk-footer .beian span{margin:0 4px}
-    .bk-footer .beian i{display:inline-block;width:16px;height:16px;vertical-align:-3px;font-size:0;background:url("/img/base/icon-icp@2x.png") no-repeat center;background-size:16px}
-    .bk-footer .copyright{font-size:12px;color:#e1e1e1;font-weight:lighter;line-height:0.48rem}
-}
+html{font-size:16px;font-family:'Microsoft YaHei',SimSun,Arial,Helvetica,sans-serif;color:#333333}
+h1,h2,h3,h4,h5,h6{margin:0}
+p{margin:0}
+ul{margin:0;padding:0}
+ul li{margin:0;list-style-type:none}
+a{text-decoration:none}
+input{outline:none}
+.bk-mask{position:fixed;width:100vw;height:100vh;left:0;top:0;background:rgba(0,0,0,.6);z-index:90}
+.hidden{width:100vw;overflow:hidden}
+.jconfirm-content{overflow: hidden !important;}
+
+@media screen and (min-width:768px){.only-mobile{display:none !important}
+    ::-webkit-scrollbar{width:8px;height:8px;background-color:#f5f5f5}
+    ::-webkit-scrollbar-thumb{background-color:#aaa;border-radius:4px}
+    body{min-width:1200px}
+    header{position:sticky;top:0;z-index:99;background:#fff}
+    main{min-height:calc(100vh - 144px - 140px)}
+    .bk-container{width:1200px;margin:0 auto}
+    .bk-header{padding:26px 0 16px}
+    .bk-header .bk-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+    .bk-header .bk-logo{-webkit-transform:translateY(-8px);-ms-transform:translateY(-8px);transform:translateY(-8px)}
+    .bk-header .bk-logo h1{font-size:0;text-indent:-99999px}
+    .bk-header .bk-logo img{display:block;width:200px;height:56px}
+    .bk-header .bk-search-container{width:640px}
+    .bk-header .bk-search-container .bk-search-control{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+    .bk-header .bk-search-container .bk-search-control input{display:block;width:560px;height:36px;line-height:34px;-webkit-box-sizing:border-box;box-sizing:border-box;border:1px solid #F57C40;border-right:0;border-radius:2px 0 0 2px;font-size:14px;padding-left:16px}
+    .bk-header .bk-search-container .bk-search-control input::-webkit-input-placeholder{font-size:14px;color:#B2B2B2}
+    .bk-header .bk-search-container .bk-search-control input::-moz-placeholder{font-size:14px;color:#B2B2B2}
+    .bk-header .bk-search-container .bk-search-control input:-ms-input-placeholder{font-size:14px;color:#B2B2B2}
+    .bk-header .bk-search-container .bk-search-control input::-ms-input-placeholder{font-size:14px;color:#B2B2B2}
+    .bk-header .bk-search-container .bk-search-control input::placeholder{font-size:14px;color:#B2B2B2}
+    .bk-header .bk-search-container .bk-search-control button{display:block;width:80px;height:36px;line-height:36px;background:#FF5B00;border:0;border-radius:0 2px 2px 0;font-size:14px;color:#fff;text-align:center;cursor:pointer}
+    .bk-header .bk-search-container .bk-hot-keyword{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:6px}
+    .bk-header .bk-search-container .bk-hot-keyword li{font-size:12px;color:#B2B2B2}
+    .bk-header .bk-search-container .bk-hot-keyword li a{color:#B2B2B2;-webkit-transition:color .4s;-o-transition:color .4s;transition:color .4s}
+    .bk-header .bk-search-container .bk-hot-keyword li::after{content:"/";display:inline;margin:0 6px}
+    .bk-header .bk-search-container .bk-hot-keyword li:last-child::after{display:none}
+    .bk-header .bk-search-container .bk-hot-keyword li a:hover{color:#FF5B00}
+    .bk-nav{background:#F57C40}
+    .bk-nav .bk-navbar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+    .bk-nav .bk-navbar li.active a{background:#FF5B00;color:#fff}
+    .bk-nav .bk-navbar li a{display:block;line-height:46px;padding:0 32px;color:#fff;font-size:16px;-webkit-transition:background .4s;-o-transition:background .4s;transition:background .4s}
+    .bk-nav .bk-navbar li a:hover{background:#FF5B00}
+    .bk-footer{background:#2C3038;height:140px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+    .bk-footer h2{font-size:14px;color:#FFFFFF;font-weight:normal}
+    .bk-footer h2 a{color:#FFFFFF}
+    .bk-footer .beian{font-size:12px;color:#eee;margin-top:25px;font-weight:lighter}
+    .bk-footer .beian a{color:#eee}
+    .bk-footer .beian span{margin:0 4px}
+    .bk-footer .beian i{display:inline-block;width:16px;height:16px;vertical-align:-3px;font-size:0;background:url("/img/base/icon-icp@2x.png") no-repeat center;background-size:16px}
+    .bk-footer .copyright{font-size:12px;color:#eee;margin-top:16px;font-weight:lighter}
+    .bk-publish{position:fixed;width:86px;height:190px;background:url("/img/encyclopedia/assets/pc-icon-publish.png") no-repeat center;background-size:86px;right:80px;bottom:120px;cursor:pointer;z-index:30}
+    .bk-login{position:fixed;z-index:120;left:0;top:0;width:100vw;height:100vh;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+    .bk-login .mask{position:absolute;left:0;top:0;width:100vw;height:100vh;background:rgba(0,0,0,.6);z-index:10}
+    .bk-login .bk-login-container{position:relative;z-index:20;width:540px;height:470px;background:#fff;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 70px}
+    .bk-login .bk-login-container .bk-tip{font-size:14px;color:#22272E;margin:56px 0 9px}
+    .bk-login .bk-login-container .bk-name{font-size:24px;color:#F57C40;margin-bottom:40px}
+    .bk-login .bk-login-container .bk-input{margin:20px 0}
+    .bk-login .bk-login-container .bk-input input{display:block;border:1px solid #E2E2E2;-webkit-box-sizing:border-box;box-sizing:border-box;width:100%;height:44px;line-height:42px;padding-left:16px;font-size:14px}
+    .bk-login .bk-login-container button{background:#F57C40;display:block;width:100%;height:44px;line-height:44px;text-align:center;border:0;color:#fff;font-size:14px;cursor:pointer;border-radius:2px}
+    .bk-login .bk-login-container .bk-tools{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-top:8px}
+    .bk-login .bk-login-container .bk-tools a{font-size:14px}
+    .bk-login .bk-login-container .bk-tools a:first-child{color:#F57C40}
+    .bk-login .bk-login-container .bk-tools a:last-child{color:#4A4F58}
+    .bk-login .bk-login-container .bk-agreement{position:absolute;bottom:44px;left:50%;-webkit-transform:translateX(-50%);-ms-transform:translateX(-50%);transform:translateX(-50%);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+    .bk-login .bk-login-container .bk-agreement span{font-size:14px;color:#F57C40;margin-left:4px}
+    .bk-login .bk-login-container .bk-agreement span a{color:#F57C40}
+    .bk-login .bk-login-container .bk-agreement input{display:none}
+    .bk-login .bk-login-container .bk-agreement input:checked ~ label::before{display:block}
+    .bk-login .bk-login-container .bk-agreement label{position:relative;display:block;width:16px;height:16px;border:1px solid #F57C40;-webkit-box-sizing:border-box;box-sizing:border-box;border-radius:50%;cursor:pointer}
+    .bk-login .bk-login-container .bk-agreement label::before{position:absolute;content:"";display:none;width:8px;height:8px;background:#F57C40;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);border-radius:50%}
+    .bk-login .bk-login-container .verify-wrap{margin:32px 0 16px}
+    .bk-login button.bk-disabled{background: #999;}
+    .nav-link {width: 1200px;position: absolute;left: 50%;transform: translateX(-50%); font-size: 14px;padding: 10px;}
+}
+
+@media screen and (max-width:768px){.only-pc{display:none !important}
+    html{font-size:100px}
+    body{font-size:0.26rem}
+    ::-webkit-scrollbar{width:0.08rem;height:0.08rem;background-color:#f5f5f5}
+    ::-webkit-scrollbar-thumb{background-color:#aaa;border-radius:0.04rem}
+    header{position:sticky;top:0;z-index:99}
+    main{min-height:calc(100vh - 1.04rem - 4rem)}
+    .bk-header{position:relative;height:1.04rem;background:#fff}
+    .bk-header .bk-container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding-right:0.32rem}
+    .bk-header .bk-logo{width:2rem;height:1.04rem;background:#F57C40;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+    .bk-header .bk-logo h1{font-size:0;text-indent:-99999px}
+    .bk-header .bk-logo img{display:block;width:1.6rem;height:0.64rem}
+    .bk-header .bk-menu{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-column-gap:0.16rem;-moz-column-gap:0.16rem;column-gap:0.16rem}
+    .bk-header .bk-menu .bk-search-btn{display:block;width:0.56rem;height:0.56rem;background:#FFF1EB url("/img/encyclopedia/assets/h5-icon-search.png") no-repeat center;border-radius:50%;background-size:0.32rem}
+    .bk-header .bk-menu .bk-menu-name{font-size:0.32rem;color:#F57C40}
+    .bk-header .bk-menu .bk-collapse-btn{display:block;width:0.48rem;height:0.48rem;background:url("/img/encyclopedia/assets/h5-icon-collapse.png") no-repeat center;background-size:0.48rem}
+    .bk-header .bk-menu.active .bk-collapse-btn{background-image:url("/img/encyclopedia/assets/h5-icon-close-hover.png")}
+    .bk-header .bk-search-container{position:absolute;left:0;top:1.04rem;background:#fff;width:100%;display:none}
+    .bk-header .bk-search-container .bk-search-menu{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding:0.68rem 0.32rem 0.4rem;background:-webkit-gradient(linear,left top,left bottom,from(rgba(0,0,0,.15)),color-stop(46%,#fff));background:-o-linear-gradient(top,rgba(0,0,0,.15) 0%,#fff 46%);background:linear-gradient(180deg,rgba(0,0,0,.15) 0%,#fff 46%)}
+    .bk-header .bk-search-container .bk-search-menu .bk-name{font-size:0.36rem;color:#333333;font-weight:bold}
+    .bk-header .bk-search-container .bk-search-menu .bk-search-close{display:block;width:0.48rem;height:0.48rem;background:url("/img/encyclopedia/assets/h5-icon-close.png") no-repeat center;background-size:0.48rem}
+    .bk-header .bk-search-container .bk-search-menu .bk-search-close:hover{background-image:url("/img/encyclopedia/assets/h5-icon-close-hover.png")}
+    .bk-header .bk-search-container .bk-search-control{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding:0 0.32rem}
+    .bk-header .bk-search-container .bk-search-control input{display:block;width:5.56rem;height:0.8rem;background:#F7F7F7;line-height:0.8rem;font-size:0.24rem;padding:0 0.24rem;border:0;-webkit-box-sizing:border-box;box-sizing:border-box;border-radius:0.08rem 0 0 0.08rem}
+    .bk-header .bk-search-container .bk-search-control button{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:1.3rem;height:0.8rem;background:#F57C40;color:#fff;font-size:0.28rem;border:0;border-radius:0 0.08rem 0.08rem 0}
+    .bk-header .bk-search-container .bk-search-control button::before{content:"";width:0.32rem;height:0.32rem;display:block;background:url("/img/encyclopedia/assets/h5-icon-search2.png") no-repeat center;background-size:0.32rem;margin-right:0.08rem}
+    .bk-header .bk-search-container .bk-hot-keyword{display:-webkit-box;display:-ms-flexbox;display:flex;gap:0.16rem;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:0.4rem 0.32rem 0.64rem}
+    .bk-header .bk-search-container .bk-hot-keyword li a{display:block;line-height:0.48rem;height:0.48rem;padding:0 0.18rem;background:#F7F7F7;color:#999999;font-size:0.24rem;border-radius:0.08rem}
+    .bk-nav{position:absolute;width:100vw;right:0;top:1.04rem;display:none}
+    .bk-nav .bk-navbar{padding-top:0.48rem;background:#fff;margin-left:1.34rem;-webkit-box-sizing:border-box;box-sizing:border-box;height:calc(100vh - 1.04rem)}
+    .bk-nav .bk-navbar li{border-bottom:0.01rem solid #D8D8D8}
+    .bk-nav .bk-navbar li a{display:block;color:#333;font-size:0.28rem;line-height:1rem;padding-left:0.48rem}
+    .bk-footer{background:#2C3038;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0 0.5rem 0.4rem;text-align:center;height:4rem;-webkit-box-sizing:border-box;box-sizing:border-box}
+    .bk-footer h2{font-size:0.26rem;color:#FFFFFF;font-weight:normal;padding:0.56rem 0 0.4rem}
+    .bk-footer h2 a{color:#FFFFFF}
+    .bk-footer .beian{font-size:0.24rem;color:#e1e1e1;font-weight:lighter;line-height:0.48rem}
+    .bk-footer .beian a{color:#e1e1e1}
+    .bk-footer .beian span{margin:0 4px}
+    .bk-footer .beian i{display:inline-block;width:16px;height:16px;vertical-align:-3px;font-size:0;background:url("/img/base/icon-icp@2x.png") no-repeat center;background-size:16px}
+    .bk-footer .copyright{font-size:12px;color:#e1e1e1;font-weight:lighter;line-height:0.48rem}
+    .nav-link {width: 95vw;position: absolute;left: 50%;transform: translateX(-50%); font-size: 3vw; padding: 2vw;}
+}

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

@@ -24,13 +24,14 @@ li{list-style:none}
     .content .section .section-content .new-list .text .msg-content {display: flex;flex-direction: column;}
     .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;height: auto;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 #text-content {height: 48px;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;text-overflow: ellipsis;}
     .content .section .section-content .new-list .text p .right-number {margin-left: 100px;}
     .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;}
     .notclick{opacity: .6}
+    .content .section .section-content .new-list .text .msg-content .msg-article-p::before{content: "";float: right;height: 24px;}
+    .content .section .section-content .new-list .text .msg-content .msg-article-p span {float: right;clear: both}
 }
 
 /**
@@ -59,12 +60,14 @@ li{list-style:none}
     .content .section .section-content .new-list .text .msg-content {display: flex;flex-direction: column;}
     .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: 6vw;font-size: 3.4vw;color: #627386;float: left;width: 77.6vw;}
-    .content .section .section-content .new-list .text #text-content {height: 12vw;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;text-overflow: ellipsis;}
     .content .section .section-content .new-list .text p .right-number {margin-left: 5vw;}
     .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}
     .empty{padding: 50vw 0}
+    .content .section .section-content .new-list .text .msg-content .msg-article-p {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 .msg-content .msg-article-p::before{content: "";float: right;height: 6vw;}
+    .content .section .section-content .new-list .text .msg-content .msg-article-p span {float: right;clear: both}
 }
 

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

@@ -1,236 +1,237 @@
-;var helpSuggestion = new Vue({
-    el: "#dashboard",
-    mixins: [noticeMixin,cmSysVitaMixins],
-    data: {
-        btnLoading: false,
-        isRequset:false,
-        mssageTabBarIndex:0,
-        mssageTabBar: [
-            {messageType: '',text: '全部消息',bages:0},
-            {messageType: 2,text: '账户通知',bages:0},
-            {messageType: 3,text: '服务通知',bages:0},
-        ],
-        allCount:0,
-        listQuery: {
-            source: 1,
-            commonId: 0,
-            messageType: '',
-            pageNum: 1,
-            pageSize: 10
-        },
-        noMore:false,
-        listRecord: 0,
-        pageInput: '1',
-        degree:'',
-        isCheckedAll:false,
-        messagesList:[],//新闻动态
-        check:false,
-        checklist:[],
-        msgId:'',
-    },
-    filters: {
-        NumBadge: function (n) {//处理
-            var num = '';
-            if (n > 100) {
-                num = 99
-            } else {
-                num = n;
-            }
-            return num;
-        }
-    },
-    computed: {
-        pageTotal: function () {
-            var total = Math.ceil(this.listRecord / this.listQuery.pageSize);
-            return total > 0 ? total : 1;
-        },
-        showPageBtn: function () {
-            var total = Math.ceil(this.listRecord / this.listQuery.pageSize);
-            total = total > 0 ? total : 1;
-            var index = this.listQuery.pageNum, arr = [];
-            if (total <= 6) {
-                for (var i = 1; i <= total; i++) {
-                    arr.push(i);
-                }
-                return arr;
-            }
-            if (index <= 3) return [1, 2, 3, 4, 5, 0, total];
-            if (index >= total - 2) return [1, 0, total - 4, total - 3, total - 2, total - 1, total];
-            return [1, 0, index - 2, index - 1, index, index + 1, index + 2, 0, total];
-        }
-    },
-    methods: {
-        toPagination: function (pageNum) {//点击切换分页
-            if (pageNum <= this.pageTotal) {
-                this.listQuery.pageNum = pageNum;
-                this. getAuthShopMessageList();
-            }
-        },
-        checkNum: function () {//输入跳转分页
-            if (this.pageInput > this.pageTotal) {
-                this.pageInput = this.pageTotal;
-            } else if (this.pageInput < 1) {
-                this.pageInput = 1;
-            }
-        },
-        changeTabsFn:function(index,messageType){//点击Tab切换消息通知
-            this.mssageTabBarIndex = index;
-            this.listQuery.messageType = messageType;
-            this.listQuery.pageNum = 1;
-            this.messagesList =[];
-            this. getAuthShopMessageList();
-        },
-        getAuthShopMessageCount:function(){//查询tabs数量
-            var _self = this;
-            SupplierApi.getAuthShopMessageCount({commonId:_self.listQuery.commonId},function (response) {
-                var data = response.data;
-                _self.mssageTabBar[0].bages = _self.allCount = data.count;
-                _self.mssageTabBar[1].bages = data.accountCount;
-                _self.mssageTabBar[2].bages = data.notificationCount;
-            })
-        },
-        getAuthShopMessageList:function(){
-            var _self = this;
-            SupplierApi.getAuthShopMessageList(_self.listQuery,function (response) {
-                if(response.code == 0){
-                    _self.isRequset = false;
-                    _self.isCheckedAll = false;
-                    var data = response.data;
-                    if (data.list.length>0){
-                        if(isPC){
-                            _self.messagesList = data.list.map(function (el) {
-                                el.check = false
-                                return el;
-                            });
-                        }else{
-                            var list = data.list.map(function (el) {
-                                el.check = false
-                                return el;
-                            });
-                            _self.messagesList = _self.messagesList.concat(list);
-                        }
-                        _self.listRecord =  data.total;
-                        _self.requestFlag = true;
-                    }else {
-                        _self.requestFlag = false;
-                        _self.listRecord =  data.total;
-                    }
-                }else{
-                    CAIMEI.Alert(response.msg, '确定', false);
-                    _self.requestFlag = false;
-                }
-            })
-        },
-        checkedContains(arr, val) {// 校验
-            return arr.some(item => item === val)
-        },
-        checkedItemFn:function(item){ //单选
-            var _self = this;
-            if(event.target.checked){
-                if(!_self.checkedContains(_self.checklist,item.id)){
-                    _self.checklist.push(item.id);
-                }
-            }else {
-                _self.checklist.splice(_self.checklist.indexOf(item.id), 1);
-            }
-            _self.msgId = _self.checklist.toString()+','
-            if(_self.checklist.length==_self.messagesList.length){
-                _self.isCheckedAll=true;
-            }else {
-                _self.isCheckedAll=false;
-            }
-        },
-        checkedAllFn: function () { //全選
-            var _self = this;
-            _self.isCheckedAll = !_self.isCheckedAll;
-            if (_self.isCheckedAll) {
-                _self.checklist = [];
-                _self.messagesList.forEach(function (item) {
-                    item.check = true;
-                    _self.checklist.push(item.id);
-                    _self.msgId = _self.checklist.toString()+','
-                })
-            }else{
-                _self.messagesList.forEach(function(item){
-                    item.check = false;
-                });
-                _self.checklist = [];
-                _self.msgId = ''
-            }
-        },
-        deleteMessageFn: function(){//删除消息
-            var _this =this;
-            if(this.allCount === 0){
-                CAIMEI.dialog('暂无消息');
-            }else if(_this.checklist.length==0){
-                CAIMEI.dialog('请勾选未读消息');
-            }else{
-                SupplierApi.authDeleteMessage({id:_this.msgId},function (res) {
-                    if (res.code==0){
-                        CAIMEI.dialog('刪除成功');
-                        setTimeout(function (){
-                            _this.getAuthShopMessageList();
-                        },500)
-                    }else {
-                        CAIMEI.Alert(res.msg, '确定', false);
-                    }
-                })
-            }
-        },
-        signMessageFn: function(){//标记为已读
-            var _this =this;
-            console.log(_this.checklist);
-            console.log(_this.msgId);
-            if(this.allCount === 0){
-                CAIMEI.dialog('暂无未读消息');
-            }else if(_this.checklist.length==0){
-                CAIMEI.dialog('请勾选未读消息');
-            }else {
-                SupplierApi.authUpdateRead({userType:2,Id:_this.msgId},function (res) {
-                    if(res.code==0){
-                        CAIMEI.dialog('标记已读成功');
-                        setTimeout(function (){
-                            _this.getAuthShopMessageCount();
-                            _this.getAuthShopMessageList();
-                        },500)
-                    }else {
-                        CAIMEI.Alert(res.msg, '确定', false);
-                    }
-                })
-            }
-        }
-    },
-    mounted: function () {
-        if(globalUserData){
-            this.listQuery.commonId = globalUserData.shopId;
-            this.getAuthShopMessageCount();
-            this.getAuthShopMessageList();
-        }
-         if(!isPC){
-            $('footer').addClass("noneImportant");
-            //移动端上垃加载更多
-            $(window).on('scroll', function(){
-                var scrollTop = $(this).scrollTop();
-                var scrollHeight = $(document).height();
-                var windowHeight = window.innerHeight;
-                if (scrollTop + windowHeight >= scrollHeight) {
-                    //此处是滚动条到底部时候触发的事件，在这里写要加载的数据，或者是拉动滚动条的操作
-                    var totalPage = Math.ceil(_self.listRecord / _self.listQuery.pageSize)?Math.ceil(_self.listRecord / _self.listQuery.pageSize):1;
-                    var next = _self.listQuery.pageNum+1;
-                    if(next <= totalPage){
-                        if (_self.requestFlag){
-                            _self.listQuery.pageNum = next;
-                            // 获取列表数据
-                            _self.getAuthShopMessageList();
-                        }
-                        _self.requestFlag = false;
-                    }else{
-                        //到底了
-                        _self.noMore = true;
-                        $('footer').removeClass("noneImportant");
-                    }
-                }
-            });
-        }
-    }
-});
+;var helpSuggestion = new Vue({
+    el: "#dashboard",
+    mixins: [noticeMixin,cmSysVitaMixins],
+    data: {
+        btnLoading: false,
+        isRequset:false,
+        mssageTabBarIndex:0,
+        mssageTabBar: [
+            {messageType: '',text: '全部消息',bages:0},
+            {messageType: 2,text: '账户通知',bages:0},
+            {messageType: 3,text: '服务通知',bages:0},
+        ],
+        allCount:0,
+        listQuery: {
+            source: 1,
+            commonId: 0,
+            messageType: '',
+            pageNum: 1,
+            pageSize: 10
+        },
+        noMore:false,
+        listRecord: 0,
+        pageInput: '1',
+        degree:'',
+        isCheckedAll:false,
+        messagesList:[],//新闻动态
+        check:false,
+        checklist:[],
+        msgId:'',
+    },
+    filters: {
+        NumBadge: function (n) {//处理
+            var num = '';
+            if (n > 100) {
+                num = 99
+            } else {
+                num = n;
+            }
+            return num;
+        }
+    },
+    computed: {
+        pageTotal: function () {
+            var total = Math.ceil(this.listRecord / this.listQuery.pageSize);
+            return total > 0 ? total : 1;
+        },
+        showPageBtn: function () {
+            var total = Math.ceil(this.listRecord / this.listQuery.pageSize);
+            total = total > 0 ? total : 1;
+            var index = this.listQuery.pageNum, arr = [];
+            if (total <= 6) {
+                for (var i = 1; i <= total; i++) {
+                    arr.push(i);
+                }
+                return arr;
+            }
+            if (index <= 3) return [1, 2, 3, 4, 5, 0, total];
+            if (index >= total - 2) return [1, 0, total - 4, total - 3, total - 2, total - 1, total];
+            return [1, 0, index - 2, index - 1, index, index + 1, index + 2, 0, total];
+        }
+    },
+    methods: {
+        toPagination: function (pageNum) {//点击切换分页
+            if (pageNum <= this.pageTotal) {
+                this.listQuery.pageNum = pageNum;
+                this. getAuthShopMessageList();
+            }
+        },
+        checkNum: function () {//输入跳转分页
+            if (this.pageInput > this.pageTotal) {
+                this.pageInput = this.pageTotal;
+            } else if (this.pageInput < 1) {
+                this.pageInput = 1;
+            }
+        },
+        changeTabsFn:function(index,messageType){//点击Tab切换消息通知
+            this.mssageTabBarIndex = index;
+            this.listQuery.messageType = messageType;
+            this.listQuery.pageNum = 1;
+            this.messagesList =[];
+            this. getAuthShopMessageList();
+        },
+        getAuthShopMessageCount:function(){//查询tabs数量
+            var _self = this;
+            SupplierApi.getAuthShopMessageCount({commonId:_self.listQuery.commonId},function (response) {
+                var data = response.data;
+                _self.mssageTabBar[0].bages = _self.allCount = data.count;
+                _self.mssageTabBar[1].bages = data.accountCount;
+                _self.mssageTabBar[2].bages = data.notificationCount;
+            })
+        },
+        getAuthShopMessageList:function(){
+            var _self = this;
+            SupplierApi.getAuthShopMessageList(_self.listQuery,function (response) {
+                if(response.code == 0){
+                    _self.isRequset = false;
+                    _self.isCheckedAll = false;
+                    var data = response.data;
+                    if (data.list.length>0){
+                        if(isPC){
+                            _self.messagesList = data.list.map(function (el) {
+                                el.check = false
+                                return el;
+                            });
+                        }else{
+                            var list = data.list.map(function (el) {
+                                el.check = false
+                                return el;
+                            });
+                            _self.messagesList = _self.messagesList.concat(list);
+                        }
+                        _self.listRecord =  data.total;
+                        _self.requestFlag = true;
+                    }else {
+                        _self.requestFlag = false;
+                        _self.listRecord =  data.total;
+                    }
+                }else{
+                    CAIMEI.Alert(response.msg, '确定', false);
+                    _self.requestFlag = false;
+                }
+            })
+        },
+        checkedContains(arr, val) {// 校验
+            return arr.some(item => item === val)
+        },
+        checkedItemFn:function(item){ //单选
+            var _self = this;
+            if(event.target.checked){
+                if(!_self.checkedContains(_self.checklist,item.id)){
+                    _self.checklist.push(item.id);
+                }
+            }else {
+                _self.checklist.splice(_self.checklist.indexOf(item.id), 1);
+            }
+            _self.msgId = _self.checklist.toString()+','
+            if(_self.checklist.length==_self.messagesList.length){
+                _self.isCheckedAll=true;
+            }else {
+                _self.isCheckedAll=false;
+            }
+        },
+        checkedAllFn: function () { //全選
+            var _self = this;
+            _self.isCheckedAll = !_self.isCheckedAll;
+            if (_self.isCheckedAll) {
+                _self.checklist = [];
+                _self.messagesList.forEach(function (item) {
+                    item.check = true;
+                    _self.checklist.push(item.id);
+                    _self.msgId = _self.checklist.toString()+','
+                })
+            }else{
+                _self.messagesList.forEach(function(item){
+                    item.check = false;
+                });
+                _self.checklist = [];
+                _self.msgId = ''
+            }
+        },
+        deleteMessageFn: function(){//删除消息
+            var _this =this;
+            if(this.allCount === 0){
+                CAIMEI.dialog('暂无消息');
+            }else if(_this.checklist.length==0){
+                CAIMEI.dialog('请勾选未读消息');
+            }else{
+                SupplierApi.authDeleteMessage({id:_this.msgId},function (res) {
+                    if (res.code==0){
+                        CAIMEI.dialog('刪除成功');
+                        setTimeout(function (){
+                            _this.getAuthShopMessageList();
+                        },500)
+                    }else {
+                        CAIMEI.Alert(res.msg, '确定', false);
+                    }
+                })
+            }
+        },
+        signMessageFn: function(){//标记为已读
+            var _this =this;
+            console.log(_this.checklist);
+            console.log(_this.msgId);
+            if(this.allCount === 0){
+                CAIMEI.dialog('暂无未读消息');
+            }else if(_this.checklist.length==0){
+                CAIMEI.dialog('请勾选未读消息');
+            }else {
+                SupplierApi.authUpdateRead({userType:2,Id:_this.msgId},function (res) {
+                    if(res.code==0){
+                        CAIMEI.dialog('标记已读成功');
+                        setTimeout(function (){
+                            _this.getAuthShopMessageCount();
+                            _this.getAuthShopMessageList();
+                        },500)
+                    }else {
+                        CAIMEI.Alert(res.msg, '确定', false);
+                    }
+                })
+            }
+        }
+    },
+    mounted: function () {
+        const _self = this;
+        if(globalUserData){
+            this.listQuery.commonId = globalUserData.shopId;
+            this.getAuthShopMessageCount();
+            this.getAuthShopMessageList();
+        }
+         if(!isPC){
+            $('footer').addClass("noneImportant");
+            //移动端上垃加载更多
+            $(window).on('scroll', function(){
+                var scrollTop = $(this).scrollTop();
+                var scrollHeight = $(document).height();
+                var windowHeight = window.innerHeight;
+                if (scrollTop + windowHeight >= scrollHeight) {
+                    //此处是滚动条到底部时候触发的事件，在这里写要加载的数据，或者是拉动滚动条的操作
+                    var totalPage = Math.ceil(_self.listRecord / _self.listQuery.pageSize)?Math.ceil(_self.listRecord / _self.listQuery.pageSize):1;
+                    var next = _self.listQuery.pageNum+1;
+                    if(next <= totalPage){
+                        if (_self.requestFlag){
+                            _self.listQuery.pageNum = next;
+                            // 获取列表数据
+                            _self.getAuthShopMessageList();
+                        }
+                        _self.requestFlag = false;
+                    }else{
+                        //到底了
+                        _self.noMore = true;
+                        $('footer').removeClass("noneImportant");
+                    }
+                }
+            });
+        }
+    }
+});

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

@@ -109,7 +109,6 @@ var helpSuggestion = new Vue({
                                 el.check = false
                                 return el;
                             });
-                            _self.messagesList = [{check:false, messageType: 6, content: '哦哈都会我爱到单位哦对哈我的我啊哦我大号哦啊的文化奥迪哦啊我的好多好单位我哦对哈我的我啊哦我大号哦啊的文化奥迪哦啊我的好多好哦对哈我的我啊哦我大号哦啊的文化奥迪哦啊我的好多好哦对哈我的我啊哦我大号哦啊的文化奥迪哦啊我的好多好哦对哈我的我啊哦我大号哦啊的文化奥迪哦啊我的好多好'}, ..._self.messagesList];
                         }else{
                             var list = data.list.map(function (el) {
                                 el.check = false

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

@@ -12,6 +12,8 @@ var noticeMixin = function () {// 通知消息
             window.handleOrderClick  = this.handleOrderClick;
             window.handleUsersClick  = this.handleUsersClick;
             window.handleCouponClick  = this.handleCouponClick;
+            window.handleArticleClick = this.handleArticleClick;
+            window.handleActivityClick = this.handleActivityClick;
         },
         methods: {
             hanldeNoticeText(cell){ // 根据tab计算返回显示文案
@@ -93,12 +95,12 @@ var noticeMixin = function () {// 通知消息
                 }
             },
             noticeArticleText(cell) { // 最新文章
-                const link = `<span data-id="${cell.id}" class="link" onclick="handleArticleClick($(this))">点击查看</span>`
-                return `${cell.content}${link}`
+                const link = `<span data-id="${cell.thisId}" class="link" onclick="handleArticleClick($(this))">点击查看</span>`
+                return `${link}${cell.content}`
             },
             noticeActivityText(cell) { // 最新活动
-                const link = `<span data-id="${cell.id}" class="link" onclick="handleActivityClick($(this))">点击查看</span>`
-                return `${cell.content}${link}`
+                const link = `<span data-id="${cell.thisId}" class="link" onclick="handleActivityClick($(this))">点击查看</span>`
+                return `${link}${cell.content}`
             },
             handleOrderClick($event){// 订单点击事件
                 let orderMessageType  = Number($event[0].attributes[0].value);
@@ -166,12 +168,12 @@ var noticeMixin = function () {// 通知消息
                 window.open(linkJumpMap[couponMessageType]);
             },
             handleArticleClick($event) {
-                const id  = Number($event[0].attributes[0].value);
-                window.open(``);
+                const id = Number($event[0].attributes[0].value);
+                window.open(`/info/detail-${id}-1.html`);
             },
             handleActivityClick($event) {
                 const id  = Number($event[0].attributes[0].value);
-                window.open(``);
+                window.open(`/page-${id}.html`);
             }
         }
     };

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

@@ -1,45 +1,56 @@
-<header xmlns:th="https://www.thymeleaf.org">
-    <div class="bk-header">
-        <div class="bk-container">
-            <div class="bk-logo">
-                <a th:href="'/encyclopedia/list.html'" title="采美百科">
-                    <h1>采美百科</h1>
-                    <img src="/img/encyclopedia/assets/pc-logo.png" alt="采美百科" class="only-pc"/>
-                    <img src="/img/encyclopedia/assets/h5-logo.png" alt="采美百科" class="only-mobile"/>
-                </a>
-            </div>
-            <div class="only-mobile bk-menu">
-                <span class="bk-search-btn"></span>
-                <span class="bk-menu-name">菜单</span>
-                <span class="bk-collapse-btn"></span>
-            </div>
-            <div class="bk-search-container">
-                <div class="bk-search-menu only-mobile">
-                    <span class="bk-name">菜单</span>
-                    <span class="bk-search-close"></span>
-                </div>
-                <form method="get" id="searchForm">
-                    <div class="bk-search-control">
-                        <label><input id="searchInput" type="text" placeholder="搜索词条"/></label>
-                        <button type="submit">搜索</button>
-                    </div>
-                </form>
-                <ul class="bk-hot-keyword">
-                    <li th:each="item : ${hotSeracherWords}" th:object="${item}" th:if="${(item.jumpType eq 1) or (item.jumpType eq 4)}">
-                        <a th:href="'/encyclopedia/search.html?keyword=' + *{keyWord}" th:if="*{jumpType eq 1}" th:text="*{keyWord}"></a>
-                        <a th:href="*{jumpLink}" th:if="*{jumpType eq 4}" th:text="*{keyWord}" target="_blank"></a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </div>
-    <div class="bk-nav">
-        <ul class="bk-navbar bk-container">
-            <li th:each="item,stat : ${TypeList}" th:object="${item}" th:if="${stat.index < 8}">
-                <a th:href="'/encyclopedia/list-' + *{typeId} + '.html'" th:text="*{name}"></a>
-            </li>
-            <li><a href="/encyclopedia/about.html">走进百科</a></li>
-        </ul>
-    </div>
-    <input type="hidden" th:value="${coreServer}" id="coreServer">
-</header>
+<header xmlns:th="https://www.thymeleaf.org">
+    <div class="bk-header">
+        <div class="bk-container">
+            <div class="bk-logo">
+                <a th:href="'/encyclopedia/list.html'" title="采美百科">
+                    <h1>采美百科</h1>
+                    <img src="/img/encyclopedia/assets/pc-logo.png" alt="采美百科" class="only-pc"/>
+                    <img src="/img/encyclopedia/assets/h5-logo.png" alt="采美百科" class="only-mobile"/>
+                </a>
+            </div>
+            <div class="only-mobile bk-menu">
+                <span class="bk-search-btn"></span>
+                <span class="bk-menu-name">菜单</span>
+                <span class="bk-collapse-btn"></span>
+            </div>
+            <div class="bk-search-container">
+                <div class="bk-search-menu only-mobile">
+                    <span class="bk-name">菜单</span>
+                    <span class="bk-search-close"></span>
+                </div>
+                <form method="get" id="searchForm">
+                    <div class="bk-search-control">
+                        <label><input id="searchInput" type="text" placeholder="搜索词条"/></label>
+                        <button type="submit">搜索</button>
+                    </div>
+                </form>
+                <ul class="bk-hot-keyword">
+                    <li th:each="item : ${hotSeracherWords}" th:object="${item}" th:if="${(item.jumpType eq 1) or (item.jumpType eq 4)}">
+                        <a th:href="'/encyclopedia/search.html?keyword=' + *{keyWord}" th:if="*{jumpType eq 1}" th:text="*{keyWord}"></a>
+                        <a th:href="*{jumpLink}" th:if="*{jumpType eq 4}" th:text="*{keyWord}" target="_blank"></a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <div class="bk-nav">
+        <ul class="bk-navbar bk-container">
+            <li th:each="item,stat : ${TypeList}" th:object="${item}" th:if="${stat.index < 8}">
+                <a th:href="'/encyclopedia/list-' + *{typeId} + '.html'" th:text="*{name}"></a>
+            </li>
+            <li><a href="/encyclopedia/about.html">走进百科</a></li>
+        </ul>
+    </div>
+    <div class="nav-link" style="display: none;">
+        <div class="bar">
+            <a th:each="type: ${TypeList}" th:if="${typeId}==${type.typeId}" th:text="${type.name}" th:href="'/encyclopedia/list-' + ${type.typeId} + '.html'" class="title newTitle"></a>
+            <span th:each="type: ${articleType}">
+                <span th:each="childLink: ${type.linkList}" th:if="${typeId}==${childLink.id}">
+                    <a th:text="${type.name}" th:href="'/info/center-' + ${type.id} + '-1.html'" class="title newTitle"></a>
+                    <a th:if="${typeId}==${childLink.id}" th:href="'/info/center-' + ${childLink.id} + '-1.html'" class="title newTitle" th:text="'>' + ${childLink.name}"></a>
+                </span>
+            </span>
+        </div>
+    </div>
+    <input type="hidden" th:value="${coreServer}" id="coreServer">
+</header>

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

@@ -49,8 +49,7 @@
                                 <div class="text">
                                     <input type="checkbox"  class="check" v-model="item.check" @change="checkedItemFn(item)" />
                                     <div class="msg-content">
-                                        <p v-html="hanldeNoticeText(item)"></p>
-                                        <span data-id="${cell.id}" class="link" onclick="handleActivityClick($(this))">点击查看</span>
+                                        <p :class="item.messageType > 4 && 'msg-article-p'" v-html="hanldeNoticeText(item)"></p>
                                         <p v-if="item.shopTieredType > 4">客户经理：{{item.userName}}<span class="right-number">手机号：{{item.mobile}}</span></p>
                                     </div>
                                 </div>