diff --git a/api/appUser.js b/api/appUser.js index a68d21c..43f8d45 100755 --- a/api/appUser.js +++ b/api/appUser.js @@ -117,19 +117,19 @@ export function setDefaultAddress(user_id, address_id) { } export function getActivityDetail(activity_id) { - return authRequest({ url: `/api/app/activities/${activity_id}`, method: 'GET' }) + return request({ url: `/api/app/activities/${activity_id}`, method: 'GET' }) } export function getActivityIssues(activity_id) { - return authRequest({ url: `/api/app/activities/${activity_id}/issues`, method: 'GET' }) + return request({ url: `/api/app/activities/${activity_id}/issues`, method: 'GET' }) } export function getActivityIssueRewards(activity_id, issue_id) { - return authRequest({ url: `/api/app/activities/${activity_id}/issues/${issue_id}/rewards`, method: 'GET' }) + return request({ url: `/api/app/activities/${activity_id}/issues/${issue_id}/rewards`, method: 'GET' }) } export function getIssueDrawLogs(activity_id, issue_id) { - return authRequest({ url: `/api/app/activities/${activity_id}/issues/${issue_id}/draw_logs`, method: 'GET' }) + return request({ url: `/api/app/activities/${activity_id}/issues/${issue_id}/draw_logs`, method: 'GET' }) } export function drawActivityIssue(activity_id, issue_id) { @@ -141,7 +141,7 @@ export function getIssueChoices(activity_id, issue_id) { } export function getProductDetail(product_id) { - return authRequest({ url: `/api/app/products/${product_id}`, method: 'GET' }) + return request({ url: `/api/app/products/${product_id}`, method: 'GET' }) } export function redeemInventory(user_id, ids) { @@ -346,7 +346,7 @@ export function playMatchingGame(game_id) { * 获取所有启用的卡牌配置 */ export function getMatchingCardTypes() { - return authRequest({ url: '/api/app/matching/card_types', method: 'GET' }) + return request({ url: '/api/app/matching/card_types', method: 'GET' }) } export function createMatchingPreorder({ issue_id, position, coupon_id = 0, item_card_id = 0, use_game_pass = false }) { diff --git a/pages-activity/activity/duiduipeng/index.vue b/pages-activity/activity/duiduipeng/index.vue index 313259d..673e776 100755 --- a/pages-activity/activity/duiduipeng/index.vue +++ b/pages-activity/activity/duiduipeng/index.vue @@ -1589,8 +1589,10 @@ onLoad((opts) => { syncResumeGame(id) fetchDetail(id) fetchIssues(id) - // 获取次数卡 - fetchGamePasses() + // 获取次数卡(仅登录用户) + if (uni.getStorageSync('token')) { + fetchGamePasses() + } } fetchCardTypes() }) diff --git a/pages-activity/activity/wuxianshang/index.vue b/pages-activity/activity/wuxianshang/index.vue index 7648578..95f9827 100755 --- a/pages-activity/activity/wuxianshang/index.vue +++ b/pages-activity/activity/wuxianshang/index.vue @@ -476,7 +476,9 @@ onLoad(async (opts) => { if (currentIssueId.value) { fetchWinRecords(id, currentIssueId.value) } - fetchPasses() + if (uni.getStorageSync('token')) { + fetchPasses() + } }) // 监听期切换,刷新记录 diff --git a/pages-activity/activity/yifanshang/index.vue b/pages-activity/activity/yifanshang/index.vue index ae77436..3140c49 100755 --- a/pages-activity/activity/yifanshang/index.vue +++ b/pages-activity/activity/yifanshang/index.vue @@ -774,7 +774,9 @@ onLoad(async (opts) => { fetchWinRecords(id, currentIssueId.value) } // 获取次数卡 - fetchPasses() + if (uni.getStorageSync('token')) { + fetchPasses() + } }) onUnload(() => { diff --git a/utils/request.js b/utils/request.js index 55efad8..1fa68e4 100755 --- a/utils/request.js +++ b/utils/request.js @@ -23,7 +23,7 @@ function handleAuthExpired() { // 不再脱敏,直接打印原始数据 -export function request({ url, method = 'GET', data = {}, header = {} }) { +export function request({ url, method = 'GET', data = {}, header = {}, suppressAuthModal = false }) { return new Promise((resolve, reject) => { const finalHeader = { ...buildDefaultHeaders(), ...header } uni.request({ @@ -39,7 +39,7 @@ export function request({ url, method = 'GET', data = {}, header = {} }) { resolve(body && body.data !== undefined ? body.data : body) } else { if (code === 401) { - const suppress = finalHeader && (finalHeader['X-Suppress-Auth-Modal'] || finalHeader['x-suppress-auth-modal']) + const suppress = suppressAuthModal || finalHeader && (finalHeader['X-Suppress-Auth-Modal'] || finalHeader['x-suppress-auth-modal']) if (!suppress) { handleAuthExpired() }