diff --git a/CHANGELOG.md b/CHANGELOG.md index c6f222d..9c29750 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - | 设置状态栏 | [9871356](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9871356) - | 审核插件的基本信息展示 | [aa4f17f](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/aa4f17f) - | 审核插件的通过与驳回功能 | [03a7c35](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/03a7c35) + - | 时间轴调整 | [81d2500](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/81d2500) - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005) - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75) - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380) diff --git a/components/Roles/Roles.vue b/components/Roles/Roles.vue index 76c8eea..cfbab83 100644 --- a/components/Roles/Roles.vue +++ b/components/Roles/Roles.vue @@ -112,6 +112,12 @@ function setCurrentRole(index) { // 清除插件script function clearPluginScript() { try { + // const query = uni.createSelectorQuery().select(`script[data-type=plugin]`).fields({ + // id: true, + // dataset: true, + // context: true + // }); + const scripts = document.querySelectorAll('script[data-type=plugin]'); for (let i = 0; i < scripts.length; i++) { document.body.removeChild(scripts[i]); diff --git a/hooks/project/useInit.js b/hooks/project/useInit.js index 81fabe3..00c8d13 100644 --- a/hooks/project/useInit.js +++ b/hooks/project/useInit.js @@ -8,7 +8,7 @@ export default function useInit() { const allTasks = computed(() => store.state.task.allTasks); onLoad(options => { - store.commit('setDomain', options.url); + store.commit('setDomain', decodeURIComponent(options.url)); if (options.share && options.share === '1') { shareInit(options); } else { @@ -24,7 +24,6 @@ export default function useInit() { try { const data = await uni.$u.api.findProjectById(params); store.commit('project/setProject', data); - } catch (error) { console.log('error: ', error || '获取项目信息失败'); } diff --git a/pages/guide/adv.vue b/pages/guide/adv.vue index a6a49d6..5c74fdd 100644 --- a/pages/guide/adv.vue +++ b/pages/guide/adv.vue @@ -10,7 +10,7 @@ - {{ time === 0 ? '跳过广告' : time + 's' }} + {{ time }} 跳过 @@ -32,11 +32,11 @@ imgs.value = JSON.parse(advs.value); }) - const time = ref(10); + const time = ref(5); let timer = setInterval(() => { time.value--; - if (time.value === 0) clearInterval(timer); + if (time.value === 1) clearInterval(timer); }, 1000); setTimeout(() => { @@ -52,7 +52,7 @@ url: '/pages/guide/guide' }) } - }, 10000); + }, 5000); @@ -78,7 +78,7 @@ } .time-box { - top: 10px; + bottom: 50px; right: 10px; display: inline-block; width: 60px; @@ -88,7 +88,7 @@ text-align: center; background-color: rgba(255, 255, 255, .7); border-radius: 12px; - color: #FFFFFF; - border: 1px solid rgba(255, 255, 255, .8); + color: #666; + border: 1px solid #eee; }