...
This commit is contained in:
@@ -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({
|
||||||
|
|||||||
Reference in New Issue
Block a user