diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 666e24c..21d8b21 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -33,7 +33,7 @@ const useStore = useUserStore() let code = 'activity' let timer = null const codeType = { - interface: 'api_code', + Interface: 'api_code', lottery: 'lottery_code', activity: 'activity_code', } @@ -128,11 +128,8 @@ const initData = (res) => { login_content_template: loginValid, login_content_templates: login, content_templates: baseUrl, - // eslint-disable-next-line camelcase - activity_code, } = res.data - // eslint-disable-next-line camelcase - query.value = activity_code + query.value = res.data.activity_code Object.assign(contentData, res.data) if (loginValid.validate_login === 1) { // activity_code 方式 @@ -152,7 +149,7 @@ const initData = (res) => { uni.setNavigationBarTitle({ title: srcList.title, }) - useStore.setUserInfo({ srcList, contentData, query: query.value }) + useStore.setUserInfo({ srcList, contentData, query: query.value, token: loginValid.token }) } else { uni.showToast({ title: res.message, @@ -166,8 +163,7 @@ function getTimesTamp(url) { return url + (url.includes('?') ? '×tamp=' : '?timestamp=') + timestamp } -onLoad(() => { - activityCode.value = getUrlPathName() +const intervalData = () => { timer = setInterval(async () => { const params = {} params[codeType[code]] = activityCode.value || '' @@ -180,16 +176,16 @@ onLoad(() => { initData(res) } }, 60000) +} + +onLoad(() => { + activityCode.value = getUrlPathName() + intervalData() if (!useStore.userInfo.srcList.url || useStore.userInfo.query !== query.value) { initContent() } else { - const timestamp = new Date().getTime() - const url = - useStore.userInfo.srcList.url + - (useStore.userInfo.srcList.url.includes('?') ? '×tamp=' : '?timestamp=') + - timestamp Object.assign(srcList, useStore.userInfo.srcList, { - url, + url: getTimesTamp(useStore.userInfo.srcList.url), }) Object.assign(contentData, useStore.userInfo.contentData) uni.setNavigationBarTitle({