提交代码

src/jfw/modules/app/src/web/staticres/jyapp/js/common.js

@@ -1248,7 +1248,7 @@ function redSpotOnMenu () {
 function redSpotBackFuc (r, flag) {
   var noticeCount = r.notice;
   //JyObj.getUnReadMessageCount("");
-
+  checkMsgCount(false)
   // message红点
   if (noticeCount > 0) {
     $(".trigger-div-notice .dot-red").show()

src/jfw/modules/app/src/web/templates/frontRouter/messageCenter/sess/detail.html

@@ -25,7 +25,6 @@
       <div class="j-container">
         <div class="j-main descri" id="descri">
           <van-list
-            v-model="tabsList.loading"
             :finished="tabsList.finished"
             finished-text=""
             @load="msgData"

src/web/staticres/common-module/messageCenter/css/index.css

@@ -168,6 +168,7 @@
     color: #9B9CA3;
     line-height: .4rem;
     margin-top: .08rem;
+    word-break: break-all;
 }
 .no-data {
     margin-top: 1.56rem;
@@ -208,7 +209,7 @@
 .descri .d-list .words .m-tip {
     width: 100%;
     position: relative;
-    padding: .24rem .16rem;
+    padding: .16rem .24rem;
     margin-left: .32rem;
     background: #ffffff;
     border-radius: .16rem;
@@ -226,6 +227,7 @@
     color: #9b9ca3;
     line-height: .4rem;
     margin-top: .08rem;
+    word-break: break-all;
 }
 .descri .d-list .words .m-tip .p2 i {
     color: #2cb7ca;

src/web/staticres/common-module/messageCenter/js/detail.js

@@ -4,7 +4,6 @@ var vm = new Vue({
   data () {
     return {
       tit: '',
-      refreshing: false,
       imgSrcs: [
         {title: '活动优惠', url:'huodong'},
         {title: '服务通知', url:'fuwu'},{title: '订阅消息', url:'dingyue'},
@@ -22,10 +21,10 @@ var vm = new Vue({
     }
   },
   created() {
-    let wxType = getType()
-    if (!wxType) {
-      checkMsgCount(true)
-    }
+    // let wxType = getType()
+    // if (!wxType) {
+    //   checkMsgCount(true)
+    // }
     let indx = getQueryString('type')
     this.tit = this.imgSrcs[indx - 1].title
     document.title = this.imgSrcs[indx - 1].title
@@ -60,22 +59,24 @@ var vm = new Vue({
               }
             }
             if (Array.isArray(r.data.list) && r.data.list.length !== 0) {
-              r.data.list.map(function (v) {
-                _this.lists.unshift({
-                  id: v.id,
-                  msg_type: v.msg_type,
-                  title: v.title,
-                  content: v.content,
-                  createtime: v.createtime,
-                  link: v.link,
-                  url: v.url
+              setTimeout(() => {
+                r.data.list.map(function (v) {
+                  _this.lists.unshift({
+                    id: v.id,
+                    msg_type: v.msg_type,
+                    title: v.title,
+                    content: v.content,
+                    createtime: v.createtime,
+                    link: v.link,
+                    url: v.url
+                  })
                 })
-              })
+              }, 500)
             } else {
               _this.tabsList.finished = true
             }
     
-            _this.tabsList.loading = false
+            // _this.tabsList.loading = false
             if (_this.tabsList.total !== -1 && _this.tabsList.total <= _this.lists.length) {
               _this.tabsList.finished = true
             }
@@ -83,16 +84,8 @@ var vm = new Vue({
         }
       })
     },
-    onRefresh() {
-      // 清空列表数据
-      this.tabsList.finished = false
-
-      // 重新加载数据
-      // 将 loading 设置为 true，表示处于加载状态
-      this.tabsList.loading = true
-      this.msgData()
-    },
     msgClick(url) {
+      console.log(url)
       let wxType = getType()
       let appType = androidOrIOS()
       if (wxType) {

src/web/staticres/common-module/messageCenter/js/index.js

@@ -22,17 +22,17 @@ var vm = new Vue({
   },
   mounted () {
     let wxType = getType()
-    // let appType = androidOrIOS()
-    // if (appType == 'ios') {
-    //   utils.iosBackRefresh()
-    // }
+    let appType = androidOrIOS()
+    if (appType == 'ios') {
+      utils.iosBackRefresh()
+    }
+    // clearInterval(this.timer)
     // this.timer = setInterval(() => {
-      this.lastMsg()
-      this.msgData()
-      if (!wxType) {
-        checkMsgCount(true)
-      }
-    // },3000)
+    //   this.msgData()
+      // if (!wxType) {
+      //   checkMsgCount(true)
+      // }
+    // }, 5000)
   },
   beforeDestroy() {
     clearInterval(this.timer)

src/web/staticres/frontRouter/pc/mesgCenter/css/index-pc.css

@@ -74,6 +74,7 @@
   line-height: 22px;
   margin-top: 4px;
   text-align: left;
+  word-break: break-all;
 }
 .main-mesg .tips .r-lis p a {
   color: #2CB7CA;
@@ -132,7 +133,7 @@
   background: url('/images/pc/lines.png') no-repeat;
   background-size: cover;
 }
-.main-mesg .tabs-mesg .el-tabs .el-tabs__item.is-active .msg-label, .main-mesg .tabs-mesg .el-tabs .el-tabs__item:hover .msg-label {
+.main-mesg .tabs-mesg .el-tabs .el-tabs__item.is-active .msg-label p, .main-mesg .tabs-mesg .el-tabs .el-tabs__item:hover .msg-label p {
   color: #2CB7CA;
 }
 .main-mesg .tabs-mesg .el-tabs .el-tabs__nav-wrap::after {
@@ -151,10 +152,9 @@
 }
 .main-mesg .tab-tips .r-lis {
   padding-bottom: 16px;
-  border-bottom: 1px solid #eee;
 }
 .main-mesg .tab-tips:not(:last-child) .r-lis {
-  border-bottom: 1px solid #eee;
+  box-shadow: 0px -1px 0px 0px rgb(0 0 0 / 5%) inset;
 }
 .main-mesg .tab-tips:hover {
   cursor: pointer;

src/web/staticres/js/message.js

@@ -1,7 +1,31 @@
+// 点击置顶消息为已读
+function topRead(ids) {
+    $.ajax({
+      type:'POST',
+      url:'/jymessageCenter/markRead',
+      data: {
+        msgId: ids
+      },
+      success:function (res) {
+        console.log(res)
+        message.checkMessage()
+        message.checkOpened()
+      }
+    })
+  }
+// 消息悬浮窗列表跳转详情页
+function linked (ids, url, num) {
+    console.info(ids, url, num)
+    if (url) {
+        window.location.href = url
+    }
+    if (num == 0) {
+        topRead(ids)
+    }
+}
 function Message() {
     this.isOpened = false
     this.imgArrs = ['quanbu', 'huodong', 'fuwu', 'dingyue', 'xiangmu', 'qiye', 'fenxi', 'xitong']
-    this.tabName = ['全部', '优惠活动', '服务通知', '订阅消息', '项目动态', '企业动态', '分析报告', '系统通知']
     this.messageInfoList = {}
     
     // 初始化
@@ -69,32 +93,33 @@ function Message() {
             $('#public-nav .iner .jynav li').find('.jy-list-msg').hide()
         }
     }
-
+    
     // 渲染浮窗消息列表数据
     this.renderMessageList = function () {
         var imgArrs = this.imgArrs
-        var tabName = this.tabName
         var messageInfoList = this.messageInfoList
         var lists = $.isEmptyObject(messageInfoList.list) ? false : messageInfoList.list
 
-        var lasts = $.isEmptyObject(messageInfoList.last) ? false : messageInfoList.last, temp = ''
+        var lasts = $.isEmptyObject(messageInfoList.last) ? false : messageInfoList.last
+        var temp = ''
         if (lasts) {
             if (lasts.isRead == 0) {
-                temp += '<div id="firsted" class="m-li" onclick="linked('+lasts.id+')"><div class="lis-cont"><img src="/images/pc/'+imgArrs[lasts.msg_type]+'@2x.png"><i class="dots"></i><div class="r-lis"><div class="title"><span>'+lasts.title+'</span><span>'+dateMatter(lasts.createtime)+'</span></div><p>'+lasts.content+'</p></div></div></div>'
+                temp += '<div id="firsted" class="m-li" onclick="linked(\''+lasts.id+'\',\''+lasts.link+'\',\''+lasts.isRead+'\')"><div class="lis-cont"><img src="/images/pc/'+imgArrs[lasts.msg_type]+'@2x.png"><i class="dots"></i><div class="r-lis"><div class="title"><span>'+lasts.title+'</span><span>'+dateMatter(lasts.createtime)+'</span></div><p>'+lasts.content+'</p></div></div></div>'
             } else {
-                temp += '<div id="firsted" class="m-li" onclick="linked('+lasts.id+')"><div class="lis-cont"><img src="/images/pc/'+imgArrs[lasts.msg_type]+'@2x.png"><div class="r-lis"><div class="title"><span>'+lasts.title+'</span><span>'+dateMatter(lasts.createtime)+'</span></div><p>'+lasts.content+'</p></div></div></div>'
+                temp += '<div id="firsted" class="m-li" onclick="linked(\''+lasts.id+'\',\''+lasts.link+'\',\''+lasts.isRead+'\')"><div class="lis-cont"><img src="/images/pc/'+imgArrs[lasts.msg_type]+'@2x.png"><div class="r-lis"><div class="title"><span>'+lasts.title+'</span><span>'+dateMatter(lasts.createtime)+'</span></div><p>'+lasts.content+'</p></div></div></div>'
             }
         }
         if (lists) {
             for (var i = 0; i < lists.length; i++) {
                 if (lists[i].isRead == 0) {
-                    temp += '<div class="m-li" onclick="linked('+lists[i].link+')"><div class="lis-cont"><img src="/images/pc/'+imgArrs[lists[i].msg_type]+'@2x.png"><i class="dots"></i><div class="r-lis"><div class="title"><span>'+lists[i].title+'</span><span>'+dateMatter(lists[i].createtime)+'</span></div><p>'+lists[i].content+'</p></div></div></div>'
+                    temp += '<div class="m-li" onclick="linked(\''+lists[i].id+'\',\''+lists[i].link+'\',\''+lists[i].isRead+'\')"><div class="lis-cont"><img src="/images/pc/'+imgArrs[lists[i].msg_type]+'@2x.png"><i class="dots"></i><div class="r-lis"><div class="title"><span>'+lists[i].title+'</span><span>'+dateMatter(lists[i].createtime)+'</span></div><p>'+lists[i].content+'</p></div></div></div>'
                 } else {
-                    temp += '<div class="m-li" onclick="linked('+lists[i].link+')"><div class="lis-cont"><img src="/images/pc/'+imgArrs[lists[i].msg_type]+'@2x.png"><div class="r-lis"><div class="title"><span>'+lists[i].title+'</span><span>'+dateMatter(lists[i].createtime)+'</span></div><p>'+lists[i].content+'</p></div></div></div>'
+                    temp += '<div class="m-li" onclick="linked(\''+lists[i].id+'\',\''+lists[i].link+'\',\''+lists[i].isRead+'\')"><div class="lis-cont"><img src="/images/pc/'+imgArrs[lists[i].msg_type]+'@2x.png"><div class="r-lis"><div class="title"><span>'+lists[i].title+'</span><span>'+dateMatter(lists[i].createtime)+'</span></div><p>'+lists[i].content+'</p></div></div></div>'
                 }
             }
         }
         var tempNo = '<div class="no-datas"><img src="/frontRouter/pc/mesgCenter/image/no-mesg.png"><div class="tip-text"><p>暂未接收到信息</p></div></div>'
+        $('#public-nav .iner .jynav li').find('.m-ul').html('')
         if (lasts || lists) {
             $('#public-nav .iner .jynav li').find('.m-ul').append(temp)
         } else {

src/web/templates/common/pchead.html

@@ -253,7 +253,7 @@
         display: none;
         position: absolute;
         left: 14px;
-        top: 16px;
+        top: 13px;
         height: 18px;
         line-height: 16px;
         padding: 0 4px;
@@ -337,6 +337,7 @@
     }
     #public-nav .iner .jynav li .jy-list-msg .msg-par .m-ul .m-li {
         padding: 12px 24px!important;
+        box-shadow: 0px -1px 0px 0px rgb(0 0 0 / 5%) inset;
     }
     #public-nav .iner .jynav li .jy-list-msg .msg-par .m-ul .m-li:hover {
         cursor: pointer;
@@ -377,6 +378,7 @@
         line-height: 20px;
         margin-top: 4px;
         text-align: left;
+        word-break: break-all;
     }
     #public-nav .iner .jynav li .no-datas {
         display: flex;
@@ -959,16 +961,7 @@
 
     }
     window.addEventListener('scroll', docScroll, true)
-    // 消息悬浮窗列表跳转详情页
-    function linked(url) {
-        if (url) {
-            message.checkMessage()
-            message.checkOpened()
-            location.href = url
-        } else {
-            return
-        }
-    }
+    
 $(function(){
     
     // 搜索框显示、隐藏

src/web/templates/frontRouter/pc/messageCenter/sess/index.html

@@ -32,7 +32,6 @@
                     <span>{tabsList.lasts.title}</span>
                     <span>{dateMatter(tabsList.lasts.createtime)}</span>
                 </div>
-                <!-- <p>{tabsList.lasts.content}<a href="">点击立即支付＞＞</a></p> -->
                 <p>{tabsList.lasts.content}</p>
             </div>
           </div>
@@ -40,8 +39,8 @@
             <el-tabs v-model="activeName" @tab-click="tabClick">
               <el-tab-pane v-for="(item, index) in counts" :key="index" :name="imgSrcs[item.type].type">
                 <div class="msg-label" slot="label">
-                    <img :src='imgSrcs[item.type].url'>
-                    <i class="b-item" v-show="item.count">{item.count > 99 ? '99+' : item.count}</i>
+                  <img :src='imgSrcs[item.type].url'>
+                  <i class="b-item" v-show="item.count">{item.count > 99 ? '99+' : item.count}</i>
                   <p class="words">{imgSrcs[item.type].title}</p>
                 </div>
                 <div
@@ -63,7 +62,7 @@
                   </div>
                 </div>
                 <div class="no-data" v-if="!tabsList.lists"><img src='{{Msg "seo" "cdn"}}/frontRouter/pc/mesgCenter/image/no-mesg.png?v={{Msg "seo" "version"}}'><div class="tip-text"><p>暂未接收到信息</p></div></div>
-                <div class="el-pagination-container" v-show="tabsList.totals">
+                <div class="el-pagination-container" v-if="tabsList.totals">
                   <el-pagination
                       background
                       layout="prev, pager, next, ->"

src/web/templates/frontRouter/wx/messageCenter/sess/index.html

@@ -29,7 +29,7 @@
     <div class="j-main mesged" id="mesged" v-cloak>
       <div class="j-container">
         <div class="j-main" v-show="msgList">
-          <div class="head-mesg" v-show="lastData">
+          <div class="head-mesg" v-show="!$.isEmptyObject(lastData)">
             <h5>重要提醒</h5>
             <div class="h-conts" @click="msgClick(lastData.url,lastData.isRead,lastData.id)">
               <div class="p1">