cyl/master-0822
wangxia 3 months ago
parent 55d9739522
commit aeb2cf568d

@ -1,7 +1,7 @@
<script lang="ts"> <script lang="ts">
import RootStore from "@xkit-yx/im-store-v2"; import RootStore from "@xkit-yx/im-store-v2";
import V2NIM, { V2NIMConst } from "nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK"; import V2NIM, { V2NIMConst } from "nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK";
import { getMsgContentTipByType } from "./pages/NEUIKit/utils/msg"; import { getMsgContentTipByType,setTabUnread } from "./pages/NEUIKit/utils/msg";
import { STORAGE_KEY } from "./pages/NEUIKit/utils/constants"; import { STORAGE_KEY } from "./pages/NEUIKit/utils/constants";
import { isWxApp } from "./pages/NEUIKit/utils"; import { isWxApp } from "./pages/NEUIKit/utils";
import { V2NIMMessage, V2NIMMessagePushConfig, V2NIMConversation } from "nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK/V2NIMMessageService"; import { V2NIMMessage, V2NIMMessagePushConfig, V2NIMConversation } from "nim-web-sdk-ng/dist/v2/NIM_UNIAPP_SDK/V2NIMMessageService";
@ -409,6 +409,7 @@ export default {
that.playAudio(); that.playAudio();
} }
}); });
setTabUnread()
}, },
playAudio() { playAudio() {

@ -64,12 +64,15 @@ export const setTabUnread = (val): void => {
'pages/home/order', 'pages/home/order',
'pages/workBench/index', 'pages/workBench/index',
'pages/message/index', 'pages/message/index',
'pages/person/index' 'pages/person/index',
'root/person/info'
] ]
console.log('11111111111111111111111111111111111111111111');
if (curRoute && !tabPaths.includes(curRoute)) { if (curRoute && !tabPaths.includes(curRoute)) {
// 不是首页和聊天页不需要设置tabbar的badge // 不是首页和聊天页不需要设置tabbar的badge
return return
} }
console.log('22222222222222222222222222222222222222222222');
const store = uni.$UIKitStore const store = uni.$UIKitStore
const unread = store?.conversationStore.totalUnreadCount || 0 const unread = store?.conversationStore.totalUnreadCount || 0
@ -96,7 +99,8 @@ export const setContactTabUnread = (): void => {
'pages/home/order', 'pages/home/order',
'pages/workBench/index', 'pages/workBench/index',
'pages/message/index', 'pages/message/index',
'pages/person/index' 'pages/person/index',
'root/person/info'
] ]
if (curRoute && !tabPaths.includes(curRoute)) { if (curRoute && !tabPaths.includes(curRoute)) {
// 不是首页和聊天页不需要设置tabbar的badge // 不是首页和聊天页不需要设置tabbar的badge

@ -121,6 +121,7 @@
import gEmpty from "@/components/empty.vue"; import gEmpty from "@/components/empty.vue";
import gPanelFormItem from "@/components/panel/formItem.vue"; import gPanelFormItem from "@/components/panel/formItem.vue";
import unloginInfo from "@/components/unloginInfo.vue"; import unloginInfo from "@/components/unloginInfo.vue";
import { getMsgContentTipByType, setTabUnread } from "../../pages/NEUIKit/utils/msg";
export default { export default {
components: { components: {
gEmpty, gEmpty,
@ -410,6 +411,7 @@ export default {
}); });
that.getAgencyInfo(); that.getAgencyInfo();
that.getTeamList(); that.getTeamList();
setTabUnread()
that.isAdmin = uni.getStorageSync("apply-userinfo").admin; that.isAdmin = uni.getStorageSync("apply-userinfo").admin;
}); });
}); });

@ -106,7 +106,7 @@ let data = {
$parmas[k] = '' $parmas[k] = ''
} }
} }
console.log("公共参数,+++++", Object.assign($parmas, that.setPublicParams())); // console.log("公共参数,+++++", Object.assign($parmas, that.setPublicParams()));
uni.request({ uni.request({
url: ajaxUrl + $url, url: ajaxUrl + $url,
data: Object.assign($parmas, that.setPublicParams()), data: Object.assign($parmas, that.setPublicParams()),

@ -115,7 +115,7 @@ let data = {
} }
} }
$header['content-type'] = 'application/json'; $header['content-type'] = 'application/json';
console.log("公共参数,+++++", Object.assign($parmas, that.wyyxsetPublicParams())); // console.log("公共参数,+++++", Object.assign($parmas, that.wyyxsetPublicParams()));
uni.request({ uni.request({
url: ajaxUrl + $url, url: ajaxUrl + $url,
data: Object.assign($parmas, that.wyyxsetPublicParams()), data: Object.assign($parmas, that.wyyxsetPublicParams()),

Loading…
Cancel
Save