Browse Source

更新判断

lex 2 years ago
parent
commit
57912b2387
2 changed files with 6 additions and 8 deletions
  1. 4 4
      src/views/member-center/index.tsx
  2. 2 4
      src/views/music/album-detail/index.tsx

+ 4 - 4
src/views/member-center/index.tsx

@@ -58,6 +58,7 @@ export default defineComponent({
         avatar: users?.heardUrl,
         avatar: users?.heardUrl,
         id: users?.userId,
         id: users?.userId,
         memberRankSettingId: users?.memberRankSettingId,
         memberRankSettingId: users?.memberRankSettingId,
+        isVip: users?.isVip,
         membershipDays: users?.membershipDays,
         membershipDays: users?.membershipDays,
         membershipEndTime: users?.membershipEndTime
         membershipEndTime: users?.membershipEndTime
       }
       }
@@ -162,7 +163,7 @@ export default defineComponent({
     onSubmit() {
     onSubmit() {
       const member: any = this.selectMember
       const member: any = this.selectMember
       // 判断是否有会员
       // 判断是否有会员
-      const startTime = this.userInfo.memberRankSettingId
+      const startTime = this.userInfo.isVip
         ? dayjs(this.userInfo.membershipEndTime).toDate()
         ? dayjs(this.userInfo.membershipEndTime).toDate()
         : new Date()
         : new Date()
       let endTime = new Date()
       let endTime = new Date()
@@ -234,7 +235,7 @@ export default defineComponent({
               title: () => (
               title: () => (
                 <div class={styles.userInfo}>
                 <div class={styles.userInfo}>
                   <span class={styles.name}>{this.userInfo.username}</span>
                   <span class={styles.name}>{this.userInfo.username}</span>
-                  {!!this.userInfo.memberRankSettingId && (
+                  {!!this.userInfo.isVip && (
                     <Image
                     <Image
                       class={styles.level}
                       class={styles.level}
                       src="https://daya.ks3-cn-beijing.ksyun.com/202107/ScSTL1D.png"
                       src="https://daya.ks3-cn-beijing.ksyun.com/202107/ScSTL1D.png"
@@ -248,9 +249,8 @@ export default defineComponent({
               ),
               ),
               label: () => (
               label: () => (
                 <div class={styles.member_time}>
                 <div class={styles.member_time}>
-                  {this.userInfo.memberRankSettingId ? (
+                  {this.userInfo.isVip ? (
                     <div>
                     <div>
-                      {' '}
                       会员权益有效期剩余
                       会员权益有效期剩余
                       <span class={styles.remaining}>
                       <span class={styles.remaining}>
                         {this.userInfo.membershipDays}
                         {this.userInfo.membershipDays}

+ 2 - 4
src/views/music/album-detail/index.tsx

@@ -401,9 +401,7 @@ export default defineComponent({
                 <div
                 <div
                   class={[
                   class={[
                     'btnGroup',
                     'btnGroup',
-                    buyVip.value &&
-                      !state.user.data.memberRankSettingId &&
-                      'btnMore'
+                    buyVip.value && !state.user.data.isVip && 'btnMore'
                   ]}
                   ]}
                   style={{ paddingTop: '12px' }}
                   style={{ paddingTop: '12px' }}
                 >
                 >
@@ -416,7 +414,7 @@ export default defineComponent({
                   >
                   >
                     购买专辑
                     购买专辑
                   </Button>
                   </Button>
-                  {buyVip.value && !state.user.data.memberRankSettingId && (
+                  {buyVip.value && !state.user.data.isVip && (
                     <Button
                     <Button
                       block
                       block
                       round
                       round