提交代码

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

@@ -23,11 +23,11 @@
     </div>
     <div class="j-main detailed">
       <div class="j-container">
-        <div class="j-main descri">
+        <div class="j-main descri" id="descri">
           <van-list
             v-model="tabsList.loading"
             :finished="tabsList.finished"
-            finished-text="没有更多了"
+            finished-text=""
             @load="msgData"
           >
             <div class="d-list" v-for="item in lists" :key="item.id">

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

@@ -57,6 +57,7 @@
   <script src='https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js'></script>
   <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
   <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
+  <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/big-member/js/utils.js?v={{Msg "seo" "version"}}'></script>
   <!--E-当前页面的资源-->
   {{include "/big-member/commonjs.html"}}
   <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>

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

@@ -4,6 +4,7 @@ var vm = new Vue({
   data () {
     return {
       tit: '',
+      refreshing: false,
       imgSrcs: [
         {title: '活动优惠', url:'huodong'},
         {title: '服务通知', url:'fuwu'},{title: '订阅消息', url:'dingyue'},
@@ -28,9 +29,12 @@ var vm = new Vue({
     let indx = getQueryString('type')
     this.tit = this.imgSrcs[indx - 1].title
     document.title = this.imgSrcs[indx - 1].title
-    console.info(document.title,this.tit)
     this.msgData()
   },
+  updated() {
+    let el = document.getElementById('descri')
+    el.scrollTop = el.scrollHeight
+  },
   methods: {
     // 消息详情
     msgData() {
@@ -56,8 +60,8 @@ var vm = new Vue({
               }
             }
             if (Array.isArray(r.data.list) && r.data.list.length !== 0) {
-              _this.lists = _this.lists.concat(r.data.list.map(function (v) {
-                return {
+              r.data.list.map(function (v) {
+                _this.lists.unshift({
                   id: v.id,
                   msg_type: v.msg_type,
                   title: v.title,
@@ -65,8 +69,8 @@ var vm = new Vue({
                   createtime: v.createtime,
                   link: v.link,
                   url: v.url
-                }
-              }))
+                })
+              })
             } else {
               _this.tabsList.finished = true
             }
@@ -79,6 +83,15 @@ var vm = new Vue({
         }
       })
     },
+    onRefresh() {
+      // 清空列表数据
+      this.tabsList.finished = false
+
+      // 重新加载数据
+      // 将 loading 设置为 true，表示处于加载状态
+      this.tabsList.loading = true
+      this.msgData()
+    },
     msgClick(url) {
       let wxType = getType()
       let appType = androidOrIOS()

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

@@ -7,6 +7,7 @@ var vm = new Vue({
       isRow: false,
       lastData: [],
       msgList: [],
+      timer: null,
       imgSrcs: [
         {title: '活动优惠', url:'huodong'},
         {title: '服务通知', url:'fuwu'},{title: '订阅消息', url:'dingyue'},
@@ -19,6 +20,23 @@ var vm = new Vue({
     this.lastMsg()
     this.msgData()
   },
+  mounted () {
+    let wxType = getType()
+    // let appType = androidOrIOS()
+    // if (appType == 'ios') {
+    //   utils.iosBackRefresh()
+    // }
+    // this.timer = setInterval(() => {
+      this.lastMsg()
+      this.msgData()
+      if (!wxType) {
+        checkMsgCount(true)
+      }
+    // },3000)
+  },
+  beforeDestroy() {
+    clearInterval(this.timer)
+  },
   methods: {
     // 置顶消息
     lastMsg() {

src/web/staticres/js/message.js

@@ -80,9 +80,9 @@ function Message() {
         var lasts = $.isEmptyObject(messageInfoList.last) ? false : messageInfoList.last, temp = ''
         if (lasts) {
             if (lasts.isRead == 0) {
-                temp += '<div id="firsted" class="m-li" onclick="linked('+lasts.link+')"><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+')"><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.link+')"><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+')"><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) {

src/web/templates/common/pchead.html

@@ -163,10 +163,8 @@
         min-width: inherit !important;
     }
     #public-nav .iner .jynav li:nth-child(6){
-        padding-right: 8px !important;
-    }
-    #public-nav .iner .jynav li:nth-child(6) a{
-        display: inherit;
+        height: 63px;
+        margin-left: 23px;
     }
     #public-nav .iner .jynav li .jynav-list{
         display: flex;
@@ -230,22 +228,31 @@
         width: 24px;
         vertical-align: middle;
     }
-    /* #public-nav .iner .jynav li .msg-img1 {
+    #public-nav .iner .jynav li .msg-img2 {
+        display: none;
+    }
+    #public-nav[data-theme] .iner .jynav li .img-flex {
+        display: flex;
+        flex-direction: column;
+    }
+    #public-nav[data-theme] .iner .jynav li .msg-img1,#public-nav[data-theme] .iner .jynav li .msg-img2 {
+        position: absolute;
+        left: 0;
+        top: 20px;
+    }
+    #public-nav[data-theme] .iner .jynav li .msg-img1 {
         opacity: 0;
-    } */
+    }
     #public-nav[data-theme="light"] .iner .jynav li .msg-img1[data-theme='light'] {
         opacity: 1;
     }
     #public-nav[data-theme="dark"] .iner .jynav li .msg-img1[data-theme='dark'] {
         opacity: 1;
     }
-    #public-nav .iner .jynav li .msg-img2 {
-        display: none;
-    }
     #public-nav .iner .jynav li .tips {
         display: none;
         position: absolute;
-        left: 38px;
+        left: 14px;
         top: 16px;
         height: 18px;
         line-height: 16px;
@@ -278,6 +285,7 @@
         background: #ffffff;
         border-radius: 0px 0px 8px 8px;
         box-shadow: 0px 6px 8px 0px rgba(0,0,0,0.08);
+        margin-top: 63px;
     }
     #public-nav .iner .jynav li .jy-list-msg .msg-par {
         display: flex;
@@ -386,7 +394,6 @@
         line-height: 22px;
     }
     #public-nav .iner .jynav li .jy-list-msg .msg-par .m-foot {
-        /* width: 100%; */
         padding: 12px 0;
         display: flex;
         justify-content: center;
@@ -552,6 +559,7 @@
     }
     #public-nav .useronline{
       height: 50px;
+      margin-left: 20px;
     }
 </style>
 <style type="text/css">
@@ -722,8 +730,10 @@
 				</li>
                 <li  name="消息" id="noticed" style="display: none;">
                     <a href="/swordfish/frontPage/messageCenter/sess/index">
-                        <img src='{{Msg "seo" "cdn"}}/images/pc/mesg.png?v={{Msg "seo" "version"}}' class="jy-nav-msg msg-img1" alt="" />
-                        <!-- <img data-theme="dark" src='{{Msg "seo" "cdn"}}/images/pc/mesg_fff.png?v={{Msg "seo" "version"}}' class="jy-nav-msg msg-img1" alt="" /> -->
+                        <div class="img-flex">
+                            <img data-theme="light" src='{{Msg "seo" "cdn"}}/images/pc/mesg.png?v={{Msg "seo" "version"}}' class="jy-nav-msg msg-img1" alt="" />
+                            <img data-theme="dark" src='{{Msg "seo" "cdn"}}/images/pc/mesg_fff.png?v={{Msg "seo" "version"}}' class="jy-nav-msg msg-img1" alt="" />
+                        </div>
                         <img src='{{Msg "seo" "cdn"}}/images/pc/mesg_active.png?v={{Msg "seo" "version"}}' class="jy-nav-msg msg-img2" alt="" />
                         <span class="tips" id="tips"></span>
                     </a>
@@ -951,8 +961,9 @@
     window.addEventListener('scroll', docScroll, true)
     // 消息悬浮窗列表跳转详情页
     function linked(url) {
-        console.info('url'+url)
         if (url) {
+            message.checkMessage()
+            message.checkOpened()
             location.href = url
         } else {
             return

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

@@ -28,7 +28,7 @@
     <!-- {{include "/big-member/header.html"}} -->
     <div class="j-main detailed" id="detailed" v-cloak>
       <div class="j-container">
-        <div class="j-main descri">
+        <div class="j-main descri" id="descri">
           <van-list
             v-model="tabsList.loading"
             :finished="tabsList.finished"

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

@@ -66,6 +66,7 @@
   <script src=https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
   <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
   <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
+  <script src='{{Msg "seo" "cdn"}}/big-member/js/utils.js?v={{Msg "seo" "version"}}'></script>
   <!--E-当前页面的资源-->
   {{include "/big-member/commonjs.html"}}
   <script src='{{Msg "seo" "cdn"}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>