Merge branch 'iteration-20240624' into jenkins

src/components/col-header/modals/loganInfo.tsx

@@ -96,7 +96,7 @@ export default defineComponent({
           }
           break
         case 'VIP':
-          status = userInfo.isVip > 0
+          status = userInfo.userVip?.vipType === 'VIP'
           break
         case 'SVIP':
           status =

src/views/student-info/components/users/index.tsx

@@ -65,12 +65,10 @@ export default defineComponent({
         <div class="bg-[#FFE7CF] absolute left-6 top-0 text-[#AB5400] text-xs py-0.5 px-2 rounded-[10px]">
           学生
         </div>
-
         <img
           src={this.userInfo.heardUrl || iconTeacher}
           class="w-[68px] h-[68px] rounded-full border-2 border-[#2DC7AA] border-solid mt-6 mx-auto object-cover"
         />
-
         <p class="text-[#333] text-lg font-semibold pt-4 flex items-center justify-center">
           {this.userInfo.username}
 
@@ -95,9 +93,12 @@ export default defineComponent({
             class="h-[26px]"
           /> */}
         </p>
-
-        <div class={this.userInfo.isVip !== 1 ? 'mt-5' : ''}>
-          {this.userInfo.isVip !== 1 && (
+        <div
+          class={
+            !(this.checkBadge('SVIP') || !this.checkBadge('VIP')) ? 'mt-5' : ''
+          }
+        >
+          {!(this.checkBadge('SVIP') || this.checkBadge('VIP')) && (
             <ElButton
               round
               type="primary"
@@ -111,7 +112,6 @@ export default defineComponent({
             </ElButton>
           )}
         </div>
-
         <div class="text-base text-[#999] mx-[25px] mt-9 flex items-center justify-center pt-10 border-t border-solid border-[#E7E6E6]">
           <span
             class="flex items-center justify-center flex-col leading-6 cursor-pointer flex-1"
@@ -125,7 +125,6 @@ export default defineComponent({
             关注
           </span>
         </div>
-
         <ElDialog
           modelValue={this.memberStatus}
           onUpdate:modelValue={val => (this.memberStatus = val)}

src/views/user-info/components/users/index.tsx

@@ -183,7 +183,8 @@ export default defineComponent({
 
         <div
           class={
-            this.userInfo.entryFlag !== 1 || !this.checkBadge('VIP')
+            this.userInfo.entryFlag !== 1 ||
+            !(this.checkBadge('SVIP') || this.checkBadge('VIP'))
               ? 'mb-9'
               : ''
           }
@@ -203,7 +204,7 @@ export default defineComponent({
             </ElButton>
           )}
 
-          {!this.checkBadge('VIP') && (
+          {!(this.checkBadge('SVIP') || this.checkBadge('VIP')) && (
             <ElButton
               round
               type="primary"