提交代码

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

@@ -1072,6 +1072,8 @@ function checkMsgCount(acync, str, callback) {
 
 function keepQuest() {
   var appType = androidOrIOS(), timer = null
+  console.log(localStorage.getItem('isRfresh'))
+  var reTime = localStorage.getItem('isRfresh') || 5000
   if (appType == 'ios' || appType == 'android') {
     clearInterval(timer)
     timer = setInterval(() => {

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

@@ -23,7 +23,7 @@
         <div class="j-main" v-show="msgList">
           <div class="head-mesg" v-show="!$.isEmptyObject(lastData)">
             <h5>重要提醒</h5>
-            <div class="h-conts" @click="msgClick(lastData.url,lastData.isRead,lastData.id)">
+            <div class="h-conts" @click="msgClick(lastData.url,lastData.isRead,lastData.id,lastData.msg_type)">
               <div class="p1">
                 <span class="spa-tit">{lastData.title}</span>
                 <span class="spa flex" @click.stop="toggleClick" v-show="isRow">{isToggle?'收起':'展开'}&nbsp;<van-icon :class="isToggle?'is-icon1':'is-icon2'" name="arrow-down" /></span>

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

@@ -27,7 +27,6 @@ var vm = new Vue({
     }
     let indx = getQueryString('type')
     let nums = getQueryString('num')
-    console.log(indx,nums)
     if (nums != 0) {
       this.setRead(indx)
     }
@@ -45,7 +44,6 @@ var vm = new Vue({
   methods: {
     // 点击分类修改分类下的消息为已读
     setRead(val) {
-      const _this = this
       $.ajax({
         type:'POST',
         url:'/jymessageCenter/setReadStatus',

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

@@ -67,7 +67,8 @@ var vm = new Vue({
         type:'POST',
         url:'/jymessageCenter/markRead',
         data: {
-          msgId: ids
+          msgId: ids,
+          msgType: type
         },
         success:function (res) {
           console.log(res)
@@ -76,14 +77,14 @@ var vm = new Vue({
       })
     },
     // 置顶消息跳转
-    msgClick(url, num, ids) {
+    msgClick(url, num, ids, type) {
       console.log(url)
       let wxType = getType()
       let appType = androidOrIOS()
       if (wxType) {
         if (url.weChatUrl) {
           if (!num) {
-            this.topRead(ids)
+            this.topRead(ids, type)
           }
           setTimeout(() => {
             location.href = url.weChatUrl

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

@@ -72,13 +72,14 @@ var vm = new Vue({
       this.tabsList.lists = []
       this.tabsData(this.isTabs)
     },
-    readed(ids) {
+    readed(ids, type) {
       const _this = this
       $.ajax({
         type:'GET',
         url:'/jymessageCenter/markRead',
         data: {
-          msgId: ids
+          msgId: ids,
+          msgType: type
         },
         success:function () {
           _this.tabsData(_this.isTabs)
@@ -87,18 +88,18 @@ var vm = new Vue({
         }
       })
     },
-    linked(id, url, str, num) {
+    linked(id, url, str, num, type) {
       if (url) {
         location.href = url
       }
       if (num == 1) {
         if (url) {
-          this.readed(id)
+          this.readed(id, type)
         }
       }
       if (num == 2) {
         if (!str) {
-          this.readed(id)
+          this.readed(id, type)
         }
       }
     }

src/web/staticres/js/login.js

@@ -421,6 +421,7 @@ var logic = function(data,num){
 			commonMouseEvent();
             message.checkMessage()
             message.init()
+            refreshTime()
 		}catch(e){}
 	}
 }
@@ -592,6 +593,19 @@ function clearLoginStorage (reg) {
   clearObjKeyForRegFn(localStorage, reg)
 }
 
+// 获取刷新消息数量接口时间
+function refreshTime() {
+  $.ajax({
+    type: 'GET',
+    url: '/jymessageCenter/setRefreshTime',
+    success: function (r) {
+      if (r.refreshTime > 0) {
+        localStorage.setItem('isRfresh', r.refreshTime)
+      }
+    }
+  })
+}
+
 
 //退出登录
 var signout = function(){
@@ -704,6 +718,7 @@ var haslogin = function(num,kyorpn,url){
 				infoListCss();
 				commonMouseEvent();
                 message.checkMessage()
+                refreshTime()
 			}catch(e){}
 		}else{
 			$("#login").html("<button class='loginBtn' data-toggle='modal' onclick='openLoginDig()'>登录</button>");

src/web/staticres/js/message.js

@@ -1,10 +1,11 @@
 // 点击置顶消息为已读
-function topRead(ids) {
+function topRead(ids, type) {
     $.ajax({
       type:'POST',
       url:'/jymessageCenter/markRead',
       data: {
-        msgId: ids
+        msgId: ids,
+        msgType: type
       },
       success:function (res) {
         console.log(res)
@@ -14,13 +15,13 @@ function topRead(ids) {
     })
   }
 // 消息悬浮窗列表跳转详情页
-function linked (ids, url, num) {
-    console.info(ids, url, num)
+function linked (ids, url, num, type) {
+    console.info(ids, url, num, type)
     if (url) {
         window.location.href = url
     }
     if (num == 0) {
-        topRead(ids)
+        topRead(ids, type)
     }
 }
 function Message() {
@@ -104,17 +105,17 @@ function Message() {
         var temp = ''
         if (lasts) {
             if (lasts.isRead == 0) {
-                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>'
+                temp += '<div id="firsted" class="m-li" onclick="linked(\''+lasts.id+'\',\''+lasts.link+'\',\''+lasts.isRead+'\',\''+lasts.msg_type+'\')"><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+'\',\''+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>'
+                temp += '<div id="firsted" class="m-li" onclick="linked(\''+lasts.id+'\',\''+lasts.link+'\',\''+lasts.isRead+'\',\''+lasts.msg_type+'\')"><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].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>'
+                    temp += '<div class="m-li" onclick="linked(\''+lists[i].id+'\',\''+lists[i].link+'\',\''+lists[i].isRead+'\',\''+lists[i].msg_type+'\')"><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].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>'
+                    temp += '<div class="m-li" onclick="linked(\''+lists[i].id+'\',\''+lists[i].link+'\',\''+lists[i].isRead+'\',\''+lists[i].msg_type+'\')"><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>'
                 }
             }
         }

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

@@ -22,7 +22,7 @@
 	  <section class="mesg-container" v-cloak>
         <div class="main-mesg">
           <h3>消息中心</h3>
-          <div class="tips" @click="linked(tabsList.lasts.id, tabsList.lasts.link, tabsList.lasts.isRead,1)" v-show="tabsList.lasts">
+          <div class="tips" @click="linked(tabsList.lasts.id, tabsList.lasts.link, tabsList.lasts.isRead,1,tabsList.lasts.msg_type)" v-show="tabsList.lasts">
             <div class="imgs">
               <img :src='imgSrcs[tabsList.lasts.msg_type].url' v-if="tabsList.lasts.msg_type">
               <i class="dots" v-if="tabsList.lasts.isRead == 0"></i>
@@ -46,7 +46,7 @@
                 <div
                   class="tips tab-tips"
                   v-for="(ite, indx) in tabsList.lists"
-                  @click="linked(ite.id, ite.link, ite.isRead,2)"
+                  @click="linked(ite.id, ite.link, ite.isRead,2,ite.msg_type)"
                   v-if="tabsList.lists"
                 >
                   <div class="imgs">

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

@@ -31,7 +31,7 @@
         <div class="j-main" v-show="msgList">
           <div class="head-mesg" v-show="!$.isEmptyObject(lastData)">
             <h5>重要提醒</h5>
-            <div class="h-conts" @click="msgClick(lastData.url,lastData.isRead,lastData.id)">
+            <div class="h-conts" @click="msgClick(lastData.url,lastData.isRead,lastData.id,lastData.msg_type)">
               <div class="p1">
                 <span class="spa-tit">{lastData.title}</span>
                 <span class="spa flex" @click.stop="toggleClick" v-show="isRow">{isToggle?'收起':'展开'}&nbsp;<van-icon :class="isToggle?'is-icon1':'is-icon2'" name="arrow-down" /></span>

src/web/templates/weixin/search/tabbar.html

@@ -25,7 +25,7 @@
         <img :src="props.active ? home.active : home.inactive" />
       </template>
     </van-tabbar-item>
-    <van-tabbar-item @click="routeHref('/swordfish/historypush',1)">
+    <van-tabbar-item @click="routeHref('/swordfish/newhistorypush',1)">
       <span>订阅</span>
       <template #icon="props">
         <img :src="props.active ? book.active : book.inactive" />