From e2e0543e0bc5d3176bde84d19d26db52f7022ced Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Tue, 8 Aug 2023 11:21:15 +0800 Subject: [PATCH] bug --- src/entry/popup.js | 1 + src/utils/index.js | 10 +++++----- src/view/NormalSendGoods.vue | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/entry/popup.js b/src/entry/popup.js index a8f81ad..f2b2cd9 100644 --- a/src/entry/popup.js +++ b/src/entry/popup.js @@ -18,6 +18,7 @@ dayjs.extend(relativeTime) Vue.prototype.$dayjs = dayjs Object.keys(utils).forEach(v => Vue.prototype[`$${v}`] = utils[v]) + Vue.prototype.$http = instance new Vue({ diff --git a/src/utils/index.js b/src/utils/index.js index 61a5abf..0eaf6f2 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -91,15 +91,15 @@ const dateUtil = { } const userCheck = () => { - store.dispatch('getUserInfo').then(res => { - return new Promise((resolve, reject) => { - if (res.data.flag != 1) { + return new Promise((resolve, reject) => { + store.dispatch('getUserInfo').then(res => { + if (res.flag != 1) { Message.error('您的账号未激活或已失效,请激活后使用') - this.$store.commit('setActiveDlgShow', true) + store.commit('setActiveDlgShow', true) reject('您的账号未激活或已失效,请激活后使用') return false } - if (res.data.type != 4 && this.$store.state.mallId != this.$store.state.userInfo.mallId) { + if (res.type != 4 && store.state.mallId != store.state.userInfo.mallId) { Message.error('您当前登录的TEMU账号与会员绑定账号不一致') reject('您当前登录的TEMU账号与会员绑定账号不一致') return false diff --git a/src/view/NormalSendGoods.vue b/src/view/NormalSendGoods.vue index a8cfe49..fd7034b 100644 --- a/src/view/NormalSendGoods.vue +++ b/src/view/NormalSendGoods.vue @@ -280,7 +280,7 @@ return; } - this.$userCheck.then(() => { + this.$userCheck().then(() => { if (this.choosedList.length <= 0) { Message.error('请选择备货单'); return;