From 1e6d955d13346ce89eb2819c86485eb6b122a8bb Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 02 四月 2025 11:22:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardViewModel.kt | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardViewModel.kt b/app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardViewModel.kt
index 1feafd8..fa18bcf 100644
--- a/app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardViewModel.kt
+++ b/app/src/main/java/com/example/firstapp/ui/vip/MemberInfoCardViewModel.kt
@@ -51,8 +51,15 @@
// 开通状态
if(userInfo.isMember){
// 判断userInfo.memberOvertime是否为空，如果不为空，则截取字符串到年月日
- if(userInfo.memberOvertime.isNotEmpty()){
- _memberStatus.value = userInfo.memberOvertime.substring(0,10)+" 到期"
+// if(userInfo.memberOvertime.isNotEmpty()){
+// _memberStatus.value = userInfo.memberOvertime.substring(0,10)+" 到期"
+// }
+
+ _memberStatus.value = " 到期"
+ userInfo.memberOvertime?.let {
+ if (it.isNotEmpty()) {
+ _memberStatus.value = it.substring(0, 10) + " 到期"
+ }
}
// vip头像
_vipCover.value ="http://192.168.1.201:9000/sms/member/vip.png"
--
Gitblit v1.9.3