Merge branch 'dev/v4.8.49_zsy' of qmx/jy into feature/v4.8.49

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

@@ -17,6 +17,44 @@
   margin: 0 auto;
   padding: 52px 0 80px 0;
 }
+.main-mesg .title-row{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.main-mesg .title-row .handle-span{
+    color: #1D1D1D;
+    font-size: 14px;
+    cursor: pointer;
+}
+.main-mesg .title-row p>span:nth-of-type(1) {
+    margin-right: 24px;
+}
+.main-mesg .title-row img {
+    width:18px;
+    height:18px;
+    margin-right:4px;
+}
+.main-mesg .title-row .desc{
+    cursor: default;
+    background:#fff;
+    padding:5px 10px;
+    color: #686868;
+    font-size: 12px;
+    position: relative;
+    border-radius: 5px;
+    margin-right:12px !important;
+}
+.main-mesg .title-row .desc::after{
+    position: absolute;
+    top:6px;
+    content: '';
+    right: -8px;
+    /*width:20px;*/
+    border: 8px solid transparent;
+    border-right:none;
+    border-left-color: #fff;
+}
 .main-mesg h3 {
   font-size: 20px;
   font-weight: 700;
@@ -84,7 +122,7 @@
   background: #fff;
   border-radius: 4px;
   margin-top: 20px;
-  box-shadow: 0px 0px 18px 0px rgba(0,0,0,0.02); 
+  box-shadow: 0px 0px 18px 0px rgba(0,0,0,0.02);
 }
 .main-mesg .tabs-mesg .el-tabs .el-tabs__item {
   height: auto;
@@ -231,8 +269,8 @@
   color: #fff!important;
 }
 
-.tabs-mesg .el-pagination.is-background .btn-next, 
-.tabs-mesg .el-pagination.is-background .btn-prev, 
+.tabs-mesg .el-pagination.is-background .btn-next,
+.tabs-mesg .el-pagination.is-background .btn-prev,
 .tabs-mesg .el-pagination.is-background .el-pager li {
   color: #1d1d1d;
-}
+}

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

@@ -12,11 +12,11 @@ var vm = new Vue({
       shuntData: {},
       shunted: true,
       imgSrcs: [
-        { type: '0', title: '全部', url: '/images/pc/quanbu@2x.png' }, { type: '1', title: '活动优惠', url: '/images/pc/huodong@2x.png' },
+        { type: '0', title: '全部', url: '/images/pc/quanbu@2x.png' }, { type: '1', title: '活动通知', url: '/images/pc/huodong@2x.png' },
         { type: '2', title: '服务通知', url: '/images/pc/fuwu@2x.png' }, { type: '3', title: '订阅消息', url: '/images/pc/dingyue@2x.png' },
         { type: '4', title: '项目动态', url: '/images/pc/xiangmu@2x.png' }, { type: '5', title: '企业动态', url: '/images/pc/qiye@2x.png' },
         { type: '6', title: '分析报告', url: '/images/pc/fenxi@2x.png' }, { type: '7', title: '系统通知', url: '/images/pc/xitong@2x.png' },
-        { type: '8', title: '私信', url: '/images/pc/sixin@2x.png' }
+        { type: '8', title: '私信', url: '/images/pc/sixin@2x.png' }, { type: '9', title: '剑鱼学堂', url: '/images/pc/xuetang@2x.png' }
       ],
       tabsList: {
         lasts: [],
@@ -163,6 +163,13 @@ var vm = new Vue({
           window.__canNextReadMessageStatus = false
         }
       }
+    },
+    // 清楚未读
+    cleanNoRead() {
+      console.dir('清除未读')
+    },
+    jumpPushPage () {
+      location.href = '/big/push_setting'
     }
   }
 })

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

@@ -21,7 +21,21 @@
 	{{include "/common/pchead.html"}}
 	  <section class="mesg-container" v-cloak>
         <div class="main-mesg">
-          <h3>消息中心</h3>
+            <div class="title-row">
+                <h3>消息中心</h3>
+                <p class="flex">
+                    <span class="handle-span flex" @click="jumpPushPage">
+                        <span class="desc">推送设置页面可进行消息接收渠道的管理</span>
+                        <img class="push-icon" src="/images/pc/msg_export.png" alt="">
+                        <span>推送设置</span>
+                    </span>
+                    <span class="handle-span flex" @click="cleanNoRead">
+                       <img class="clean-icon" src="/images/pc/msg_clean.png" alt="">
+<!--                        <img class="clean-icon" src="/images/pc/msg_no_clean.png" alt="">-->
+                        <span>清除未读</span>
+                    </span>
+                </p>
+            </div>
           <div class="tips" @click="linked(tabsList.lasts.id, tabsList.lasts.link, tabsList.lasts.isRead,1,tabsList.lasts.msg_type,tabsList.lasts.msgLogId)" v-show="tabsList.lasts">
             <div class="imgs">
               <img :src='imgSrcs[tabsList.lasts.msg_type].url' v-if="tabsList.lasts.msg_type">

src/web/templates/pc/index.html

@@ -76,11 +76,11 @@
         <div id="vue-message-index-pc" v-cloak>
             <div class="list-msg" v-if="lists.length > 0">
                 <div class="no-read-count" v-if="totalNum > 0">${totalNum > 99 ? '99+' : totalNum }条未读</div>
-                <el-carousel :interval="1000" arrow="never" :autoplay="lists.length > 1" indicator-position="none">
+                <el-carousel :interval="10000" arrow="never" :autoplay="lists.length > 1" indicator-position="none">
                     <el-carousel-item class="l-msg" v-for="(tempList, index) in lists" :key="'msg_' + index">
                         <div class="words" v-for="item in tempList" :key="item.id">
-<!--                            <img class="icon_voice" src="/images/pc/icon_voice.png" v-show="item.isRead == 0" />-->
-                            <img class="icon_voice" :src="'/images/pc/'+imgArrs[item.msg_type]+'@2x.png'" alt="">
+<!--                            v-show="item.isRead == 0"-->
+                            <img class="icon_voice" src="/images/pc/icon_voice.png"  />
                             <h3 :class="{isActive: item.isRead == 1}">${item.msg_type_text}</h3>
                             <span @click="titleGoto(item)">${item.title}</span>
                             <p>${item.createtime}</p>