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

src/web/staticres/css/pc/index.css

@@ -191,7 +191,7 @@
     line-height: 18px;
     padding: 2px 8px;
     border-radius: 10px 10px 0 10px;
-    min-width:72px;
+    min-width:75px;
     margin-right:12px;
 }
 

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

@@ -10,13 +10,7 @@ var vm = new Vue({
       kfCount: 0,
       shuntData: {},
       shunted: true,
-      imgSrcs: [
-        { type: '-1', 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/xuetang@2x.png' }, { type: '9', title: '私信', url: '/images/pc/sixin@2x.png' }
-      ],
+      imgSrcObj: {},
       tabsList: {
         lasts: [],
         lists: [],
@@ -29,6 +23,7 @@ var vm = new Vue({
     }
   },
   created() {
+    this.activeName = '-1'
     this.getList()
     // this.kfContacts()
     // this.kfData()
@@ -39,7 +34,7 @@ var vm = new Vue({
       var _this = this
       var type = msgType !== null && msgType !== undefined ? Number(msgType) : -1
       var params =  {
-        isColumn: type === -1,
+        isColumn: true,
         isColumnNewMsg: false,
         isMsgList: true,
         msgType: type,
@@ -59,8 +54,9 @@ var vm = new Vue({
             _this.loading = false
           }, 300)
            if(res.code === 0) {
-             if(_this.counts.length ===0 && res.column.length > 0){
-               _this.counts = res.column || []
+             _this.counts = res.column || []
+             for(var item of _this.counts) {
+               _this.$set(_this.imgSrcObj, item.msg_type, item)
              }
              _this.tabsList.lists = []
              _this.tabsList.lasts = $.isEmptyObject(res.last) ? false : res.last
@@ -174,7 +170,8 @@ var vm = new Vue({
       $.ajax({
         url: '/jyapi/messageCenter/ClearUnreadMsg',
         type: 'POST',
-        success:function (res) {
+        success:function () {
+          this.activeName = '-1'
           _this.getList()
           if(message){
             message.getMessageList()
@@ -184,7 +181,7 @@ var vm = new Vue({
       })
     },
     jumpPushPage () {
-      location.href = '/big/push_setting'
+      location.href = '/page_workDesktop/work-bench/app/big/push_setting'
     }
   }
 })

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

@@ -37,7 +37,7 @@
             </div>
           <div class="tips" @click="linked(tabsList.lasts)" v-show="tabsList.lasts">
             <div class="imgs">
-              <img :src='imgSrcs[tabsList.lasts.msg_type].url' v-if="tabsList.lasts.msg_type">
+              <img :src='imgSrcObj[tabsList.lasts.msg_type].img' v-if="tabsList.lasts.msg_type && imgSrcObj[tabsList.lasts.msg_type].img">
               <i class="dots" v-if="tabsList.lasts.isRead == 0"></i>
             </div>
             <div class="r-lis">
@@ -65,7 +65,7 @@
                   v-if="tabsList.lists"
                 >
                   <div class="imgs">
-                    <img :src='imgSrcs[temp.msg_type].url'>
+                    <img v-if="imgSrcObj[temp.msg_type] && imgSrcObj[temp.msg_type].img" :src='imgSrcObj[temp.msg_type].img'>
                     <i class="dots" v-show="!temp.isRead"></i>
                   </div>
                   <div class="r-lis">

src/web/templates/pc/messageDetail.html

@@ -83,7 +83,7 @@
   function getList () {
     var _this = this
     var params =  {
-      msgLogId: getUrlParam('id') ? Number(getUrlParam('id')) : null
+      msgLogId: getUrlParam('msgLogId') ? Number(getUrlParam('msgLogId')) : null
     }
     $.ajax({
       url: '/jyapi/messageCenter/messageDetail',