lex 2 years ago
parent
commit
05c3bca596

+ 7 - 1
src/components/pagination/index.tsx

@@ -27,6 +27,10 @@ export default defineComponent({
       type: String,
       default: 'total, sizes, prev, pager, next'
     },
+    showMuitiple: {
+      type: Number,
+      default: 10
+    },
     hideOnSinglePage: {
       type: Boolean,
       default: true
@@ -93,7 +97,9 @@ export default defineComponent({
           }}
           pageSizes={this.pageSizes as number[]}
           total={this.total}
-          hideOnSinglePage={this.hideOnSinglePage}
+          hideOnSinglePage={
+            this.total > this.showMuitiple ? false : this.hideOnSinglePage
+          }
           background={this.background}
           layout={this.layout}
           onSise-change={this.handleSizeChange}

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

@@ -68,7 +68,7 @@ export default defineComponent({
         </div>
         <img
           src={this.userInfo.heardUrl || iconTeacher}
-          class="w-[68px] h-[68px] rounded-full border-2 border-[#2DC7AA] border-solid mt-6 mx-auto"
+          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-medium pt-4 flex items-center justify-center">
@@ -158,7 +158,7 @@ export default defineComponent({
 
         <div
           class={
-            this.userInfo.entryFlag !== 1 && !this.checkBadge('VIP')
+            this.userInfo.entryFlag !== 1 || !this.checkBadge('VIP')
               ? 'mb-9'
               : ''
           }

+ 1 - 1
src/views/user-info/index.tsx

@@ -8,7 +8,7 @@ export default defineComponent({
   render() {
     return (
       <div class="bg-[#F6F7F8]">
-        <div class="w-[1002px] mt-[100px] rounded-[10px] bg-white py-5 overflow-hidden mb-14 min-h-full m-auto text-[#333] flex">
+        <div class="w-[1002px] mt-[100px] rounded-[10px] bg-white py-5 overflow-hidden mb-10 min-h-full m-auto text-[#333] flex">
           <div class="w-[264px] ">
             <Users />
             <UserMenu />

+ 1 - 1
src/views/user-info/music-class/index.tsx

@@ -10,7 +10,7 @@ export default defineComponent({
     const musicActiveName = sessionStorage.getItem('musicActiveName')
     sessionStorage.removeItem('musicActiveName')
     return {
-      activeName: musicActiveName || 'DOING',
+      activeName: musicActiveName || 'PASS',
       num: {
         doing: 0,
         pass: 0,

+ 1 - 1
src/views/user-info/music-class/list.tsx

@@ -23,7 +23,7 @@ export default defineComponent({
     return {
       pageInfo: {
         // 分页规则
-        limit: 9, // 限制显示条数
+        limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数