From aba3c69153bd4912fdcbda338dc71ce07dbb0718 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 21 Oct 2024 15:58:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/market.js | 10 + pages.json | 18 ++ pages/components/pages/mine/content.vue | 50 ---- pages/components/pages/mine/list.vue | 325 ++++++++++++++++++++++++ pages/components/pages/mine/news.vue | 2 +- pages/index/index.vue | 4 +- pages/mine/mine.vue | 7 +- pages/msg/index.vue | 10 + static/images/23.png | Bin 0 -> 16875 bytes 9 files changed, 371 insertions(+), 55 deletions(-) create mode 100644 api/market.js delete mode 100644 pages/components/pages/mine/content.vue create mode 100644 pages/components/pages/mine/list.vue create mode 100644 static/images/23.png diff --git a/api/market.js b/api/market.js new file mode 100644 index 0000000..f87961d --- /dev/null +++ b/api/market.js @@ -0,0 +1,10 @@ +import api from './api' + +export function getNews(data) { + return api.get('/system/notice/page', data, { login: false }) +} + +export function getNewsDetail(data) { + return api.get('/system/notice/get', data, { login: false }) +} + diff --git a/pages.json b/pages.json index 6e37f1b..6c62a61 100644 --- a/pages.json +++ b/pages.json @@ -280,6 +280,24 @@ "enablePullDownRefresh": false } + }, + { + "path" : "pages/mine/list", + "style" : + { + "navigationBarTitleText": "通知", + "enablePullDownRefresh": false + } + + }, + { + "path" : "pages/mine/news", + "style" : + { + "navigationBarTitleText": "通知详情", + "enablePullDownRefresh": false + } + }, { "path" : "pages/msg/wait", diff --git a/pages/components/pages/mine/content.vue b/pages/components/pages/mine/content.vue deleted file mode 100644 index 8c72b7b..0000000 --- a/pages/components/pages/mine/content.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - - diff --git a/pages/components/pages/mine/list.vue b/pages/components/pages/mine/list.vue new file mode 100644 index 0000000..bc69a6f --- /dev/null +++ b/pages/components/pages/mine/list.vue @@ -0,0 +1,325 @@ + + + + + diff --git a/pages/components/pages/mine/news.vue b/pages/components/pages/mine/news.vue index cbe1689..f895586 100644 --- a/pages/components/pages/mine/news.vue +++ b/pages/components/pages/mine/news.vue @@ -36,7 +36,7 @@ onLoad((option) => { } }) const getContent = async(id) => { - let data = await getNewsDetail(id); + let data = await getNewsDetail({id:id}); if (data) { news.value = data; } diff --git a/pages/index/index.vue b/pages/index/index.vue index b774ec5..e65b754 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -222,7 +222,7 @@ const getData = async() => { toolIcons3.value[10].count = brieCount.count11 toolIcons3.value[11].count = brieCount.count12 main.SET_INDEX_COUNT(data) - let count = data.contractCheckCount + data.invoiceCheckCount + data.receivablesCheckCount + data.followBusinessCount + data.followCluesCount + data.followCustomerCount + let count = brieCount.count13+data.contractCheckCount + data.invoiceCheckCount + data.receivablesCheckCount + data.followBusinessCount + data.followCluesCount + data.followCustomerCount //let str = count > 0 ? count + '' : '' if(count > 0){ uni.setTabBarBadge({ @@ -360,7 +360,7 @@ const gopage2 = (url) =>{ background-color: #D7D7D7; font-size: 25rpx; padding: 10rpx 20rpx; - border-radius: 20rpx; + border-radius: 20rpx; } } } diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index 6665756..62607af 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -30,8 +30,9 @@ - - + + + 通知 @@ -190,9 +191,11 @@ const roleName = ref('--') const waitCount = ref(0) const checkCount = ref(0) +const noticeCount = ref(0) onShow(() => { + noticeCount.value = indexCount.value.brieCountVO.count13 waitCount.value = indexCount.value.followBusinessCount + indexCount.value.followCluesCount + indexCount.value.followCustomerCount checkCount.value = indexCount.value.contractCheckCount + indexCount.value.invoiceCheckCount + indexCount.value.receivablesCheckCount getUserInfo(); diff --git a/pages/msg/index.vue b/pages/msg/index.vue index 21cd346..5dfbe55 100644 --- a/pages/msg/index.vue +++ b/pages/msg/index.vue @@ -29,6 +29,14 @@ + + + @@ -49,8 +57,10 @@ const cart = ref([]) const uToast = ref() const waitCount = ref(0) const checkCount = ref(0) +const noticeCount = ref(0) onShow(() => { + noticeCount.value = indexCount.value.brieCountVO.count13 waitCount.value = indexCount.value.followBusinessCount + indexCount.value.followCluesCount + indexCount.value.followCustomerCount checkCount.value = indexCount.value.contractCheckCount + indexCount.value.invoiceCheckCount + indexCount.value.receivablesCheckCount }) diff --git a/static/images/23.png b/static/images/23.png new file mode 100644 index 0000000000000000000000000000000000000000..0003992e46bd93aa8370e379ff6f3a1bf11873c4 GIT binary patch literal 16875 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