消息系统

src/component/Account/accountFollowFans.vue

@@ -11,9 +11,11 @@
 				<follow v-if="item.key == 'follow'" :ref="item.key"></follow>
 				<fans v-if="item.key == 'fans'" :ref="item.key"></fans>
 				<template #tab>
+					<span>{{item.title}}</span>
+<!-- 
 					<a-badge :count="messageSystem.messageType[item.key]" >
 					<span>{{item.title}}</span>
-					</a-badge>
+					</a-badge> -->
 				</template>
 			</a-tab-pane>
 			

src/component/Account/accountMessage.vue

@@ -111,10 +111,9 @@ export default defineComponent({
 		let setReadStatus = (value:any)=>{
 			return new Promise((resolve,reject)=>{
 				if(value.isRead == 1)return reject('')
-				let id = value.senderId?value.senderId:value.id
 				let data = {
 					type:accountMessage.activeKey,
-					notificationIdList:id
+					notificationIdList:value.id
 				}
 				Https.axiosPost(Https.httpUrls.setReadStatus,'',{params:data}).then((rv)=>{
 					if(rv){

src/component/LibraryPage/ModelPlacement.vue

@@ -37,7 +37,6 @@
 					<div style="display: flex;   align-items: center;">
 						<div style="display: flex;   align-items: center;">
 							<input type="checkbox" model="false" @click="()=>{modelType = 'System'}">
-                            {{ modelType }}
 							{{ $t('ModelPlacement.System') }}
 						</div>
 						<div style="display: flex;   align-items: center;">

src/store/userHabit/userHabit.ts

@@ -107,13 +107,23 @@ const userHabit : Module<UserHabit,RootState> = {
 			// let userInfo = ['-1']
 			let userInfo = ['followeeCount','followerCount']
 			let obj:any = {}
-			for (const iterator in data) {
+			console.log(data);
+			data.forEach((item:any) => {
+				for (const iterator in item) {
+					if(userInfo.indexOf(iterator) > -1){
+						obj[iterator] = item[iterator]
+						store.commit('setUserInfo', obj)
+					}else{
+						// if(iterator != 'newPosted')num+=item[iterator]
+						state.messageSystem.messageType[iterator] = item[iterator]
+					}
+				}
+			});
+			let allObj = state.messageSystem.messageType
+			for (const iterator in allObj) {
 				if(userInfo.indexOf(iterator) > -1){
-					obj[iterator] = data[iterator]
-					store.commit('setUserInfo', obj)
 				}else{
-					if(iterator != 'newPosted')num+=data[iterator]
-					state.messageSystem.messageType[iterator] = data[iterator]
+					if(iterator != 'newPosted')num+=allObj[iterator]
 				}
 			}
 			state.messageSystem.messageNum = num

src/tool/webSocket.js

@@ -10,6 +10,7 @@ class MyWs {
 		this.reconnectionTime = null
 	}
 	linkWs(url) {
+		if(!(JSON.parse(getCookie("userInfo"))))return
 		if (this.ws && this.ws.readyState == 1) return
 		if(!this.wsUrl)this.wsUrl = url +`/${JSON.parse(getCookie("userInfo")).userId}`
 		this.ws = new WebSocket(this.wsUrl)

src/views/HomeMain.vue

@@ -256,7 +256,7 @@ export default defineComponent({
 		let getUnreadCount = ()=>{
 			Https.axiosGet(Https.httpUrls.getUnreadCount).then((rv)=>{
 				if(rv){
-					store.commit('setMessageSystem',rv)
+					store.commit('setMessageSystem',[rv])
 				}
 			})
 		}
@@ -275,7 +275,7 @@ export default defineComponent({
 			});
 			if(isObj)store.commit('setUserInfo',obj)
 
-			store.commit('setMessageSystem',...data)
+			store.commit('setMessageSystem',data)
 		}
 		MyEvent.add('getMessage',getWsMessage)
 		// setTimeout(() => {

src/views/HomeView/library.vue

@@ -388,6 +388,7 @@ export default defineComponent({
 	props:{
 		getLangIsShowMark:{
 			type:Boolean,
+			default:true,
 		}
 	},
 	
@@ -414,7 +415,7 @@ export default defineComponent({
 			value:''
 		})
         let sex:any = ref('')
-		const sexList:any = ref([])
+		const sexList:any = computed(()=>store.state.UserHabit.sex.value)
 		const printType = computed(() => {
 			return store.state.UserHabit.printType;
 		});
@@ -520,15 +521,7 @@ export default defineComponent({
 		})
 		let generateLevel2:any = {}
 		let isSloganHint:any = ref('')
-		watch(
-			() => props.getLangIsShowMark,  // 这里使用了一个 getter 函数
-			(newValue, oldValue) => {
-				if(!newValue){
-					getLibraryList('')
-					getClass()
-					getSex()
-				}
-		})
+		
 		let getSex = () =>{
 			sex.value = store.state.UserHabit.sex.value[0].value
 			sexList.value = store.state.UserHabit.sex.value
@@ -606,6 +599,17 @@ export default defineComponent({
             ).catch((res)=>{
             });
 		}
+		watch(
+			() => props.getLangIsShowMark,  // 这里使用了一个 getter 函数
+			(newValue, oldValue) => {
+				if(!newValue){
+					getLibraryList('')
+					getClass()
+					getSex()
+				}
+			},
+			{immediate: true,}
+		)
         return {
             menuList,
             selectImgList,