提交代码

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

@@ -72,3 +72,24 @@ function dateMatter(time, drag = 'normal') {
 
   return timeStr;
 }
+// 判断是否为微信浏览器
+function getType () {
+  var ua = window.navigator.userAgent.toLowerCase()
+  if(ua.match(/MicroMessenger/i) == 'micromessenger'){
+    return true
+  } else {
+    return false
+  }
+}
+
+// ios or android
+function androidOrIOS () {
+  var u = navigator.userAgent.toLowerCase()
+  var agent = null;
+  if (/iphone|ipod|ipad|ios/.test(u)) {
+    agent = 'ios'
+  } else if (/(Android)/i.test(u)) {
+    agent = 'android'
+  }
+  return agent
+}

src/jfw/modules/app/src/web/staticres/jyapp/js/message-index.js

@@ -1,4 +1,5 @@
-var temp = '<div class="side-line" v-if="lists.length"><div class="list-msg"><div class="l-msg"><div class="words" v-for="item in lists" :key="item.id"><img class="dot-img" src="../images/no-read-dot.png" v-if="item.isRead == 0"><img class="dot-img" src="../images/read-dot.png" v-else><h3 :class="{isActive: item.isRead == 0}">@@item.msg_type@@</h3><span @click="titleGoto(item.url)">@@item.title@@</span><p>@@item.createtime@@</p></div></div><img @click="gotoUrl" class="r-msg" src="../images/wx/jyxia.png"></div></div>'
+// app
+var temp = '<div class="side-line" v-if="lists.length"><div class="list-msg"><div class="l-msg"><div class="words" v-for="item in lists" :key="item.id"><img class="dot-img" src="../images/no-read-dot.png" v-if="item.isRead == 0"><img class="dot-img" src="../images/read-dot.png" v-else><h3 :class="{isActive: item.isRead == 0}">@@item.msg_type@@</h3><span @click="titleGoto(item)">@@item.title@@</span><p>@@item.createtime@@</p></div></div><img @click="gotoUrl" class="r-msg" src="../images/wx/jyxia.png"></div></div>'
 
 var vm = new Vue({
   el: '#vue-message-index-app',
@@ -25,17 +26,69 @@ var vm = new Vue({
               v.createtime = dateMatter(v.createtime, 'nor')
             });
             _this.lists = res.data
+            window.localStorage.setItem('noMesg',res.count)
+          } else {
+            window.localStorage.setItem('noMesg', 0)
           }
-          window.localStorage.setItem('noMesg', _this.lists.length)
         },
         error:function () {
           window.localStorage.setItem('noMesg', 0)
         }
       })
     },
-    titleGoto(url) {
-      if (url.link) {
-        location.href = url.link
+    topRead(ids, type, url) {
+      const _this = this
+      $.ajax({
+        type: 'POST',
+        url:'/jymessageCenter/markRead',
+        data: {
+          msgId: ids,
+          msgType: type
+        },
+        success:function () {
+          if (url) {
+            location.href = url
+          } else {
+            _this.getList()
+          }
+        }
+      })
+    },
+    titleGoto(item) {
+      let wxType = getType()
+      let appType = androidOrIOS()
+      let urls = item.url
+      if (wxType) {
+        if (item.isRead == 0) {
+          this.topRead(item.id, urls.weChatUrl, item.msg_type)
+        } else {
+          if (urls.weChatUrl) {
+            //链接中如果是www.jianyu360.cn域名，微信中会唤起app，该用window.open
+            window.open(urls.weChatUrl);
+          }
+        }
+      } else {
+        if (appType == 'android') {
+          if (item.isRead == 0) {
+            this.topRead(item.id, urls.androidUrl, item.msg_type)
+          } else {
+            if (urls.androidUrl) {
+              location.href = urls.androidUrl
+            } else {
+              return
+            }
+          }
+        } else {
+          if (item.isRead == 0) {
+            this.topRead(item.id, urls.iosUrl, item.msg_type)
+          } else {
+            if (urls.iosUrl) {
+              location.href = urls.iosUrl
+            } else {
+              return
+            }
+          }
+        }
       }
     },
     gotoUrl() {

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

@@ -118,8 +118,8 @@ var vm = new Vue({
         } else {
           if (url.weChatUrl) {
             //location.href = url.weChatUrl
-        	//链接中如果是www.jianyu360.cn域名，微信中会唤起app，该用window.open
-			window.open(url.weChatUrl);
+            //链接中如果是www.jianyu360.cn域名，微信中会唤起app，该用window.open
+            window.open(url.weChatUrl);
           }
         }
       } else {

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

@@ -1,4 +1,5 @@
-var temp = '<div class="side-line" v-if="lists.length"><div class="list-msg"><div class="l-msg"><div class="words" v-for="item in lists" :key="item.id"><img class="dot-img" src="../image/no-read-dot.png" v-if="item.isRead == 0"><img class="dot-img" src="../image/read-dot.png" v-else><h3 :class="{isActive: item.isRead == 0}">@@item.msg_type@@</h3><span @click="titleGoto(item.url)">@@item.title@@</span><p>@@item.createtime@@</p></div></div><img @click="gotoUrl" class="r-msg" src="../image/jyxia.png"></div></div>'
+// 微信端
+var temp = '<div class="side-line" v-if="lists.length"><div class="list-msg"><div class="l-msg"><div class="words" v-for="item in lists" :key="item.id"><img class="dot-img" src="../image/no-read-dot.png" v-if="item.isRead == 0"><img class="dot-img" src="../image/read-dot.png" v-else><h3 :class="{isActive: item.isRead == 0}">@@item.msg_type@@</h3><span @click="titleGoto(item)">@@item.title@@</span><p>@@item.createtime@@</p></div></div><img @click="gotoUrl" class="r-msg" src="../image/jyxia.png"></div></div>'
 
 var vm = new Vue({
   el: '#vue-message-index-app',
@@ -25,37 +26,67 @@ var vm = new Vue({
               v.createtime = dateMatter(v.createtime, 'out')
             });
             _this.lists = res.data
+            window.localStorage.setItem('noMesg',res.count)
+          } else {
+            window.localStorage.setItem('noMesg', 0)
           }
-          window.localStorage.setItem('noMesg', _this.lists.length)
         },
         error:function () {
           window.localStorage.setItem('noMesg', 0)
         }
       })
     },
-    titleGoto(url) {
+    topRead(ids, type, url) {
+      const _this = this
+      $.ajax({
+        type: 'POST',
+        url:'/jymessageCenter/markRead',
+        data: {
+          msgId: ids,
+          msgType: type
+        },
+        success:function () {
+          if (url) {
+            location.href = url
+          } else {
+            _this.getList()
+          }
+        }
+      })
+    },
+    titleGoto(item) {
       let wxType = getType()
       let appType = androidOrIOS()
+      let urls = item.url
       if (wxType) {
-        if (url.weChatUrl) {
-          //location.href = url.weChatUrl
-          //链接中如果是www.jianyu360.cn域名，微信中会唤起app，该用window.open
-          window.open(url.weChatUrl);
+        if (item.isRead == 0) {
+          this.topRead(item.id, urls.weChatUrl, item.msg_type)
         } else {
-          return
+          if (urls.weChatUrl) {
+            //链接中如果是www.jianyu360.cn域名，微信中会唤起app，该用window.open
+            window.open(urls.weChatUrl);
+          }
         }
       } else {
         if (appType == 'android') {
-          if (url.androidUrl) {
-            location.href = url.androidUrl
+          if (item.isRead == 0) {
+            this.topRead(item.id, urls.androidUrl, item.msg_type)
           } else {
-            return
+            if (urls.androidUrl) {
+              location.href = urls.androidUrl
+            } else {
+              return
+            }
           }
         } else {
-          if (url.iosUrl) {
-            location.href = url.iosUrl
+          if (item.isRead == 0) {
+            this.topRead(item.id, urls.iosUrl, item.msg_type)
           } else {
-            return
+            if (urls.iosUrl) {
+              location.href = urls.iosUrl
+            } else {
+              return
+            }
           }
         }
       }

src/web/staticres/js/config.json

@@ -1,55 +0,0 @@
-{
-	"webPort": "813",
-    "userInEntLimit":9999,
-    "associationLimit":5,
-    "followProject": {
-        "normal": 10,
-        "bigVip": 500
-    },
-    "followCustomer": {
-        "customerNumb": 500
-    },
-    "claimCustomer": {
-        "customerNumb": 500
-    },
-    "customerNumb": {
-        "enterpriseNumb": 500,
-        "personalNumb": 3
-    },
-    "itemsNumber": 10000000,
-    "followPushRpc": "127.0.0.1:8759",
-    "portraitTestData":1574524800,
-    "portraitPool": 5,
-    "portraitCacheDay": 1,
-    "oneAreaTimesBuyer": 20,
-    "recommendThreshold": 0.5,
-    "customers":[
-    	{
-			"name":"赵秀臻",
-			"wxer":"/big-member/image/customer/customer-wx-new.png"
-		}
-    ],
-    "entcustomer": [
-    "吉林省农村信用社联合社",
-    "包头职业技术学院",
-    "中国民生银行股份有限公司",
-    "广东烟草梅州市有限公司",
-    "宁波市自然资源和规划局",
-    "正数网络技术有限公司",
-    "浙江创联信息技术股份有限公司",
-    "甘肃省农村信用社联合社",
-    "广西壮族自治区自然资源厅",
-    "华数传媒网络有限公司",
-    "无锡地铁集团有限公司",
-    "天津银行股份有限公司",
-    "广州信息投资有限公司",
-    "国联证券股份有限公司",
-    "北京航空航天大学宁波创新研究院",
-    "湖北省卫生健康委员会",
-    "上海浦东发展银行股份有限公司信用卡中心",
-    "上海市房屋管理局",
-    "长三角金融科技有限公司",
-    "华能信息技术有限公司",
-    "浙江华数广电网络股份有限公司"
-  ]
-}

src/web/staticres/js/login.js

@@ -412,19 +412,20 @@ function checkCounts() {
 
                             // 点击时桌面消息时触发
                             notify.onclick = () => {
-                                if (datas.url.link) {
-                                    location.href = datas.url.link
+                                if (datas.link) {
+                                    location.href = datas.link
                                 } else {
                                     return
                                 }
                             }
+                            localStorage.setItem('noMesg', num)
                         }
                     },
                     error: function () {
                         clearInterval(timer)
                     }
                 })
-            }, 300000)
+            }, 10000)
         } else {
             Notification.requestPermission()
         }

src/web/staticres/js/pc-message-index.js

@@ -1,4 +1,4 @@
-var temp = '<div :class="{noActive: lists.length == 0}"><div class="list-msg" v-if="lists.length"><div class="l-msg"><div class="words" v-for="item in lists" :key="item.id"><i v-show="item.isRead == 0"></i><h3 :class="{isActive: item.isRead == 0}">@@item.msg_type@@</h3><span @click="titleGoto(item.url)">@@item.title@@</span><p>@@item.createtime@@</p></div></div><img @click="gotoUrl" class="r-msg" src="/images/pc/msg-arrow.png"></div></div>'
+var temp = '<div :class="{noActive: lists.length == 0}"><div class="list-msg" v-if="lists.length"><div class="l-msg"><div class="words" v-for="item in lists" :key="item.id"><i v-show="item.isRead == 0"></i><h3 :class="{isActive: item.isRead == 1}">@@item.msg_type@@</h3><span @click="titleGoto(item)">@@item.title@@</span><p>@@item.createtime@@</p></div></div><img @click="gotoUrl" class="r-msg" src="/images/pc/msg-arrow.png"></div></div>'
 
 var vm = new Vue({
   el: '#vue-message-index-pc',
@@ -25,17 +25,41 @@ var vm = new Vue({
               v.createtime = dateMatter(v.createtime)
             });
             _this.lists = res.data
+            window.localStorage.setItem('noMesg',res.count)
+          } else {
+            window.localStorage.setItem('noMesg', 0)
           }
-          window.localStorage.setItem('noMesg',res.count)
         },
         error:function () {
           window.localStorage.setItem('noMesg', 0)
         }
       })
     },
-    titleGoto(url) {
-      if (url.link) {
-        location.href = url.link
+    readed(ids, type, url) {
+      const _this = this
+      $.ajax({
+        type: 'POST',
+        url:'/jymessageCenter/markRead',
+        data: {
+          msgId: ids,
+          msgType: type
+        },
+        success:function () {
+          if (url) {
+            location.href = url
+          } else {
+            _this.getList()
+          }
+        }
+      })
+    },
+    titleGoto(item) {
+      if (item.isRead == 0) {
+        this.readed(item.id, item.msg_type, item.link)
+      } else {
+        if (item.link) {
+          location.href = item.link
+        }
       }
     },
     gotoUrl() {

src/web/templates/pc/index.html

@@ -1092,7 +1092,7 @@ $('.carousel-one').carousel({
 })
 //最新公告信息
 var noMesg = window.localStorage.getItem('noMesg')
-if (noMesg == 0) {
+if (noMesg == 0 || noMesg == undefined) {
   $(".newNotice").css('marginTop', '192px')
 } else {
   $(".newNotice").css('marginTop', '112px')