From b345e1bd131b9059e731bc8f2b91e35ec992bd33 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 21 Mar 2023 15:17:34 +0800
Subject: [PATCH] bug

---
 src/components/utils/PageBase.js           | 11 ++++++++++-
 src/project/fengdu/AppCircle/AppCircle.vue |  2 +-
 src/project/fengdu/AppHome/AppHome.vue     |  1 +
 src/project/fengdu/AppMine/AppMine.vue     |  1 +
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/utils/PageBase.js b/src/components/utils/PageBase.js
index 8fa7b54..c8b07de 100644
--- a/src/components/utils/PageBase.js
+++ b/src/components/utils/PageBase.js
@@ -11,7 +11,16 @@ class PageBase {
       this.label = appName.replace(/(appName:|["'])/g, '')?.trim()
     }
     if (/customNavigation/.test(vue)) {
-      this.style = {navigationStyle: "custom"}
+      this.style = {
+        navigationStyle: "custom",
+      }
+      if (/navigationBarTextStyle/.test(vue)) {
+        this.style.navigationBarTextStyle = vue.replace(/[\s\S]*navigationBarTextStyle:([^,]+),[\s\S]*/gm, '$1').replace(/["']/g, '')?.trim()
+      }
+      //导航栏背景颜色（同状态栏背景色）
+      if (/navigationBarBackgroundColor/.test(vue)) {
+        this.style.navigationBarBackgroundColor = vue.replace(/[\s\S]*navigationBarBackgroundColor:([^,]+),[\s\S]*/gm, '$1').replace(/["']/g, '')?.trim()
+      }
     } else {
       this.style = {navigationBarTitleText: this.label}
       //是否开启下拉刷新
diff --git a/src/project/fengdu/AppCircle/AppCircle.vue b/src/project/fengdu/AppCircle/AppCircle.vue
index 0306e8f..02493e9 100644
--- a/src/project/fengdu/AppCircle/AppCircle.vue
+++ b/src/project/fengdu/AppCircle/AppCircle.vue
@@ -169,7 +169,7 @@
             content: '您只有完成信息认证后，才可进行相关操作。',
             confirmText: '去认证'
           }).then(() => {
-            this.$linkTo('../AppMine/userInfo')
+            this.$linkTo('../AppMine/userInfo?isFromTabbar=1&path=/pages/AppCircle/AppCircle')
           }).catch(() => {
           })
         }
diff --git a/src/project/fengdu/AppHome/AppHome.vue b/src/project/fengdu/AppHome/AppHome.vue
index d3407f0..b1b6eb9 100644
--- a/src/project/fengdu/AppHome/AppHome.vue
+++ b/src/project/fengdu/AppHome/AppHome.vue
@@ -38,6 +38,7 @@ export default {
   name: 'AppHome',
   appName: "首页",
   customNavigation: true,
+  navigationBarBackgroundColor: '#ffffff',
   navigationBarTextStyle: 'black',
   data() {
     return {
diff --git a/src/project/fengdu/AppMine/AppMine.vue b/src/project/fengdu/AppMine/AppMine.vue
index f3baea9..9cf4558 100644
--- a/src/project/fengdu/AppMine/AppMine.vue
+++ b/src/project/fengdu/AppMine/AppMine.vue
@@ -59,6 +59,7 @@ export default {
   name: "AppMine",
   appName: "我的",
   customNavigation: true,
+  navigationBarBackgroundColor: '#ffffff',
   navigationBarTextStyle: 'black',
   computed: {
     ...mapState(['user', 'token']),