From dc004824b5a7e46ea7e80017d65a3c3803d613ad Mon Sep 17 00:00:00 2001 From: wxd <1627315083@qq.com> Date: Wed, 2 Oct 2024 12:27:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Account/accountFollowFans.vue | 4 +++- src/component/Account/accountMessage.vue | 3 +-- src/component/LibraryPage/ModelPlacement.vue | 1 - src/store/userHabit/userHabit.ts | 20 ++++++++++++---- src/tool/webSocket.js | 1 + src/views/HomeMain.vue | 4 ++-- src/views/HomeView/library.vue | 24 ++++++++++++-------- 7 files changed, 36 insertions(+), 21 deletions(-) diff --git a/src/component/Account/accountFollowFans.vue b/src/component/Account/accountFollowFans.vue index 0a356691..7df417d3 100644 --- a/src/component/Account/accountFollowFans.vue +++ b/src/component/Account/accountFollowFans.vue @@ -11,9 +11,11 @@ diff --git a/src/component/Account/accountMessage.vue b/src/component/Account/accountMessage.vue index a94d3f51..ea9df2e3 100644 --- a/src/component/Account/accountMessage.vue +++ b/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){ diff --git a/src/component/LibraryPage/ModelPlacement.vue b/src/component/LibraryPage/ModelPlacement.vue index 0d1f9da6..82a5cff2 100644 --- a/src/component/LibraryPage/ModelPlacement.vue +++ b/src/component/LibraryPage/ModelPlacement.vue @@ -37,7 +37,6 @@
- {{ modelType }} {{ $t('ModelPlacement.System') }}
diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts index 794204ea..1c00c45f 100644 --- a/src/store/userHabit/userHabit.ts +++ b/src/store/userHabit/userHabit.ts @@ -107,13 +107,23 @@ const userHabit : Module = { // 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 diff --git a/src/tool/webSocket.js b/src/tool/webSocket.js index df460689..007282e9 100644 --- a/src/tool/webSocket.js +++ b/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) diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index a1469b48..0a861cb6 100644 --- a/src/views/HomeMain.vue +++ b/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(() => { diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index 177b03b2..6aeb6b91 100644 --- a/src/views/HomeView/library.vue +++ b/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,