diff --git a/pages-home/home/home.vue b/pages-home/home/home.vue index 983a8fb..0d2b1df 100644 --- a/pages-home/home/home.vue +++ b/pages-home/home/home.vue @@ -955,7 +955,7 @@ export default { */ async getNoReadNum(){ await request({ - url: "/admin-api/system/notify-message/get-unread-count", + url: "/admin-api/system/notify-message/get-unread-count?systemCode=weixiu", method: "GET" }).then((res) => { if(res.code==200){ @@ -981,7 +981,7 @@ export default { params: { pageNo:1, pageSize:1, - type:1, + typeStr:"1,2", parentServer: "weixiu", server: "app" }, diff --git a/pages-home/notice/notice.vue b/pages-home/notice/notice.vue index 2421de1..d8b23f8 100644 --- a/pages-home/notice/notice.vue +++ b/pages-home/notice/notice.vue @@ -96,7 +96,7 @@ params:{ pageNo:this.pageNo, pageSize:this.pageSize, - type:1, + typeStr:"1,2", parentServer: "weixiu", server: "app" } diff --git a/pages-warehouse/home/home.vue b/pages-warehouse/home/home.vue index 1f4cfef..b856fff 100644 --- a/pages-warehouse/home/home.vue +++ b/pages-warehouse/home/home.vue @@ -388,7 +388,7 @@ export default { */ async getNoReadNum() { await request({ - url: "/admin-api/system/notify-message/get-unread-count", + url: "/admin-api/system/notify-message/get-unread-count?systemCode=weixiu", method: "GET" }).then((res) => { if (res.code == 200) { @@ -419,7 +419,7 @@ export default { params: { pageNo: 1, pageSize: 1, - type: 1, + typeStr:"1,2", parentServer: "weixiu", server: "app" }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 02338b1..63c27a3 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -89,7 +89,7 @@ */ async getNoReadNum(){ await request({ - url: "/admin-api/system/notify-message/get-unread-count", + url: "/admin-api/system/notify-message/get-unread-count?systemCode=weixiu", method: "GET" }).then((res) => { if(res.code==200 && res.data>0){ diff --git a/pages/login/login.vue b/pages/login/login.vue index 56858fe..83e42e6 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -332,7 +332,7 @@ */ async getNoReadNum(){ await request({ - url: "/admin-api/system/notify-message/get-unread-count", + url: "/admin-api/system/notify-message/get-unread-count?systemCode=weixiu", method: "GET" }).then((res) => { if(res.code==200 && res.data>0){ diff --git a/utils/tebBarSocket.js b/utils/tebBarSocket.js index 2b6e6db..e91425f 100644 --- a/utils/tebBarSocket.js +++ b/utils/tebBarSocket.js @@ -10,7 +10,7 @@ import config from '@/config' export function tabBarconnect(tenantId, userId) { console.log("通知socket链接", tenantId, userId); var socketTask = uni.connectSocket({ - url: config.wsUrl + '/websocket/message/'+tenantId+'/' + userId, + url: config.wsUrl + '/websocket/message/weixiu/'+tenantId+'/' + userId, success(res) { },