提交代码

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

@@ -34,10 +34,9 @@
               <p class="p-time">{dateMatter(item.createtime, 'in')}</p>
               <div class="words">
                 <img :src="'/common-module/messageCenter/image/'+imgSrcs[item.msg_type - 1].url+'@2x.png'">
-                <div class="m-tip" @click="msgClick(item.link)">
+                <div class="m-tip" @click="msgClick(item.url)">
                   <span class="trangle"></span>
                   <p class="p1">{item.title}</p>
-                  <!-- <p class="p2">{item.content}<i @click="msgClick(item.link)">点击立即支付＞＞</i></p> -->
                   <p class="p2">{item.content}</p>
                 </div>
               </div>

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

@@ -23,12 +23,11 @@
         <div class="j-main" v-show="msgList">
           <div class="head-mesg" v-show="!$.isEmptyObject(lastData)">
             <h5>重要提醒</h5>
-            <div class="h-conts" @click="msgClick(lastData.link,lastData.isRead,lastData.id)">
+            <div class="h-conts" @click="msgClick(lastData.url,lastData.isRead,lastData.id)">
               <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>
               </div>
-              <!-- <p class="p2" :class="{'active':isRow && !isToggle}">{lastData.content}<i @click="msgClick(lastData.link)">点击立即支付＞＞</i></p> -->
               <p class="p2" :class="{'active':isRow && !isToggle}">{lastData.content}</p>
             </div>
           </div>

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

@@ -63,7 +63,8 @@ var vm = new Vue({
                   title: v.title,
                   content: v.content,
                   createtime: v.createtime,
-                  link: v.link
+                  link: v.link,
+                  url: v.url
                 }
               }))
             } else {
@@ -79,10 +80,28 @@ var vm = new Vue({
       })
     },
     msgClick(url) {
-      if (url) {
-        location.href = url
+      let wxType = getType()
+      let appType = androidOrIOS()
+      if (wxType) {
+        if (url.weChatUrl) {
+          location.href = url.weChatUrl
+        } else {
+          return
+        }
       } else {
-        return
+        if (appType == 'android') {
+          if (url.androidUrl) {
+            location.href = url.androidUrl
+          } else {
+            return
+          }
+        } else {
+          if (url.iosUrl) {
+            location.href = url.iosUrl
+          } else {
+            return
+          }
+        }
       }
     }
   }

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

@@ -1,5 +1,6 @@
+
+// 判断是否为微信浏览器
 function getType () {
-  // 判断是否为微信浏览器
   var ua = window.navigator.userAgent.toLowerCase()
   if(ua.match(/MicroMessenger/i) == 'micromessenger'){
     return true
@@ -8,6 +9,18 @@ function getType () {
   }
 }
 
+// ios or android
+function androidOrIOS () {
+  var u = navigator.userAgent.toLowerCase();
+  var agent = null;
+  if (/iphone|ipod|ipad|ios/.test(u)) {
+    agent = 'ios'
+  } else {
+    agent = 'android'
+  }
+  return agent
+}
+
 //获取url中"?"符后的字符串并正则匹配
 function getQueryString(name) {
   var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");

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

@@ -83,20 +83,44 @@ var vm = new Vue({
     // 置顶消息跳转
     msgClick(url, num, ids) {
       console.log(url)
-      if (url) {
-        location.href = url
-        if (!num) {
-          this.topRead(ids)
+      let wxType = getType()
+      let appType = androidOrIOS()
+      if (wxType) {
+        if (url.weChatUrl) {
+          location.href = url.weChatUrl
+          if (!num) {
+            this.topRead(ids)
+          }
+        } else {
+          return
         }
       } else {
-        return
+        if (appType == 'android') {
+          if (url.androidUrl) {
+            location.href = url.androidUrl
+            if (!num) {
+              this.topRead(ids)
+            }
+          } else {
+            return
+          }
+        } else {
+          if (url.iosUrl) {
+            location.href = url.iosUrl
+            if (!num) {
+              this.topRead(ids)
+            }
+          } else {
+            return
+          }
+        }
       }
     },
     // 置顶消息展开，收起
     toggleClick() {
       this.isToggle = !this.isToggle
     },
-    // 列表消息跳转
+    // 列表消息跳转详情页
     msgDetailed(type, num) {
       let wxType = getType()
       if (num) {

src/web/staticres/js/message.js

@@ -79,11 +79,19 @@ function Message() {
 
         var lasts = $.isEmptyObject(messageInfoList.last) ? false : messageInfoList.last, temp = ''
         if (lasts) {
-            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>'
+            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>'
+            } 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>'
+            }
         }
         if (lists) {
             for (var i = 0; i < lists.length; i++) {
-                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>'
+                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>'
+                } 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>'
+                }
             }
         }
         var tempNo = '<div class="no-datas"><img src="/frontRouter/pc/mesgCenter/image/no-mesg.png"><div class="tip-text"><p>暂未接收到信息</p></div></div>'

src/web/templates/common/pchead.html

@@ -230,6 +230,15 @@
         width: 24px;
         vertical-align: middle;
     }
+    /* #public-nav .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;
     }
@@ -308,6 +317,16 @@
         flex: 1;
         overflow-y: scroll;
     }
+    #public-nav .iner .jynav li .jy-list-msg .msg-par .m-ul .lis-cont .dots {
+        position: absolute;
+        left: 28px;
+        top: 7px;
+        width: 6px;
+        height: 6px;
+        background: #fb483d;
+        border: 1px solid #ffffff;
+        border-radius: 50%;
+    }
     #public-nav .iner .jynav li .jy-list-msg .msg-par .m-ul .m-li {
         padding: 12px 24px!important;
     }
@@ -316,6 +335,7 @@
         background: #f5f6f7;
     }
     #public-nav .iner .jynav li .jy-list-msg .msg-par .m-ul .m-li .lis-cont {
+        position: relative;
         display: flex;
         flex-direction: initial;
     }
@@ -703,6 +723,7 @@
                 <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="" /> -->
                         <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>

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

@@ -39,10 +39,9 @@
               <p class="p-time">{dateMatter(item.createtime, 'in')}</p>
               <div class="words">
                 <img :src="'/common-module/messageCenter/image/'+imgSrcs[item.msg_type - 1].url+'@2x.png'">
-                <div class="m-tip" @click="msgClick(item.link)">
+                <div class="m-tip" @click="msgClick(item.url)">
                   <span class="trangle"></span>
                   <p class="p1">{item.title}</p>
-                  <!-- <p class="p2">{item.content}<i @click="msgClick(item.link)">点击立即支付＞＞</i></p> -->
                   <p class="p2">{item.content}</p>
                 </div>
               </div>

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

@@ -31,11 +31,11 @@
         <div class="j-main" v-show="msgList">
           <div class="head-mesg" v-show="lastData">
             <h5>重要提醒</h5>
-            <div class="h-conts" @click="msgClick(lastData.link,lastData.isRead,lastData.id)">
-              <div class="p1">{lastData.title}
-                <span class="spa flex" @click="toggleClick" v-show="isRow">{isToggle?'收起':'展开'}&nbsp;<van-icon :class="isToggle?'is-icon1':'is-icon2'" name="arrow-down" /></span>
+            <div class="h-conts" @click="msgClick(lastData.url,lastData.isRead,lastData.id)">
+              <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>
               </div>
-              <!-- <p class="p2" :class="{'active':isRow && !isToggle}">{lastData.content}<i @click="msgClick(lastData.link)">点击立即支付＞＞</i></p> -->
               <p class="p2" :class="{'active':isRow && !isToggle}">{lastData.content}</p>
             </div>
           </div>