提交代码

src/jfw/modules/app/src/web/staticres/jyapp/css/p13.css

@@ -409,3 +409,79 @@
 }
 /* -e page 订阅*/
 /* -E p13 */
+
+/* 消息展示 */
+.p13 .home .side-line {
+    padding: 0.16rem 0;
+    background: #F5F6F7;
+}
+.p13 .home .list-msg {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: .24rem .32rem .16rem .32rem;
+    background: #fff;
+}
+.p13 .home .list-msg .l-msg .words {
+    width: 6.3rem;
+    display: flex;
+    flex-direction: initial;
+    align-items: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+.p13 .home .list-msg .l-msg .words:nth-child(2) {
+    margin-top: 0.16rem;
+}
+.p13 .home .list-msg .r-msg {
+    width: .22rem;
+    height: .14rem;
+    cursor: pointer;
+    transform:rotate(-90deg);
+    -ms-transform:rotate(-90deg); 	/* IE 9 */
+    -moz-transform:rotate(-90deg); 	/* Firefox */
+    -webkit-transform:rotate(-90deg); /* Safari 和 Chrome */
+    -o-transform:rotate(-90deg);
+}
+.p13 .home .list-msg .l-msg .words i {
+    width: .08rem;
+    height: .08rem;
+    background: #FF3A20;
+    border: 1px solid #FFFFFF;
+    border-radius: 50%;
+    margin-right: .16rem;
+    box-sizing: content-box;
+}
+.p13 .home .list-msg .l-msg .words .dotActive {
+    background: #EDEFF2;
+}
+.p13 .home .list-msg .l-msg .words h3 {
+    font-size: .24rem;
+    font-weight: bold;
+    color: #171826;
+    line-height: .48rem;
+}
+.p13 .home .list-msg .l-msg .words span {
+    font-size: .22rem;
+    line-height: .48rem;
+    margin: 0 .24rem;
+}
+.p13 .home .list-msg .l-msg .words .spActive {
+    max-width: 3rem;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+.p13 .home .list-msg .l-msg .words span:hover {
+    color: #2CB7CA;
+    cursor: pointer;
+}
+.p13 .home .list-msg .l-msg .words p {
+    font-size: 12px;
+    color: #9B9CA3;
+    line-height: .48rem;
+}
+.p13 .home .list-msg .l-msg .words .isActive {
+    /* margin-left: 15px; */
+}

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

@@ -0,0 +1,74 @@
+function dateTime(date, fmt) {
+  if (fmt === void 0) {
+    fmt = 'yyyy年MM月dd日 hh:mm';
+  }
+
+  // 时间戳转换
+  if (!date) return '';
+  var d = new Date(date);
+  var o = {
+    "M+": d.getMonth() + 1,
+    //月份
+    "d+": d.getDate(),
+    //日
+    "h+": d.getHours(),
+    //小时
+    "m+": d.getMinutes(),
+    //分
+    "s+": d.getSeconds() //秒
+
+  }; // 根据y的长度来截取年
+
+  if (/(y+)/.test(fmt)) {
+    fmt = fmt.replace(RegExp.$1, (d.getFullYear() + "").substr(4 - RegExp.$1.length));
+  }
+
+  for (var k in o) {
+    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length));
+  }
+
+  return fmt;
+}
+
+function dateYear() {
+  // 获取当年的第一天
+  var date = new Date();
+  date.setDate(1);
+  date.setMonth(0);
+  return date.getTime();
+}
+
+function dateLast() {
+  // 获取昨天
+  var day = new Date();
+  day.setTime(day.getTime() - 24 * 60 * 60 * 1000);
+  return dateTime(day, 'yyyy/MM/dd');
+}
+
+function dateMatter(time, drag = 'normal') {
+  // 时间转换
+  var timeStr = '';
+  var currentDay = dateTime(time, 'yyyy/MM/dd'); // 当前日期
+
+  var lingDay = new Date(new Date().toLocaleDateString()).getTime(); // 获取当天0点
+
+  var isTime = new Date(time) - lingDay;
+  var diff = isTime < 0 ? '昨天' : '';
+  var isDate = new Date(time) - dateYear();
+
+  if (isDate < 0) {
+    drag == 'normal' ? timeStr = dateTime(time) : timeStr = dateTime(time, 'yyyy年MM月dd日');
+  } else {
+    if (currentDay === dateLast()) {
+      drag == 'normal' ? timeStr = diff + dateTime(time, 'hh:mm') : timeStr = diff;
+    } else {
+      if (isTime < 0) {
+        drag == 'normal' ? timeStr = dateTime(time, 'MM月dd日 hh:mm') : timeStr = dateTime(time, 'MM月dd日');
+      } else {
+        timeStr = dateTime(time, 'hh:mm');
+      }
+    }
+  }
+
+  return timeStr;
+}

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

@@ -0,0 +1,99 @@
+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"><i :class="{dotActive: item.isRead == 0}"></i><h3 :class="{isActive: item.isRead == 0}">@@item.msg_type@@</h3><span :class="{spActive:item.title.length > 12}" @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>'
+
+var vm = new Vue({
+  el: '#vue-message-index-app',
+  delimiters: ['@@', '@@'],
+  template: temp,
+  data: function () {
+    return {
+      lists: []
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      // var _this = this
+      // $.ajax({
+      //   type:'POST',
+      //   url:'/jymessageCenter/latestNews',
+      //   success:function (res) {
+      //     if (res.data) {
+      //       res.data.forEach(v => {
+      //         v.msg_type = _this.msgType(v.msg_type)
+      //         v.createtime = dateMatter(v.createtime, 'nor')
+      //       });
+      //       _this.lists = res.data
+      //     }
+          this.lists = [
+            {
+              "appid": "10000",
+              "cite_id": 0,
+              "content": "测试",
+              "createtime": dateMatter("2022-03-06 17:12:28", 'nor'),
+              "id": "3600015",
+              "isRead": 1,
+              "link": "",
+              "msgLogId": 1504,
+              "msg_type": '服务通知',
+              "receive_name": "哎呦呵。。。",
+              "send_name": "剑鱼后台",
+              "send_userid": "qmx",
+              "title": "卢雯娜服务通知卢雯娜服务",
+              "url": {
+                "androidUrl": "",
+                "iosUrl": "",
+                "weChatUrl": "https://web2-jytest.jydev.jianyu360.com/front/vipsubscribe/vipsubscribe_new"
+              }
+            },
+            {
+              "appid": "",
+              "cite_id": 0,
+              "content": "卢雯娜服务通知",
+              "createtime": dateMatter("2021-12-22 10:45:30", 'nor'),
+              "id": "3583101",
+              "isRead": 1,
+              "link": "",
+              "msgLogId": 1503,
+              "msg_type": '系统通知',
+              "receive_name": "哎呦呵。。。",
+              "send_name": "剑鱼后台",
+              "send_userid": "qmx",
+              "title": "卢雯娜服务通知卢雯娜服务通知卢雯娜服务通知卢雯娜服务通知",
+              "url": {
+                "androidUrl": "",
+                "iosUrl": "",
+                "weChatUrl": ""
+              }
+            }
+          ]
+          window.localStorage.setItem('noMesg', _this.lists.length)
+      //   },
+      //   error:function () {
+      //     window.localStorage.setItem('noMesg', 0)
+      //   }
+      // })
+    },
+    titleGoto(url) {
+      if (url.link) {
+        location.href = url.link
+      }
+    },
+    gotoUrl() {
+      location.href = '/swordfish/frontPage/messageCenter/sess/index'
+    },
+    msgType(val) {
+      const obj = {
+        '1': '活动优惠',
+        '2': '服务通知',
+        '3': '订阅消息',
+        '4': '项目动态 ',
+        '5': '企业动态',
+        '6': '分析报告 ',
+        '7': '系统通知',
+      }
+      return obj[val]
+    }
+  }
+})

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -342,6 +342,8 @@
                     </a>
                 </div>
             </div>
+            <!-- 消息展示 -->
+            <div id="vue-message-index-app"></div>
             <!-- 最新标讯 -->
             <div class="home_data">
                 <h3 class="data_nav">最新标讯</h3>
@@ -641,6 +643,8 @@
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/js/industry-mobile.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/ent-search/ent-search-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/searchindex.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/dateFunc.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/message-index.js?v={{Msg "seo" "version"}}'></script>
 <script>
   // 获取是否是商机管理
   function getNewEntNiche () {

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

@@ -145,6 +145,9 @@
 .main-mesg .tabs-mesg .el-tabs .el-tabs__content {
   padding: 8px 0;
 }
+.main-mesg .tabs-mesg .el-tabs .el-tabs__content .el-loading-mask {
+  z-index: 99;
+}
 .main-mesg .is-tabs .el-tabs .el-tabs__content {
   padding-bottom: 16px;
 }

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

@@ -4,6 +4,7 @@ var vm = new Vue({
   delimiters: ['{', '}'],
   data: function () {
     return {
+      loading: false,
       activeName: '0',
       counts: [],
       isTabs: '',
@@ -29,7 +30,6 @@ var vm = new Vue({
   methods: {
     tabClick(val) {
       this.isTabs = val.name
-      this.tabsList.lists = []
       this.tabsList.offset = 1
       this.tabsData(val.name)
     },
@@ -48,6 +48,7 @@ var vm = new Vue({
     },
     tabsData(num) {
       const _this = this
+      this.loading = true
       $.ajax({
         type:'POST',
         url:'/jymessageCenter/messageList',
@@ -59,7 +60,11 @@ var vm = new Vue({
           pageSize: this.tabsList.pageSize
         },
         success:function (res) {
+          setTimeout(() => {
+            _this.loading = false
+          }, 300)
           if (res && res.status == 1) {
+            _this.tabsList.lists = []
             _this.tabsList.lasts = $.isEmptyObject(res.data.last) ? false : res.data.last
             _this.tabsList.lists = $.isEmptyObject(res.data.list) ? false : res.data.list
             _this.tabsList.totals = res.data.total
@@ -69,7 +74,6 @@ var vm = new Vue({
     },
     onPageChange(page) {
       this.tabsList.offset = page
-      this.tabsList.lists = []
       this.tabsData(this.isTabs)
     },
     readed(ids, type, url) {

src/web/staticres/js/dateFunc.js

@@ -45,7 +45,7 @@ function dateLast() {
   return dateTime(day, 'yyyy/MM/dd');
 }
 
-function dateMatter(time) {
+function dateMatter(time, drag = 'normal') {
   // 时间转换
   var timeStr = '';
   var currentDay = dateTime(time, 'yyyy/MM/dd'); // 当前日期
@@ -57,13 +57,13 @@ function dateMatter(time) {
   var isDate = new Date(time) - dateYear();
 
   if (isDate < 0) {
-    timeStr = dateTime(time);
+    drag == 'normal' ? timeStr = dateTime(time) : timeStr = dateTime(time, 'yyyy年MM月dd日');
   } else {
     if (currentDay === dateLast()) {
-      timeStr = diff + dateTime(time, 'hh:mm');
+      drag == 'normal' ? timeStr = diff + dateTime(time, 'hh:mm') : timeStr = diff;
     } else {
       if (isTime < 0) {
-        timeStr = dateTime(time, 'MM月dd日 hh:mm');
+        drag == 'normal' ? timeStr = dateTime(time, 'MM月dd日 hh:mm') : timeStr = dateTime(time, 'MM月dd日');
       } else {
         timeStr = dateTime(time, 'hh:mm');
       }

src/web/staticres/js/login.js

@@ -692,6 +692,7 @@ var signout = function(){
 				getNewShareId(mynum,true);*/
 			}
             window.localStorage.removeItem('bus-key-group-SCOPE')
+            window.localStorage.removeItem('noMesg')
 		}
 	})
 }

src/web/staticres/js/message.js

@@ -140,17 +140,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+'\',\''+lasts.msg_type+'\',\''+lasts.msgLogId+'\')"><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+'\',\''+lasts.msgLogId+'\')"><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, 'nor')+'</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+'\',\''+lasts.msg_type+'\',\''+lasts.msgLogId+'\')"><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+'\',\''+lasts.msgLogId+'\')"><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, 'nor')+'</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+'\',\''+lists[i].msg_type+'\',\''+lists[i].msgLogId+'\')"><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+'\',\''+lists[i].msgLogId+'\')"><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, 'nor')+'</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+'\',\''+lists[i].msg_type+'\',\''+lists[i].msgLogId+'\')"><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+'\',\''+lists[i].msgLogId+'\')"><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, 'nor')+'</span></div><p>'+lists[i].content+'</p></div></div></div>'
                 }
             }
         }

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

@@ -0,0 +1,57 @@
+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 == 1"></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 vm = new Vue({
+  el: '#vue-message-index-pc',
+  delimiters: ['@@', '@@'],
+  template: temp,
+  data: function () {
+    return {
+      lists: []
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      var _this = this
+      $.ajax({
+        type:'POST',
+        url:'/jymessageCenter/latestNews',
+        success:function (res) {
+          if (res.data) {
+            res.data.forEach(v => {
+              v.msg_type = _this.msgType(v.msg_type)
+              v.createtime = dateMatter(v.createtime)
+            });
+            _this.lists = res.data
+          }
+          window.localStorage.setItem('noMesg', _this.lists.length)
+        },
+        error:function () {
+          window.localStorage.setItem('noMesg', 0)
+        }
+      })
+    },
+    titleGoto(url) {
+      if (url.link) {
+        location.href = url.link
+      }
+    },
+    gotoUrl() {
+      location.href = '/swordfish/frontPage/messageCenter/sess/index'
+    },
+    msgType(val) {
+      const obj = {
+        '1': '活动优惠',
+        '2': '服务通知',
+        '3': '订阅消息',
+        '4': '项目动态 ',
+        '5': '企业动态',
+        '6': '分析报告 ',
+        '7': '系统通知',
+      }
+      return obj[val]
+    }
+  }
+})

src/web/staticres/js/pur-busniess-index-pc.js

@@ -177,6 +177,7 @@ var vm = new Vue({
       const data = this.newWordsList
       if (!data) return
       data.splice(this.delIndex, 1)
+      this.subData = data
       this.$emit('updateKey', data)
       this.dialog.delKey = false
     },

src/web/staticres/pccss/index.css

@@ -48,17 +48,19 @@
   height: auto;
   min-width: 1200px;
   min-height: 100vh;
-  background: url(/images/pc/banner@2x.jpg) center 0px no-repeat, url(/images/pc/bgTwo.jpg) no-repeat center 710px;
+  background: url(/images/pc/banner.png) center 0px no-repeat, url(/images/pc/bgTwo.jpg) no-repeat center 610px;
   background-size: 1920px auto;
   position: relative;
   
 }
 
 #index .title {
+  line-height: 49px;
   color: #fff;
   font-size: 42px;
   text-align: center;
-  padding-top: 150px;
+  padding-top: 120px;
+  letter-spacing: 3px;
 }
 
 #index .search{
@@ -66,7 +68,7 @@
   position: relative;
 }
 #index .search form{
-  padding-top: 36px;
+  padding-top: 24px;
   text-align: center;
   position: relative;
 }
@@ -131,21 +133,21 @@ font-size: 14px;
 #index .search .btn {
   position: absolute;
   right: 50%;
-  top: 36px;
+  top: 24px;
   margin-right: -310px;
-    width: 64px;
-    height: 42px;
-    border-radius: 0 21px 21px 0;
-    border: none;
-    background:#2CB7CA url(/images/pc/index-searchicon.png) center center no-repeat;
-    background-size: 20px 20px;
-    cursor: pointer;
+  width: 64px;
+  height: 42px;
+  border-radius: 0 21px 21px 0;
+  border: none;
+  background:#2CB7CA url(/images/pc/index-searchicon.png) center center no-repeat;
+  background-size: 20px 20px;
+  cursor: pointer;
 }
 #index .search .tips{
   display: inline-block;
   width: 620px;
   text-align: left;
-  margin-top: 20px;
+  margin-top: 14px;
   font-size: 14px;
   color: rgba(255, 255, 255, 0.8);
   position: relative;
@@ -177,14 +179,14 @@ font-size: 14px;
 #index .projectList{
   display: flex;
   justify-content: center;
-  margin-top: 108px;
+  margin-top: 48px;
 }
 #index .projectList ul{
   display: flex;
   background: #fff;
   box-shadow: 0px 0px 28px 0px rgba(0,0,0,0.08); 
   width: 1200px;
-  height: 112px;
+  height: 96px;
   border-radius: 6px;
 }
 
@@ -229,7 +231,7 @@ font-size: 14px;
 #index .jy-banner{
   width: 1200px;
   margin: 0 auto;
-  margin-top: 56px;
+  margin-top: 24px;
   display: flex;
   justify-content: space-between;
 }
@@ -264,7 +266,7 @@ font-size: 14px;
 
 #index .jy-area{
   width: 1200px;
-  margin: 58px auto 0;
+  margin: 34px auto 0;
 }
 #index .jy-area .tab-header{
   display: flex;
@@ -296,10 +298,10 @@ font-size: 14px;
   color: #2CB7CA;
 }
 #index .jy-area .tab-content{
-  height: 450px;
+  height: 442px;
   background-color: #fff;
   border-radius: 6px;
-  margin-top: 40px;
+  margin-top: 26px;
   padding: 24px 4px;
 }
 #index .jy-area .tab-content .tab-content-area{
@@ -364,7 +366,7 @@ font-size: 14px;
 }
 
 #index .newNotice{
-  margin-top: 80px;
+  margin-top: 112px;
   width: 100%;
   height: 580px;
   background: #fff;
@@ -378,7 +380,7 @@ font-size: 14px;
   font-size: 24px;
   text-align: center;
   line-height: 36px;
-  padding-top: 56px;
+  /* padding-top: 56px; */
 }
 #index .newNotice .newNotice-header{
   display: flex;
@@ -747,7 +749,7 @@ font-size: 14px;
 .jy-partners{
   width: 1204px;
   height: 450px;
-  margin: 0 auto 70px;
+  margin: 0 auto 40px;
 }
 .jy-partners h3{
   font-size: 24px;
@@ -1179,3 +1181,63 @@ body{
     color: #1d1d1d;
     background-color: #ececec;
 }
+#index .list-msg {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 1200px;
+  height: 80px;
+  margin: auto;
+  border-radius: 8px;
+  border: 1px solid #2CB7CA;
+  margin-top: 56px;
+  padding: 0 16px;
+}
+#index .noActive {
+  margin-top: 56px;
+}
+#index .list-msg .l-msg .words {
+  display: flex;
+  flex-direction: initial;
+  align-items: center;
+}
+#index .list-msg .l-msg .words:nth-child(2) {
+  margin-top: 8px;
+}
+#index .list-msg .r-msg {
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+}
+#index .list-msg .l-msg .words i {
+  width: 6px;
+  height: 6px;
+  background: #FF3A20;
+  border: 1px solid #FFFFFF;
+  border-radius: 50%;
+  margin-right: 9px;
+}
+#index .list-msg .l-msg .words h3 {
+  font-size: 16px;
+  font-weight: bold;
+  color: #2CB7CA;
+  line-height: 24px;
+}
+#index .list-msg .l-msg .words span {
+  font-size: 14px;
+  color: #1D1D1D;
+  line-height: 22px;
+  margin: 0 16px;
+}
+#index .list-msg .l-msg .words span:hover {
+  color: #2CB7CA;
+  cursor: pointer;
+}
+#index .list-msg .l-msg .words p {
+  font-size: 12px;
+  color: #999999;
+  line-height: 18px;
+}
+#index .list-msg .l-msg .words .isActive {
+  margin-left: 15px;
+}

src/web/staticres/public-pc/css/header-nav.css

@@ -367,6 +367,12 @@
     height: auto;
     text-align: left;
 }
+#public-nav .iner .jynav li .jy-list-msg .msg-par .m-ul .m-li .lis-cont .r-lis .title span:nth-child(1) {
+    max-width: 200px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 #public-nav .iner .jynav li .jy-list-msg .msg-par .m-ul .m-li .lis-cont .r-lis .title span:nth-child(2) {
     font-size: 12px;
     color: #999;

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

@@ -43,6 +43,7 @@
                   <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 v-loading="loading">
                 <div
                   class="tips tab-tips"
                   v-for="(ite, indx) in tabsList.lists"
@@ -61,6 +62,7 @@
                       <p>{ite.content}</p>
                   </div>
                 </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-if="tabsList.totals > 20">
                   <el-pagination

src/web/templates/pc/index.html

@@ -171,7 +171,8 @@
           </li>
         </ul>
       </div>
-
+      <!-- 消息 -->
+      <div id="vue-message-index-pc"></div>
       <!-- 剑鱼广告位轮播 -->
       <div class="jy-banner CfadeInUp">
         <div class="jy-banner-l" id="jy-pc-index-leftad">
@@ -716,7 +717,9 @@
 <script src='{{Msg "seo" "cdn"}}/common-module/selector/js/static-data.js?v={{Msg "seo" "version"}}'></script>
 <script src="//cdn-common.jianyu360.com/cdn/lib/vue/2.6.14/vue.min.js"></script>
 <script src="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/index.js"></script>
+<script src='{{Msg "seo" "cdn"}}/js/dateFunc.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/pc-collect-user-info.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/js/pc-message-index.js?v={{Msg "seo" "version"}}'></script>
 <script>
 $(function () {
     // 处理时间格式化
@@ -1048,6 +1051,13 @@ $('.carousel-one').carousel({
     interval: 3000
 })
 //最新公告信息
+var noMesg = window.localStorage.getItem('noMesg')
+if (noMesg == 0) {
+  $(".newNotice").css('marginTop', '192px')
+} else {
+  $(".newNotice").css('marginTop', '112px')
+}
+
 $(".newNotice .newNotice-header span").on('click', function () {
 
   $(".newNotice .newNotice-header span").removeClass('active')