Commit 7c7a6aee authored by kaitly205422@163.com's avatar kaitly205422@163.com
Browse files

Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into develop

parents 9e33fff9 bd13b279

src/assets/noMessage.png

0 → 100644
+37.1 KiB
Loading image diff...

src/components/TabBar.vue

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ export default { 
          imgUrl: require("@/assets/tabBar/new.png"),

          imgUrlActive: require("@/assets/tabBar/new-active.png"),

          path: "/message-center",

          text: "任务列表"

          text: "消息中心"

        },

        {

          key: "2",

src/service/message.js

0 → 100644
+62 −0
Original line number Diff line number Diff line 
import request from '@/utils/axios'

import { getFun, postFun,postThree } from "@/service/table.js";

/*get请求*/

// export function getFun(url,params) {

//     return request({

//       url: url,

//       method: 'get',

//       params

//     })

// }

/* post请求 */



//消息信息列表

export function postMessgaelist(data,params) {

  return postThree('/messageInfo/list', data,params)

}



// //消息信息列表

// export function postWarnList(data,params) {

//   return postThree('warn/pushBase/list', data,params)

// }

//未读消息变为已读

export function noticeRemove(data) {

  return postFun('/messageInfo/changeRead', data)

}

//清除未读消息列表

export function removeAllMessgae(data) {

  return postFun("/messageInfo/changeStatus", data)

}

//删除已读消息

export function removeMessgae(data) {

  return postFun("/messageInfo/remove", data)

}

//待办事项列表

export function waitList(data,params) {

  return postThree("/backlogInfo/list",data,params)

}

//未读消息数 

export function badgeNumber(data) {

  return getFun("/backlogInfo/unReadCount", data);

}

//删除已办事项

export function removeWaitList(data) {

  return postFun("/backlogInfo/remove", data)

}



// //通知公告列表

// export function notificationList(data) {

//   return postFun("/noticeInfo/list", data)

// }

// //清除通知公告未读

// export function removeAllNotification(data) {

//   return getFun("/noticeInfo/changeStatus", data)

// }

// //清除通知未读改为已读

// export function readNotification(data) {

//   return postFun("/noticeInfo/changeRead", data)

// }

// //删除已读通知列表

// export function removeNotification(data) {

//   return postFun("/noticeInfo/remove", data)

// }
 
 No newline at end of file

src/service/table.js

+10 −0
Original line number Diff line number Diff line
@@ -52,3 +52,13 @@ export function fileDownFuns(url, data) { 
    responseType: "blob" /*下载文件必填项*/

  });

}

  /* put请求 */

  export function postThree(url,data,params) {

      return request({

          url:url,

          method: 'post',

          params,

          data,

  

      })

    }
 
 No newline at end of file

src/views/messageCenter/index.vue

+3 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
    <div class="con">

      <van-tabs v-model="activeName" color="#247df7" title-inactive-colo="#d0d1d1" title-active-color="#000000" sticky

        offset-top="1.333333rem" @change="changeTab">

        <van-tab title="消息提醒" name="消息提醒">

        <van-tab title="消息提醒(14)" name="消息提醒">

          <info-tip></info-tip>

        </van-tab>

        <!-- <van-tab title="预警提醒" name="预警提醒" >
@@ -20,7 +20,7 @@ 
        <!-- <van-tab title="SOS求救" name="SOS求救">

            <Iso></Iso>

        </van-tab> -->

        <van-tab title="待办事项" name="待办事项">

        <van-tab title="待办事项(20)" name="待办事项">

          <wait-event></wait-event>

        </van-tab>

      </van-tabs>
@@ -105,7 +105,7 @@ export default { 
.con {

  // height: calc(100% - 110px);

  // height: 100%;

  padding: 0 0 50px 0;

  // padding: 0 0 50px 0;

  background-color: #f0f1f5;

  position: relative;