TmOct5/ZhHealth
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

merge

Browse Source
This commit is contained in:
唐明明
2022-02-25 15:12:37 +08:00
parent d9f379d489
commit 17899df882
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
static/.DS_Store vendored
View File

Binary file not shown.

4
store/modules/im.js
View File

@@ -47,14 +47,10 @@ export default {
name: contactInfo.name, name: contactInfo.name,
portraitUrl: contactInfo.portraitUrl portraitUrl: contactInfo.portraitUrl
} }
<<<<<<< HEAD
}
=======
}, },
setContactRemark(state, contactInfo) { setContactRemark(state, contactInfo) {
Vue.set(state.contacts, contactInfo.targetId, contactInfo) Vue.set(state.contacts, contactInfo.targetId, contactInfo)
} }
>>>>>>> 013c030963aef06a00ac33d5f767cbd97ef2ceac
}, },
actions: { actions: {
setContactRemark({ setContactRemark({