theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vuex

Browse Source
This commit is contained in:
zmr900709 2020-07-15 16:52:39 +08:00
parent 46da0894b4
commit b04b2ffd16
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/api/user.js
View File

@ -302,11 +302,11 @@ export default {
delMessage({ type }) { delMessage({ type }) {
return vm.$u.post('/message/readMessage', { type }); return vm.$u.post('/message/readMessage', { type });
}, },
<<<<<<< HEAD
// 已读消息 // 已读消息
refreshToken({ }) { refreshToken({ }) {
return vm.$u.post('/Auth/refreshToken', { }); return vm.$u.post('/Auth/refreshToken', { });
======= },
// 屏蔽列表 // 屏蔽列表
articlShieldList() { articlShieldList() {
return vm.$u.post('/Article/articlShieldList'); return vm.$u.post('/Article/articlShieldList');
@ -314,7 +314,6 @@ export default {
// 取消屏蔽 // 取消屏蔽
articleDelShield({ id }) { articleDelShield({ id }) {
return vm.$u.post('article/articleDelShield', { member_id: id }); return vm.$u.post('article/articleDelShield', { member_id: id });
>>>>>>> 76a0e7e8bdfc42e7e46cc74d2cfb43fc4f544e7b
}, },
} }
} }

4
package.json
View File

@ -13,11 +13,7 @@
"author": "", "author": "",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
<<<<<<< HEAD
"uview-ui": "^1.5.0", "uview-ui": "^1.5.0",
"vuex": "^3.5.1" "vuex": "^3.5.1"
=======
"uview-ui": "^1.5.0"
>>>>>>> 76a0e7e8bdfc42e7e46cc74d2cfb43fc4f544e7b
} }
} }