diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue index ae7f921..2fcb91e 100644 --- a/pages/tabbar/user/utils/tool.vue +++ b/pages/tabbar/user/utils/tool.vue @@ -123,10 +123,25 @@ export default { }, methods: { + handleNavigate(url) { + uni.navigateTo({ + url, + }); + }, navigateTo(url) { - uni.navigateTo({ - url, - }); + const ignores = [ + '/pages/mine/set/setUp', + '/pages/mine/set/editionIntro', + '/pages/mine/set/feedBack' + ] + if (!ignores.includes(url)) { + if (this.$options.filters.tipsToLogin('normal')) { + this.handleNavigate(url) + } + } + else { + this.handleNavigate(url) + } }, linkMsgDetail(){ diff --git a/utils/filters.js b/utils/filters.js index 0a27eda..5ea4136 100644 --- a/utils/filters.js +++ b/utils/filters.js @@ -376,7 +376,7 @@ export function talkIm (storeId, goodsId, id) { } } -export function tipsToLogin () { +export function tipsToLogin (type) { if (!isLogin("auth")) { uni.showModal({ title: "提示", @@ -388,7 +388,10 @@ export function tipsToLogin () { if (res.confirm) { navigateToLogin(); } else if (res.cancel) { - uni.navigateBack(); + if(type !== 'normal'){ + uni.navigateBack(); + } + } }, });