diff --git a/CHANGELOG.md b/CHANGELOG.md index e6b1a8d..0488f4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -162,6 +162,7 @@ - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/19228d6) - | 角色滚动问题修复 | [c8ee189](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/c8ee189) - | 解决时间轴报错 | [da1eece](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/da1eece) + - | 解决进项目角色id不更新问题 | [3b400df](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/3b400df) - | 设置时间轴自动滚动到当前位置 | [a3474f8](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/a3474f8) - | 调试定期任务bug;不能合并使用 | [d641312](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/d641312) - | 跳转详情页返回路径修改 | [c5e17c0](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/c5e17c0) diff --git a/public/index.html b/public/index.html index 1c65041..47670c0 100644 --- a/public/index.html +++ b/public/index.html @@ -16,6 +16,11 @@ + + diff --git a/src/components/Title/Title.vue b/src/components/Title/Title.vue index b4f5a2d..5c7a240 100644 --- a/src/components/Title/Title.vue +++ b/src/components/Title/Title.vue @@ -101,11 +101,12 @@ export default { onBack() { // eslint-disable-next-line no-undef const pages = getCurrentPages(); // 获取页面栈数组 + console.log('历史pages: ', pages.length); if (pages.length > 1) { - uni.navigateBack(); + uni.webView.navigateBack(); } else { // this.$u.route('/', { u: this.userId }); - uni.webView.redirectTo({ url: `/pages/index/index?u=${this.userId}` }); + uni.webView.reLaunch({ url: `/pages/index/index?u=${this.userId}` }); } }, @@ -120,7 +121,7 @@ export default { // 回到首页 openIndex() { console.log(111); - uni.webView.redirectTo({ url: `/pages/index/index?u=${this.userId}` }); + uni.webView.reLaunch({ url: `/pages/index/index?u=${this.userId}` }); }, //操作 diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue index f1267c6..fc64c03 100644 --- a/src/pages/project/project.vue +++ b/src/pages/project/project.vue @@ -304,11 +304,9 @@ export default { this.$t.ui.showToast('缺少项目信息参数'); // 没有项目id参数 } else { if (options.p !== this.$t.storage.getStorageSync('projectId')) { - console.log('换项目了'); this.$t.storage.setStorageSync('roleId', ''); } // TODO - console.log('项目id: ', options.p); this.getProjectById({ projectId: options.p, num: 0 }); // 根据项目id获取项目信息 } },