From 2973b7c1a572d6b694b8fd6673879a37591761c8 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Thu, 24 Oct 2024 18:14:26 +0800
Subject: [PATCH] 1

---
 components/VNavigationBar.vue       |  18 ++
 pages-home/home/home.vue            | 122 +++++++++++++-
 pages-home/msg/message.vue          | 253 ++++++++++++++++++++++++++++
 pages-home/notice/notice.vue        | 194 +++++++++++++++++++++
 pages-home/notice/noticeContent.vue |  82 +++++++++
 pages-home/static/msg.png           | Bin 0 -> 512 bytes
 pages-home/static/notice.png        | Bin 0 -> 681 bytes
 pages-warehouse/home/home.vue       | 126 +++++++++++++-
 pages.json                          |  18 ++
 static/images/clear.png             | Bin 0 -> 2173 bytes
 10 files changed, 798 insertions(+), 15 deletions(-)
 create mode 100644 pages-home/msg/message.vue
 create mode 100644 pages-home/notice/notice.vue
 create mode 100644 pages-home/notice/noticeContent.vue
 create mode 100644 pages-home/static/msg.png
 create mode 100644 pages-home/static/notice.png
 create mode 100644 static/images/clear.png

diff --git a/components/VNavigationBar.vue b/components/VNavigationBar.vue
index 27bd040..00718e1 100644
--- a/components/VNavigationBar.vue
+++ b/components/VNavigationBar.vue
@@ -19,6 +19,9 @@
         <view :style="{ color: titleColor }" class="navigationBarTitle">
           {{ title }}
         </view>
+        <view v-if="showClear" @click="clearNoReadFun" class="navigationBarIcon" :style="{ color: titleColor }">
+          <image src="@/static/images/clear.png" mode="" class="clear-icon"></image>
+        </view>
       </template>
       <view class="navigationBarBackExtra">
         <slot name="extra">
@@ -46,6 +49,10 @@ export default {
     leftTitle: {
       type: Boolean,
       default: false
+    },
+    showClear: {
+      type: Boolean,
+      default: false
     }
   },
   mounted() {
@@ -78,6 +85,9 @@ export default {
   methods: {
     back() {
       uni.navigateBack()
+    },
+    clearNoReadFun(){
+      this.$emit('clearNoRead')
     }
   }
 }
@@ -109,5 +119,13 @@ export default {
     font-size: 36rpx;
     font-weight: bold;
   }
+  .navigationBarIcon {
+    display: flex;
+  }
+  .clear-icon{
+    width: 40rpx;
+    height: 40rpx;
+    border-radius: 50%;
+  }
 }
 </style>
diff --git a/pages-home/home/home.vue b/pages-home/home/home.vue
index 9cc4c3c..93e78fc 100644
--- a/pages-home/home/home.vue
+++ b/pages-home/home/home.vue
@@ -3,14 +3,18 @@
     <!--<VNavigationBar style="position: relative;z-index: 99;" leftTitle="true" backgroundColor="rgba(0,0,0,0)" title-color="#fff" title=" "></VNavigationBar>-->
     <view class="bodyTopBg"></view>
     <view class="body">
-      <view class="userInfoBox" @click="showUserDetail">
-        <image style="width: 104rpx;height: 104rpx;border-radius: 50%;" v-if="''==userInfo.avatar || null == userInfo.avatar" :src="defaultAvatar" mode="scaleToFill" @error="avatarErr"></image>
-        <image style="width: 104rpx;height: 104rpx;border-radius: 50%;" v-else :src="imgUrlPrex+userInfo.avatar" mode="scaleToFill" @error="avatarErr"></image>
-        <view class="userInfo">
+      <view class="userInfoBox" >
+        <image @click="showUserDetail" style="width: 104rpx;height: 104rpx;border-radius: 50%;" v-if="''==userInfo.avatar || null == userInfo.avatar" :src="defaultAvatar" mode="scaleToFill" @error="avatarErr"></image>
+        <image @click="showUserDetail" style="width: 104rpx;height: 104rpx;border-radius: 50%;" v-else :src="imgUrlPrex+userInfo.avatar" mode="scaleToFill" @error="avatarErr"></image>
+        <view class="userInfo" @click="showUserDetail">
           <text class="userName">{{ userInfo.nickname }}</text>
           <text class="userType">{{ userInfo.roleNames }}</text>
         </view>
-        <image style="width: 48rpx;height: 48rpx" src="/static/icons/more.png" mode="aspectFita"></image>
+        <view class="msg-box" @click="gotoMsg">
+          <image mode="aspectFita" src="@/pages-home/static/msg.png" style="width: 48rpx;height: 48rpx"></image>
+          <view class="msg-num" v-if="noReadNum>0">{{noReadNum}}</view>
+        </view>
+        <image @click="showUserDetail" style="width: 48rpx;height: 48rpx" src="/static/icons/more.png" mode="aspectFita"></image>
       </view>
 <!--      服务顾问才能开单-->
       <view class="body-top-grid"  v-if="userInfo.roleCodes.includes('service_advisor')">
@@ -54,6 +58,14 @@
           </view>
         </view>
       </view>
+      <!-- 通知公告 -->
+      <view class="notice-dom" v-if="noticeNum>0" @click="gotoNotice">
+        <view class="notice-box">
+          <image class="left-img"  src="@/pages-home/static/notice.png" ></image>
+          <view class="center-text">你有{{noticeNum}}条来自平台的通知公告</view>
+          <u-icon style="width: 20rpx" color="#999" name="arrow-right" size="12"></u-icon>
+        </view>
+      </view>
       <!-- 服务顾问角色 -->
       <view class="orderCount" v-if="userInfo.roleCodes.includes('service_advisor')" @click="serviceWork">
         <view class="orderCountItem">
@@ -163,7 +175,11 @@ export default {
         workingNum:0,
         doneNum:0
       },
-      defaultAvatar: require('@/static/icons/avatar.png')
+      defaultAvatar: require('@/static/icons/avatar.png'),
+      //未读消息数量
+      noReadNum:0,
+      //通知公告数量
+      noticeNum:0,
     }
   },
   onLoad(){
@@ -185,6 +201,8 @@ export default {
     }else{
       //直接取缓存中的用户信息
       this.userInfo = getUserInfo()
+      this.getNoReadNum()
+      this.getNoticeList()
       this.onRefresherrefresh()
       if(this.userInfo.roleCodes.includes('repair_staff')){
         //维修工
@@ -199,6 +217,12 @@ export default {
     }
   },
   methods: {
+    gotoMsg(){
+      //去消息中心
+      uni.navigateTo({
+        url: '/pages-home/msg/message'
+      })
+    },
     /**
      * 上滑加载数据
      */
@@ -392,7 +416,49 @@ export default {
       uni.navigateTo({
         url: '/pages-home/service/applyList'
       })
-    }
+    },
+    /**
+     * 获取未读消息数量
+     * @returns {Promise<void>}
+     */
+    async getNoReadNum(){
+      await request({
+        url: "/admin-api/system/notify-message/get-unread-count",
+        method: "GET"
+      }).then((res) => {
+        if(res.code==200){
+          this.noReadNum = res.data>99?99:res.data
+        }
+      })
+    },
+    /**
+     * 跳转通知公告列表页
+     */
+    gotoNotice(){
+      uni.navigateTo({
+        url: '/pages-home/notice/notice'
+      })
+    },
+    /**
+     * 查通知公告--查数量
+     */
+    async getNoticeList(){
+      const res = await request({
+        url: "/admin-api/base/notice/page",
+        method: "get",
+        params: {
+          pageNo:1,
+          pageSize:1,
+          type:1,
+          parentServer: "weixiu",
+          server: "app"
+        },
+        tenantIdFlag:false
+      })
+      if(res.code==200){
+        this.noticeNum = res.data.total
+      }
+    },
   }
 }
 </script>
@@ -459,6 +525,25 @@ export default {
         padding: 8rpx 16rpx;
       }
     }
+
+    .msg-box{
+      position: relative;
+      margin-right: 40rpx;
+      .msg-num{
+        position: absolute;
+        right: -15rpx;
+        color: white;
+        background: #d74a43;
+        width: 35rpx;
+        height: 35rpx;
+        line-height: 35rpx;
+        text-align: center;
+        font-weight: 800;
+        font-size: 11px;
+        border-radius: 50%;
+        top: -15rpx;
+      }
+    }
   }
   .body-top-grid {
     display: grid;
@@ -556,7 +641,30 @@ export default {
       }
     }
   }
+  .notice-dom {
+    margin: 40rpx 32rpx;
+    background: #FFFFFF;
+    border-radius: 8rpx 8rpx 8rpx 8rpx;
+    padding: 20rpx;
+    display: flex;
+    align-items: center;
 
+    .notice-box{
+      display: flex;
+      width: 100%;
+      .left-img{
+        width: 48rpx;
+        height: 48rpx;
+      }
+      .center-text{
+        width: calc(100% - 70rpx);
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        padding:0 20rpx;
+      }
+    }
+  }
   .orderCount {
     margin: 40rpx 32rpx;
     background: #FFFFFF;
diff --git a/pages-home/msg/message.vue b/pages-home/msg/message.vue
new file mode 100644
index 0000000..a9b005f
--- /dev/null
+++ b/pages-home/msg/message.vue
@@ -0,0 +1,253 @@
+<template>
+  <view class="container">
+    <VNavigationBar style="position: relative;z-index: 99;" backgroundColor="#fff" title-color="#000" title="消息中心" :showClear="showClear" @clearNoRead="clearNoReadFun"></VNavigationBar>
+<!--    <VNavigationBar background-color="#fff" title-color="#333" title="消息中心" :showClear="showClear" @clearNoRead="clearNoReadFun"></VNavigationBar>-->
+    <view class="body">
+      <view class="messageList">
+        <scroll-view style="height: 100%;" scroll-y="true" class="itemContent" @scrolltolower="onReachBottomCus"
+                     refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
+          <view v-for="(item, index) in messageList" :key="index" class="messageItem" @click="readNotice(item)">
+            <image class="messageIcon" src="../../static/icons/message-icon1.png" mode="aspectFit"></image>
+            <view class="messageContent">
+              <view :class="{'messageTitle':item.readStatus,'noReadTitle':!item.readStatus}" >系统通知</view>
+              <view class="messageContent_content">{{item.templateContent}}</view>
+              <view class="messageContent_content" style="text-align: right">{{formatTime(item.createTime)}}</view>
+            </view>
+          </view>
+          <view style="text-align: center" v-if="messageList.length==0">
+            <image class="" src="@/static/images/nothing.png"></image>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+    <!-- 提示窗示例 -->
+    <uni-popup ref="alertDialog" type="dialog">
+      <uni-popup-dialog :type="msgType" cancelText="关闭" confirmText="我知道了" title="系统通知" :content="nowReadItem.templateContent" @confirm="dialogToggle"
+                        @close="dialogToggle"></uni-popup-dialog>
+    </uni-popup>
+<!--    &lt;!&ndash; 普通弹窗 &ndash;&gt;-->
+<!--    <uni-popup ref="popup" background-color="#fff" >-->
+<!--      <view class="popup-content" :class="{ 'popup-height': type === 'left' || type === 'right' }">-->
+<!--        <text class="text popup-content-text">{{ nowReadItem.templateContent }}</text>-->
+<!--        <button class="button popup-info" @click="dialogToggle"><text-->
+<!--            class="button-text info-text">知道了</text></button>-->
+<!--      </view>-->
+<!--    </uni-popup>-->
+  </view>
+</template>
+
+<script>
+	import VNavigationBar from '@/components/VNavigationBar.vue'
+  import request from "@/utils/request";
+  import {formatTimestamp} from "@/utils/utils";
+
+	export default {
+		components: {
+			VNavigationBar,
+		},
+		data() {
+			return {
+        msgType: 'success',
+				messageList: [],
+        pageNo: 1,
+        pageSize: 15,
+        total: 0,
+        //下来刷新状态
+        isTriggered:false,
+        //是否显示一键清空
+        showClear:true,
+        nowReadItem:{},
+			};
+		},
+    onLoad(){
+
+    },
+    onShow(){
+      this.getList()
+    },
+    methods:{
+		  /**
+       * 点击阅读消息
+       */
+      async readNotice(item) {
+        this.nowReadItem = item
+        // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+        this.$refs.alertDialog.open()
+        //直接请求后台已读
+        await request({
+          url: "/admin-api/system/notify-message/update-read",
+          method: "PUT",
+          params:{ids:this.nowReadItem.id},
+          tenantIdFlag:false
+        }).then((res) => {
+          if(res.code==200){
+            this.onRefresherrefresh()
+          }
+        })
+      },
+      /**
+       * 消息设置为已读
+       */
+      dialogToggle(){
+
+      },
+		  /**
+       * 一键清空未读消息
+       */
+      async clearNoReadFun(){
+        console.log("清空了")
+        await request({
+          url: "/admin-api/system/notify-message/update-all-read",
+          method: "PUT",
+          tenantIdFlag:false
+        }).then((res) => {
+          if(res.code==200){
+            uni.showToast({
+              title: '操作成功',
+              icon: 'none'
+            })
+            setTimeout(()=>{
+              this.onRefresherrefresh()
+            },500)
+          }
+        })
+      },
+      formatTime(value){
+        return formatTimestamp(value)
+      },
+      /**
+       * 上滑加载数据
+       */
+      onReachBottomCus() {
+        //判断 如果页码*页容量大于等于总条数，提示该页数据加载完毕
+        if (this.pageNo * this.pageSize >= this.total) {
+          uni.$u.toast('没有更多数据了')
+          return
+        }
+        //页码+1,调用获取数据的方法获取第二页数据
+        this.pageNo++
+        //此处调用自己获取数据列表的方法
+        this.getList()
+      },
+      /**
+       * 下拉刷新数据
+       */
+      onRefresherrefresh(){
+        this.isTriggered = true
+        this.pageNo = 1
+        this.total = 0
+        this.messageList = []
+        this.getList()
+      },
+      /**
+       * 分页查询
+       */
+      async getList(){
+        await request({
+          url: "/admin-api/system/notify-message/my-page",
+          method: "GET",
+          params:{
+            pageNo:this.pageNo,
+            pageSize:this.pageSize
+          }
+        }).then((res) => {
+          //判断 如果获取的数据的页码不是第一页，就让之前赋值获取过的数组数据 concat连接 刚获取的第n页数据
+          if (this.pageNo != 1) {
+            this.messageList = this.messageList.concat(res.data.list)
+          } else {
+            this.messageList = res.data.list
+          }
+          //将获取的总条数赋值
+          this.total = res.data.total
+          this.isTriggered = false
+        })
+      },
+    }
+	}
+</script>
+
+<style lang="less" scoped>
+.container {
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	.body {
+		flex: 1;
+		height: calc(100vh - env(safe-area-inset-top));
+		overflow: auto;
+	}
+	.messageList {
+		padding: 0 32rpx;
+    height: 100%;
+	}
+	.messageItem {
+		padding: 30rpx 0;
+		display: flex;
+		align-items: center;
+		column-gap: 20rpx;
+		border-bottom: 1rpx solid #EEEEEE;
+
+		.messageIcon {
+			width: 80rpx;
+			height: 80rpx;
+		}
+    .noReadTitle {
+      font-weight: bold;
+      font-size: 32rpx;
+      color: #333333;
+    }
+    .noReadTitle:after{
+      content: "*";
+      color: red;
+      display: block; /* 或者其他的块级显示类型，比如 inline-block, table 等 */
+      position: absolute; /* 或者 absolute 或者 fixed，取决于你的布局需求 */
+      z-index: 1; /* 确保它在元素的上方 */
+      right: 0;
+    }
+
+		.messageContent {
+			flex: 1;
+			width: 0;
+		}
+		.messageTitle {
+			font-size: 32rpx;
+			color: #333333;
+		}
+		.messageContent_content {
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #858BA0;
+
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+  }
+  .popup-content {
+    padding: 15px;
+    height: auto;
+    margin: auto;
+    width: 80%;
+    background-color: #fff;
+  }
+  .popup-content-text {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .text {
+    color: #333;
+  }
+
+  .popup-info {
+    margin-top: 30rpx;
+    color: #fff;
+    background-color: #f2f6fc;
+  }
+
+  .info-text {
+    color: #909399;
+  }
+}
+</style>
diff --git a/pages-home/notice/notice.vue b/pages-home/notice/notice.vue
new file mode 100644
index 0000000..2421de1
--- /dev/null
+++ b/pages-home/notice/notice.vue
@@ -0,0 +1,194 @@
+<template>
+  <view class="container">
+    <VNavigationBar style="position: relative;z-index: 99;" backgroundColor="#fff" title-color="#000" title="通知公告"></VNavigationBar>
+    <view class="body">
+      <view class="messageList">
+        <scroll-view style="height: 100%;" scroll-y="true" class="itemContent" @scrolltolower="onReachBottomCus"
+                     refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
+          <view v-for="(item, index) in messageList" :key="index" class="messageItem" @click="readNotice(item)">
+            <image class="messageIcon" src="../../static/icons/message-icon1.png" mode="aspectFit"></image>
+            <view class="messageContent">
+              <view class="messageTitle" >{{item.title}}</view>
+<!--              <view class="messageContent_content">{{item.templateContent}}</view>-->
+              <view class="messageContent_content" style="text-align: right">{{formatTime(item.createTime)}}</view>
+            </view>
+          </view>
+          <view style="text-align: center" v-if="messageList.length==0">
+            <image class="" src="@/static/images/nothing.png"></image>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+	import VNavigationBar from '@/components/VNavigationBar.vue'
+  import request from "@/utils/request";
+  import {formatTimestamp} from "@/utils/utils";
+  import {setJSONData} from "@/utils/auth";
+
+	export default {
+		components: {
+			VNavigationBar,
+		},
+		data() {
+			return {
+        type:"center",
+				messageList: [],
+        pageNo: 1,
+        pageSize: 15,
+        total: 0,
+        //下来刷新状态
+        isTriggered:false,
+			};
+		},
+    onLoad(){
+
+    },
+    onShow(){
+      this.getList()
+    },
+    methods:{
+		  /**
+       * 看通知公告详情
+       */
+      readNotice(item){
+        setJSONData("notice",item)
+        uni.navigateTo({
+          url: "/pages-home/notice/noticeContent",
+        })
+      },
+      formatTime(value){
+        return formatTimestamp(value)
+      },
+      /**
+       * 上滑加载数据
+       */
+      onReachBottomCus() {
+        //判断 如果页码*页容量大于等于总条数，提示该页数据加载完毕
+        if (this.pageNo * this.pageSize >= this.total) {
+          uni.$u.toast('没有更多数据了')
+          return
+        }
+        //页码+1,调用获取数据的方法获取第二页数据
+        this.pageNo++
+        //此处调用自己获取数据列表的方法
+        this.getList()
+      },
+      /**
+       * 下拉刷新数据
+       */
+      onRefresherrefresh(){
+        this.isTriggered = true
+        this.pageNo = 1
+        this.total = 0
+        this.messageList = []
+        this.getList()
+      },
+      /**
+       * 分页查询
+       */
+      async getList(){
+        await request({
+          url: "/admin-api/base/notice/page",
+          method: "GET",
+          params:{
+            pageNo:this.pageNo,
+            pageSize:this.pageSize,
+            type:1,
+            parentServer: "weixiu",
+            server: "app"
+          }
+        }).then((res) => {
+          //判断 如果获取的数据的页码不是第一页，就让之前赋值获取过的数组数据 concat连接 刚获取的第n页数据
+          if (this.pageNo != 1) {
+            this.messageList = this.messageList.concat(res.data.records)
+          } else {
+            this.messageList = res.data.records
+          }
+          //将获取的总条数赋值
+          this.total = res.data.total
+          this.isTriggered = false
+        })
+      },
+    }
+	}
+</script>
+
+<style lang="less" scoped>
+.container {
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	.body {
+		flex: 1;
+		height: calc(100vh - env(safe-area-inset-top));
+		overflow: auto;
+	}
+	.messageList {
+		padding: 0 32rpx;
+    height: 100%;
+	}
+	.messageItem {
+		padding: 30rpx 0;
+		display: flex;
+		align-items: center;
+		column-gap: 20rpx;
+		border-bottom: 1rpx solid #EEEEEE;
+
+		.messageIcon {
+			width: 80rpx;
+			height: 80rpx;
+		}
+
+		.messageContent {
+			flex: 1;
+			width: 0;
+		}
+		.messageTitle {
+      font-weight: bold;
+			font-size: 32rpx;
+			color: #333333;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+		}
+		.messageContent_content {
+			font-weight: 500;
+			font-size: 28rpx;
+			color: #858BA0;
+
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+  }
+  .popup-content {
+    padding: 15px;
+    height: auto;
+    margin: auto;
+    width: 80%;
+    background-color: #fff;
+  }
+  .popup-content-text {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .text {
+    color: #333;
+  }
+
+  .popup-info {
+    margin-top: 30rpx;
+    color: #fff;
+    background-color: #f2f6fc;
+  }
+
+  .info-text {
+    color: #909399;
+  }
+}
+</style>
diff --git a/pages-home/notice/noticeContent.vue b/pages-home/notice/noticeContent.vue
new file mode 100644
index 0000000..fe71858
--- /dev/null
+++ b/pages-home/notice/noticeContent.vue
@@ -0,0 +1,82 @@
+<template>
+  <view class="container">
+    <VNavigationBar style="position: relative;z-index: 99;" backgroundColor="#fff" title-color="#000" title="通知公告详情"></VNavigationBar>
+    <div class="body">
+      <rich-text style="width: 100%" :nodes="richTextHtml | formatRichText" />
+    </div>
+  </view>
+</template>
+
+<script>
+import request from "../../utils/request";
+import config from '@/config'
+import parser from 'rich-text-parser'
+import VNavigationBar from "../../components/VNavigationBar.vue";
+import {getJSONData} from "@/utils/auth";
+
+export default {
+  name: "content",
+  components: {VNavigationBar},
+  filters: {
+    formatRichText(html) { // 控制小程序中图片大小
+      // console.log(html)
+      const nodes = parser.getRichTextJson(html)
+      return nodes.children
+    }
+  },
+  data() {
+    return {
+      richTextHtml: '',
+      toUrl:null,
+    };
+  },
+  onLoad(data) {
+    let notice = getJSONData("notice")
+    this.richTextHtml = notice.content
+  },
+  methods:{
+  }
+}
+</script>
+
+<style scoped lang="scss">
+img{
+  width: 100%;
+  height: auto;
+}
+.container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .body{
+    padding: 15rpx;
+    flex: 1;
+    height: 0;
+    overflow: auto;
+  }
+}
+.fixed-button {
+  position: fixed;
+  bottom: 3rem; /* 距离底部的距离 */
+  right: 2rem; /* 距离右边的距离 */
+  z-index: 1000; /* 确保按钮在其他元素之上 */
+  width: 80px; /* 按钮直径 */
+  height: 80px; /* 按钮直径 */
+  background-color: #f00; /* 按钮背景颜色 */
+  color: #fff; /* 文字颜色 */
+  border-radius: 50%; /* 圆形 */
+  display: flex; /* 使用弹性盒子布局 */
+  justify-content: center; /* 水平居中文本 */
+  align-items: center; /* 垂直居中文本 */
+  font-size: 18px; /* 字体大小 */
+  text-align: center; /* 文字水平居中 */
+  line-height: normal; /* 使用默认行高 */
+  font-family: 'Arial', sans-serif; /* 选择字体 */
+}
+
+/* 为了确保文本垂直居中并且分行 */
+.fixed-button br {
+  content: '';
+  display: block;
+}
+</style>
diff --git a/pages-home/static/msg.png b/pages-home/static/msg.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e3dbf4e5c83ddc4f875db1bd5c51234f86c4ae3
GIT binary patch
literal 512
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAF%}28J29*~C-V}>*&E;!;tHgJ
zz}VPWOG`^dMa96tKu=E($Oei)*g85oMn*<JHV^<AhA;r+0@Xlx5OE+E$bhpUT%ZED
zI7A9gf|ME=A<M!=fPxTl2m``~%fcDL&Pi23*V~l@`2{nuu(GiWh)GB)C@QO{THD&$
zySTb}hJ?k%r=@3P<`q;_R=0F6Sh94@+8z5396NFP%=yb#uHE?f>GO}DzyJOd;d)RG
zG-<h~i(`n!`Q(HJEGJGTil>`jNIx!;I>m4kGgES=TSy_Ft#xdrU}B}MwJl#tVOX%S
zA&2*!GgCx8ovwEAAA7Pn#I@t|jTH(Or?%}W*fxn*deY+@k%u|F!YSOoCJ%jbb5l5F
zb7h2XnM_D{W^N+l!qnFG$0vc4)0#(t^D1M|@>D$)4UL?ItV!G(6lUsVEkAa0WuAJA
rq%xOTS=qI&8%YzQy{2_fn!?E7*DLyeeu#h`DDFI6{an^LB{Ts5+Ps)9

literal 0
HcmV?d00001

diff --git a/pages-home/static/notice.png b/pages-home/static/notice.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae0d7d1eafb8c06592e41c803c910c580288f5d0
GIT binary patch
literal 681
zcmXAndq`7p6vuz_flFFyi_~Q@?FmH~X*d{?rkG~amM9q1A}KJi)o%Hm=G$2)iul4z
zsPL`$M~|tQ^@o|V>2S5&G+()C8#?Co-s|q}{dH&XJ>T=;ob$)wa1=?RSdJ&p69B-8
zyAmyCvY#{9u8ixtRFh0%$;7cypkE!Z!SK<fgya~e2&6bb_9SB*b+QZt2nJ+3d$8wD
z-T}yec6M3JjLhjQh7rsK!S-ci`*Sf)F6Nbo9h75SMg^FE5zZ^Z150pz86H%I2bbf=
z7**iMEASJQ_{mEAlmb6rO@!4F;dO+tp19gdq`uyLIB3s$XV3pg7Aoz9O0sy!t{5d7
z#>qEos!KyD=crExdTfE3Sf;<P&{L~$dJWDPY0VlnYocdOP`5$pHlXe=)SGF885%6`
zw}oEZWCT~X=v6EHV}&LgT({BdHfTnn1*I)0v|`YTLzIB%F2qTiAYptXagDi;FCrG*
z0Q{h|n>jfh9X&n6BSw>H8%0rvgF?n%63i`q<Dw&z{rug(JQs1V9|B{7ysh_Iwzgf-
zsgXF~KwYUfTYN@t*%YYV`1YZ`09gx{?d{vh>Rb>6wcpMHt@Jr|Zv+6h)S-F~7&F$l
zEO)!+kCL|fkiaKBVG?R5m7v^KjeTCJm*xwG`(I?d3bfKQc}wJU%30~74~yK@kgqip
zZ@V+P?6}n@MgFX*yf?jR(r{QWWyw^6`^MIh%sW3KT}}&13iOids;c10ryk$hq?!Eq
zxd46zSD4t`tW5toth$gO?_Z+Z3{yVU(;nJ+E$`RXc&%>s$cS1cyvWbeY!5CWo$ZSN
zWT%Bb)-xO5<2BqhgK*gFE%6(0O(HKxg7Sz14@|;DcZWv}T9rCCS^C-eW^pm1=>8~4
F@ju#CbyNTV

literal 0
HcmV?d00001

diff --git a/pages-warehouse/home/home.vue b/pages-warehouse/home/home.vue
index ecfb038..31412e0 100644
--- a/pages-warehouse/home/home.vue
+++ b/pages-warehouse/home/home.vue
@@ -3,18 +3,31 @@
     <!--<VNavigationBar style="position: relative;z-index: 99;" leftTitle="true" backgroundColor="rgba(0,0,0,0)" title-color="#fff" title=" "></VNavigationBar>-->
     <view class="bodyTopBg"></view>
     <view class="body">
-      <view class="userInfoBox" @click="showUserDetail">
-        <image v-if="''==userInfo.avatar || null == userInfo.avatar"
+      <view class="userInfoBox">
+        <image @click="showUserDetail" v-if="''==userInfo.avatar || null == userInfo.avatar"
                :src="defaultAvatar" mode="scaleToFill" style="width: 104rpx;height: 104rpx;border-radius: 50%;"
                @error="avatarErr"></image>
-        <image v-else :src="imgUrlPrex+userInfo.avatar" mode="scaleToFill"
+        <image @click="showUserDetail" v-else :src="imgUrlPrex+userInfo.avatar" mode="scaleToFill"
                style="width: 104rpx;height: 104rpx;border-radius: 50%;" @error="avatarErr"></image>
-        <view class="userInfo">
+        <view @click="showUserDetail" class="userInfo">
           <text class="userName">{{ userInfo.nickname }}</text>
           <text class="userType">{{ userInfo.roleNames }}</text>
         </view>
-        <image mode="aspectFita" src="/static/icons/more.png" style="width: 48rpx;height: 48rpx"></image>
+        <view class="msg-box" @click="gotoMsg">
+          <image mode="aspectFita" src="@/pages-home/static/msg.png" style="width: 48rpx;height: 48rpx"></image>
+          <view class="msg-num" v-if="noReadNum>0">{{noReadNum}}</view>
+        </view>
+        <image @click="showUserDetail" mode="aspectFita" src="/static/icons/more.png" style="width: 48rpx;height: 48rpx"></image>
       </view>
+      <!-- 通知公告 -->
+      <view class="notice-dom" v-if="noticeNum>0" @click="gotoNotice">
+        <view class="notice-box">
+          <image class="left-img"  src="@/pages-home/static/notice.png" ></image>
+          <view class="center-text">你有{{ noticeNum }}条来自平台的通知公告</view>
+          <u-icon style="width: 20rpx" color="#999" name="arrow-right" size="12"></u-icon>
+        </view>
+      </view>
+
       <view class="body-top">
         <view class="body-top-search">
           <input class="body-top-search-input" v-model="queryParams.query" placeholder="工单号、车牌号、联系电话" placeholder-style="font-size: 28rpx"
@@ -128,7 +141,11 @@ export default {
       shopList: [],
       bannerList: [],
       richTextHtml: null,
-      defaultAvatar: require('@/static/icons/avatar.png')
+      defaultAvatar: require('@/static/icons/avatar.png'),
+      //未读消息数量
+      noReadNum:0,
+      //通知公告数量
+      noticeNum:0,
     }
   },
   onLoad() {
@@ -155,10 +172,17 @@ export default {
         roleNames: '角色'
       }
       this.onRefresherrefresh()
+      this.getNoReadNum()
+      this.getNoticeList()
     }
   },
   methods: {
-
+    gotoMsg(){
+      //去消息中心
+      uni.navigateTo({
+        url: '/pages-home/msg/message'
+      })
+    },
     /**
      * 领配件、退配件Tab页
      */
@@ -260,7 +284,49 @@ export default {
       uni.navigateTo({
         url: '/pages/my/myInfo'
       })
-    }
+    },
+    /**
+     * 获取未读消息数量
+     * @returns {Promise<void>}
+     */
+    async getNoReadNum(){
+      await request({
+        url: "/admin-api/system/notify-message/get-unread-count",
+        method: "GET"
+      }).then((res) => {
+        if(res.code==200){
+          this.noReadNum = res.data>99?99:res.data
+        }
+      })
+    },
+    /**
+     * 跳转通知公告列表页
+     */
+    gotoNotice(){
+      uni.navigateTo({
+        url: '/pages-home/notice/notice'
+      })
+    },
+    /**
+     * 查通知公告--查数量
+     */
+    async getNoticeList(){
+      const res = await request({
+        url: "/admin-api/base/notice/page",
+        method: "get",
+        params: {
+          pageNo:1,
+          pageSize:1,
+          type:1,
+          parentServer: "weixiu",
+          server: "app"
+        },
+        tenantIdFlag:false
+      })
+      if(res.code==200){
+        this.noticeNum = res.data.total
+      }
+    },
   }
 }
 </script>
@@ -302,6 +368,31 @@ export default {
     flex-direction: column;
   }
 
+  .notice-dom {
+    margin: 40rpx 32rpx;
+    background: #FFFFFF;
+    border-radius: 8rpx 8rpx 8rpx 8rpx;
+    padding: 20rpx;
+    display: flex;
+    align-items: center;
+
+    .notice-box{
+      display: flex;
+
+      .left-img{
+        width: 48rpx;
+        height: 48rpx;
+      }
+      .center-text{
+        width: calc(100% - 130rpx);
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        padding:0 20rpx;
+      }
+    }
+  }
+
   .userInfoBox {
     margin: 0 32rpx 40rpx;
 
@@ -330,6 +421,25 @@ export default {
         padding: 8rpx 16rpx;
       }
     }
+
+    .msg-box{
+      position: relative;
+      margin-right: 40rpx;
+      .msg-num{
+        position: absolute;
+        right: -15rpx;
+        color: white;
+        background: #d74a43;
+        width: 35rpx;
+        height: 35rpx;
+        line-height: 35rpx;
+        text-align: center;
+        font-weight: 800;
+        font-size: 11px;
+        border-radius: 50%;
+        top: -15rpx;
+      }
+    }
   }
 
   .body-top {
diff --git a/pages.json b/pages.json
index a348fd6..7773820 100644
--- a/pages.json
+++ b/pages.json
@@ -129,6 +129,24 @@
             "navigationBarTitleText": ""
           }
         },
+        {
+          "path": "msg/message",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        },
+        {
+          "path": "notice/notice",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        },
+        {
+          "path": "notice/noticeContent",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        },
         {
           "path": "service/todoDetail",
           "style": {
diff --git a/static/images/clear.png b/static/images/clear.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c0f153b46e5637daed82ba8b0e6147dc81ab5e2
GIT binary patch
literal 2173
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

literal 0
HcmV?d00001