Merge branch 'newVersion' into dev

src/views/login/components/register-success/index.tsx

@@ -70,7 +70,7 @@ export default defineComponent({
         >
           {!this.type && (
             <p>
-              恭喜您已成功注册酷乐秀
+              恭喜您已成功登录酷乐秀
               {this.registerType === 'teacher' ? '老师' : '学生'}账号！
             </p>
           )}

src/views/user-info/my-fans/index.tsx

@@ -5,6 +5,7 @@ import { ElImage, ElSkeleton, ElSkeletonItem, ElTag } from 'element-plus'
 import { defineComponent } from 'vue'
 
 import iconVip from '../images/icon_vip.png'
+import iconVipDefault from '../images/icon_vip_default.png'
 
 export default defineComponent({
   name: 'MyFans',
@@ -103,16 +104,17 @@ export default defineComponent({
                         src={item.avatar}
                         class="w-12 h-12 rounded-full border-2 border-[#2DC7AA]"
                       />
-                      {item.isVip > 0 && (
-                        <ElImage src={iconVip} class="h-7 -mt-4" />
-                      )}
+                      <ElImage
+                        src={item.isVip > 0 ? iconVip : iconVipDefault}
+                        class="h-7 -mt-4"
+                      />
                     </div>
 
                     <p class="text-base text-[#333] font-semibold leading-tight pb-5 pt-2 text-center">
                       {item.userName}
                     </p>
-                    {item.subjectName && (
-                      <p>
+                    <p class="h-6">
+                      {item.subjectName && (
                         <ElTag
                           effect="dark"
                           // size="small"
@@ -126,8 +128,8 @@ export default defineComponent({
                         >
                           {item.subjectName}
                         </ElTag>
-                      </p>
-                    )}
+                      )}
+                    </p>
                   </div>
                 </div>
               ))}