From dc0bc9dd9b2737198492a943dcfc8cb0c732263b Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Tue, 14 Nov 2023 16:35:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E3=80=81=E8=AE=A4=E8=AF=81=E5=88=A4=E6=96=AD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=8C=E5=86=85=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/accountSettings/accountSettings.vue |  3 +++
 pages/assets/address-list.vue             |  3 +++
 pages/base/home.vue                       | 28 +++++++++++++++--------
 pages/safe/index.vue                      |  7 +++++-
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/pages/accountSettings/accountSettings.vue b/pages/accountSettings/accountSettings.vue
index 7831bb0..1797e84 100644
--- a/pages/accountSettings/accountSettings.vue
+++ b/pages/accountSettings/accountSettings.vue
@@ -204,4 +204,7 @@ export default {
 ::v-deep .lb-picker-default-slot {
     font-size: 14px !important;
 }
+.bg-panel-3{
+		background-color: #242424;
+	}
 </style>
diff --git a/pages/assets/address-list.vue b/pages/assets/address-list.vue
index 1cba4e2..5a28c03 100644
--- a/pages/assets/address-list.vue
+++ b/pages/assets/address-list.vue
@@ -186,4 +186,7 @@ export default {
 };
 </script>
 <style lang="scss">
+	.bg-panel-4{
+		background-color: #242424;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/base/home.vue b/pages/base/home.vue
index 55d7768..4db1b9e 100644
--- a/pages/base/home.vue
+++ b/pages/base/home.vue
@@ -506,8 +506,8 @@
 					</view>
 				</view>
 				
-				<v-link :to="detail.status!=2?'/pages/auth/index':''" tag="div"
-					class="p-xs m-xs color-theme-1 d-flex justify-between align-center" style="background-color: #212121;" v-if="!isLogin">
+				<v-link :to="detail.status!=2?'/pages/auth/index':''" tag="div" v-if="false"
+					class="p-xs m-xs color-theme-1 d-flex justify-between align-center" style="background-color: #212121;">
 					
 					<view class="d-flex align-center">
 						<van-icon name="manager" class="col-fff" />
@@ -517,14 +517,20 @@
 					<text class="bg-theme-1 color-white p-x-xs p-y-xxs rounded" v-else>{{$t('auth.a3')}}</text>
 				</v-link>
 				
-				<v-link class=" p-xs m-xs d-flex justify-between align-center" to="/pages/login/index" v-else >
+				<v-link class=" p-xs m-xs d-flex justify-between align-center" :to="detail.status!=2?'/pages/auth/index':''" v-if="isLogin">
 					<view style="display: flex;">
 						<image src="@/assets/img/home/login.png" mode="aspectFit" class="logine"></image>
 						<image src="@/assets/img/home/Havelogged.png" mode="aspectFit" class="havelogg"></image>
 						<view style="margin-left: 26rpx;">
 							<view class="color-light username">{{username}}</view>
-							<view class="border_authentication">
-								{{$t("base.f6")}}
+							<view class="border_authentication" v-if="detail.status===2">
+								{{$t('auth.a4')}},{{$t('auth.a3')}}
+							</view>
+							<view class="border_authentication" v-else-if="detail.primary_status===1">
+								{{$t("base.f6")}}<!-- {{detail.primary_status_text}} -->
+							</view>
+							<view class="border_authentication" v-else>
+								{{$t('first.a0')}}
 							</view>
 						</view>
 					</view>
@@ -677,15 +683,15 @@
 						<!-- $localImgUrl('pages1.png') -->
 						<view class="color-light">{{ $t("base.c1") }}</view>
 					</view>
-					<v-link to="/pages/safe/index" tag="div" class="manage_text">
+					<v-link :to="isLogin?'/pages/safe/index':'/pages/login/index'" tag="div" class="manage_text">
 						<img src="@/static/img/pages2.png">
 						<view class="color-light">{{ $t("base.c3") }}</view>
 					</v-link>
-					<v-link to="/pages/notice/index" tag="div" class="manage_text">
+					<v-link :to="isLogin?'/pages/notice/index':'/pages/login/index'" tag="div" class="manage_text">
 						<img src="@/static/img/pages3.png">
 						<view class="color-light">{{ $t("base.c4") }}</view>
 					</v-link>
-					<v-link to="/pages/assets/address-list" tag="div" class="manage_text">
+					<v-link :to="isLogin?'/pages/assets/address-list':'/pages/login/index'" tag="div" class="manage_text">
 						<img src="@/static/img/pages4.png">
 						<view class="color-light">{{ $t("base.c5") }}</view>
 					</v-link>
@@ -693,7 +699,7 @@
 						<img src="@/static/img/pages5.png">
 						<view class="color-light">{{ $t("first.a1") }}</view>
 					</v-link>
-					<v-link to="/pages/accountSettings/accountSettings" tag="div" class="manage_text">
+					<v-link :to="isLogin?'/pages/accountSettings/accountSettings':'/pages/login/index'" tag="div" class="manage_text">
 						<img src="@/static/img/pages6.png">
 						<view class="color-light">{{ $t("base.c6") }}</view>
 					</v-link>
@@ -1372,7 +1378,9 @@
 
 	.goLogin {
 		padding: 5px 15px;
-		border: 1px solid $theme-1;
+		// border: 1px solid $theme-1;
+		color: #fff;
+		border: 1px solid #fff;
 	}
 
 	.p-y-xxs {
diff --git a/pages/safe/index.vue b/pages/safe/index.vue
index 5a21bd8..462c81a 100644
--- a/pages/safe/index.vue
+++ b/pages/safe/index.vue
@@ -112,4 +112,9 @@ export default {
    
   }
 };
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+	.bg-panel-3{
+			background-color: #242424;
+		}
+</style>
\ No newline at end of file