diff --git a/api/request.js b/api/request.js index 8f90955..52e56bb 100644 --- a/api/request.js +++ b/api/request.js @@ -20,11 +20,11 @@ function request(url, method = 'GET', data = {}) { header, success(res) { if (res.data.code) { - if (res.data.code == 10103) { + if (res.data.code == 10103 || res.data.code == 10101) { wx.removeStorageSync('access_token'); - // wx.navigateTo({ - // url: '/pages/login/login', - // }); + wx.navigateTo({ + url: '/pages/login/index', + }); reject(res.data); return; } diff --git a/pages/my/index.vue b/pages/my/index.vue index 5cd1518..b2de1ed 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -210,7 +210,7 @@ - 退出登录 + 退出登录 快捷功能 @@ -710,6 +710,12 @@ export default { uni.navigateTo({ url: '/pages/my/editInfo/index' }); + }, + logout() { + wx.removeStorageSync('access_token'); + uni.reLaunch({ + url: '/pages/login/index' + }); } } }; diff --git a/pages/shopDetail/index.vue b/pages/shopDetail/index.vue index be0e040..c7366e8 100644 --- a/pages/shopDetail/index.vue +++ b/pages/shopDetail/index.vue @@ -43,7 +43,7 @@ ¥{{ formatPrice(currentPrice) }} ¥{{ formatPrice(originalPrice) - }} + }} 请选择规格 @@ -147,17 +147,17 @@ 前调: {{ productInfo.scent_level.top_note || '柠檬、佛手柑、粉红胡椒' - }} + }} 中调: {{ productInfo.scent_level.middle_note || '玫瑰、茉莉、牡丹' - }} + }} 后调: {{ productInfo.scent_level.base_note || '白麝香、雪松、香草' - }} + }} @@ -542,7 +542,7 @@ export default { }).catch((err) => { console.log(err); }); - + }, // 关闭购买弹窗 @@ -605,11 +605,22 @@ export default { // 跳转到购物车 goToCart() { + const token = await uni.getStorageSync('access_token') + if (!token) { + uni.navigateTo({ + url: '/pages/login/index' + }) + return + } uni.navigateTo({ url: '/pages/shoppingCart/index' }); }, async fetchCartSelectedCount() { + const token = await uni.getStorageSync('access_token') + if (!token) { + return + } try { const res = await request('xcx/carts', 'GET', { page: 1, page_size: 99 }); const list = res.list || res.data || res || [];