From 7f6263863b6e496f500d418dfda422a789287200 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Mon, 28 Aug 2023 11:47:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/oaHome/oaHome.vue | 7 +------ store/getters.js | 1 + subpkg/archives/archives.vue | 1 + subpkg/updateArchives/updateArchives.vue | 5 +++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index 94cb9bf..d23d38b 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -190,6 +190,7 @@ import { import { noticeList } from "@/api/notice.js"; +import { mapState } from "@/store/index.js" // import tabbar from '../components/tabbar' import { getIndexListAPI, @@ -251,12 +252,6 @@ export default { ApproveList: [], }; }, - onReady () { - uni.setNavigationBarColor({ - frontColor: "#ffffff", - backgroundColor: "#0122c7", - }); - }, onLoad () { this.is_captain = JSON.parse(uni.getStorageSync("USER_INFO")).is_captain this.options.data = bj; diff --git a/store/getters.js b/store/getters.js index ab80a0f..d4d2ad0 100644 --- a/store/getters.js +++ b/store/getters.js @@ -3,6 +3,7 @@ export default { isLogin: state => !!state.app.token, userInfo: state => state.app.userInfo || {}, eyeType: state => state.config.eyeType || true, + config: state => state.config.config || {} }; // export default { // token: state => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJrYWlmYS5jcm1lYi5uZXQiLCJhdWQiOiJrYWlmYS5jcm1lYi5uZXQiLCJpYXQiOjE1NzcwODM1MzQsIm5iZiI6MTU3NzA4MzUzNCwiZXhwIjoxNTc3MDk0MzM0LCJqdGkiOnsiaWQiOjExMCwidHlwZSI6InVzZXIifX0.U-i1pbdRjyXI1gr79Uq2XBPZ89T8f5Ai9jwrR8woTwE', diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue index 30a506d..f1b0d84 100644 --- a/subpkg/archives/archives.vue +++ b/subpkg/archives/archives.vue @@ -214,6 +214,7 @@ } else Toast('暂未开放'); }, async initLoad() { + console.log('更新'); this.loadConfig.page = 1; this.loadConfig.status = "loadmore"; this.list = []; diff --git a/subpkg/updateArchives/updateArchives.vue b/subpkg/updateArchives/updateArchives.vue index 16c4ce8..d987dff 100644 --- a/subpkg/updateArchives/updateArchives.vue +++ b/subpkg/updateArchives/updateArchives.vue @@ -162,9 +162,10 @@ uni.showToast({ icon: 'none', title: '更新成功', - success() { + success: ()=> { setTimeout(() => { - uni.$emit('initOaTask'); + if(this.task_id) uni.$emit('loadArchives'); + else uni.$emit('initOaTask'); uni.navigateBack() }, 1000) }