lex-xin 4 meses atrás
pai
commit
ba25f4da1d

+ 3 - 0
src/components/col-header/index.tsx

@@ -62,6 +62,9 @@ export default defineComponent({
         api: 'backIconChange',
         content: { iconStyle: this.backIconColor }
       })
+    },
+    title() {
+      this.headerTitle = this.title
     }
   },
   data() {

+ 2 - 4
src/student/discount-card/index.tsx

@@ -167,12 +167,10 @@ export default defineComponent({
             <div
               class={[
                 styles.userImgSection,
-                (userInfo.value.userVip.vipType === 'SVIP' ||
-                  userInfo.value.userVip.vipType === 'PERMANENT_SVIP') &&
+                (userInfo.value.userVip.vipType !== 'NOT_VIP') &&
                   styles.userSVip,
                 userInfo.value.userVip.vipType === 'VIP' && styles.userVip,
-                (userInfo.value.userVip.vipType === 'SVIP' ||
-                  userInfo.value.userVip.vipType === 'PERMANENT_SVIP')
+                (userInfo.value.userVip.vipType !== 'NOT_VIP')
                   ? styles.isVip
                   : ''
               ]}

BIN
src/student/member-center/images/record_bg.png


+ 3 - 3
src/student/member-center/member-record.tsx

@@ -118,19 +118,19 @@ export default defineComponent({
                     <span class={styles.num}>
                       {this.userTrainOverView.trainDays}天
                     </span>
-                    <span>累计练天数</span>
+                    <span>累计练天数</span>
                   </div>
                   <div class={styles.headerItem}>
                     <span class={styles.num}>
                       {this.userTrainOverView.trainTime}分钟
                     </span>
-                    <span>累计练时长</span>
+                    <span>累计练时长</span>
                   </div>
                   <div class={styles.headerItem}>
                     <span class={styles.num}>
                       {this.userTrainOverView.trainNum}次
                     </span>
-                    <span>累计练次数</span>
+                    <span>累计练次数</span>
                   </div>
                 </div>
               </div>

+ 2 - 2
src/student/practice-class/practice-item.tsx

@@ -63,7 +63,7 @@ export default defineComponent({
                       index <= 1 && <span class={styles.subject}>{item}</span>
                   )} */}
                 </p>
-                {this.starGrade ? (
+                {/* {this.starGrade ? (
                   <Rate
                     readonly
                     modelValue={this.starGrade}
@@ -77,7 +77,7 @@ export default defineComponent({
                   <span style={{ fontSize: '12px', color: '#999999' }}>
                     暂无评分
                   </span>
-                )}
+                )} */}
               </div>
 
               <div class={styles.piContent}>

+ 1 - 1
src/student/teacher-dependent/components/practice.tsx

@@ -428,7 +428,7 @@ export default defineComponent({
                           v-model={this.courseNum}
                           theme="round"
                           max={12}
-                          min={1}
+                          min={4}
                           buttonSize={22}
                           onChange={() => {
                             this.selectCourseList = []

+ 1 - 1
src/student/teacher-dependent/components/vip.tsx

@@ -427,7 +427,7 @@ export default defineComponent({
                           v-model={this.courseNum}
                           theme="round"
                           max={12}
-                          min={1}
+                          min={4}
                           buttonSize={22}
                           onChange={() => {
                             this.selectCourseList = []

+ 3 - 0
src/student/teacher-dependent/model/fans-list/index.module.less

@@ -17,6 +17,9 @@
 
   .fansList {
     padding: 20px 15px 0;
+    max-height: 40vh;
+    overflow-x: hidden;
+    overflow-y: auto;
   }
 }
 

+ 1 - 0
src/student/teacher-dependent/model/fans-list/index.tsx

@@ -78,6 +78,7 @@ export default defineComponent({
             }}
           />
         ))}
+        
       </div>
     ) : <div class={styles.noFans}>暂时还没有粉丝群哦!</div>}</div>
   }

+ 2 - 2
src/student/teacher-dependent/model/teacher-header.tsx

@@ -188,7 +188,7 @@ export default defineComponent({
                   </div>
                   <div class={styles.teacherHonor}>
                     {/* <div class={styles.score}>评分:</div> */}
-                    <div class={styles.level}>
+                    {/* <div class={styles.level}>
                       {this.starGrade ? (
                         <Rate
                           readonly
@@ -202,7 +202,7 @@ export default defineComponent({
                       ) : (
                         ''
                       )}
-                    </div>
+                    </div> */}
                   </div>
                 </div>
                 <div class={styles['teacher-bottom']}>

+ 4 - 4
src/student/teacher-dependent/teacher-follow.tsx

@@ -259,7 +259,7 @@ export default defineComponent({
                     </div>
                   </div>
                 </div>
-                <div class={styles.teacherHonor}>
+                {/* <div class={styles.teacherHonor}> */}
                   {/* <div>勋章:</div>
                   <div class={styles.teacherIcons}>
                     <Image
@@ -295,7 +295,7 @@ export default defineComponent({
                       }
                     />
                   </div> */}
-                  <div class={styles.score}>评分: </div>
+                  {/* <div class={styles.score}>评分: </div>
                   <div class={styles.level}>
                     {item.starGrade ? (
                       <Rate
@@ -312,8 +312,8 @@ export default defineComponent({
                         暂无评分
                       </span>
                     )}
-                  </div>
-                </div>
+                  </div> */}
+                {/* </div> */}
                 <div class={[styles['teacher-bottom'], styles.followFans]}>
                   <div class={styles['teacher-data']}>
                     <div class={styles['teacher-data_item']}>

+ 7 - 7
src/teacher/income-consus/index.module.less

@@ -196,13 +196,13 @@
 
   & > div {
     padding-bottom: 12px;
-    flex-basis: 45%;
-    &:nth-child(2n + 2) {
-      flex-basis: 55%;
-      .pieTitle {
-        min-width: 90px;
-      }
-    }
+    flex-basis: 50%;
+    // &:nth-child(2n + 2) {
+    //   flex-basis: 55%;
+    //   .pieTitle {
+    //     min-width: 90px;
+    //   }
+    // }
   }
   & > div:last-child {
     padding-bottom: 0;

+ 2 - 2
src/teacher/open-live/index.tsx

@@ -129,7 +129,7 @@ export default defineComponent({
                     <Image class={styles.cert} src={musicCert} fit="contain" />
                   )} */}
                 </div>
-                <div class={styles.level}>
+                {/* <div class={styles.level}>
                   {this.users?.starGrade ? (
                     <Rate
                       modelValue={this.users?.starGrade}
@@ -144,7 +144,7 @@ export default defineComponent({
                       暂无评分
                     </span>
                   )}
-                </div>
+                </div> */}
               </div>
             </Cell>
 

+ 1 - 1
src/teacher/practice-class/practice-setting.tsx

@@ -420,7 +420,7 @@ export default defineComponent({
         </TheSticky>
 
         <ColPopup v-model={this.subjectStatus} destroy>
-          <ColHeader />
+          <ColHeader title={`${this.text}设置`} />
           <SubjectModel
             max={5}
             single

+ 1 - 1
src/teacher/teacher-cert/cert-two.tsx

@@ -207,7 +207,7 @@ export default defineComponent({
           ))}
         </ColFieldGroup>
 
-        <ColPopup v-model={this.subjectStatus} destroy>
+        <ColPopup v-model={this.subjectStatus} destroy zIndex={99999}>
           <ColHeader />
           <SubjectModel
             subjectList={this.subjectList}

+ 1 - 1
src/teacher/teacher-cert/index.tsx

@@ -221,7 +221,7 @@ export default defineComponent({
 
           {teacherState.active === 4 ? (
             <>
-              <ColHeader />
+              {browser().isApp ? <ColHeader /> : ''}
               <ColResult
                 type="teacherCert"
                 style={{ paddingTop: '60px' }}

+ 2 - 2
src/teacher/teacher-dependent/model/teacher-header.tsx

@@ -196,7 +196,7 @@ export default defineComponent({
                   }
                 />
               </div>
-              <div class={styles.score}>评分:</div>
+              {/* <div class={styles.score}>评分:</div>
               <div class={styles.level}>
                 {this.starGrade ? (
                   <Rate
@@ -213,7 +213,7 @@ export default defineComponent({
                     暂无评分
                   </span>
                 )}
-              </div>
+              </div> */}
             </div>
             <div class={styles.piNameSubject}>
               <Image

+ 1 - 1
src/views/article-center/help-center-detail.module.less

@@ -57,6 +57,6 @@
 
   p:first-child {
     padding-right: 10px;
-    color: #FE2451;
+    color: #2DC7AA;
   }
 }

+ 1 - 1
src/views/article-center/help-center-detail.tsx

@@ -77,7 +77,7 @@ export default defineComponent({
             }}
           ></NavBar>
         ) : (
-          <ColHeader title={' '} />
+          <ColHeader title={this.documentTitle} />
         )}
 
         <h2>{this.detail.title}</h2>

+ 3 - 4
src/views/order-detail/order-live/index.module.less

@@ -32,12 +32,11 @@
   }
 
   .price {
-    font-size: 16px;
-    font-weight: 500;
-    color: #ff3535;
+    font-weight: 600;
+    font-size: 14px;
+    color: #131415;
     line-height: 20px;
     i {
-      font-style: normal;
       font-size: 14px;
     }
   }

+ 3 - 4
src/views/order-detail/order-video/index.module.less

@@ -31,12 +31,11 @@
   }
 
   .price {
-    font-size: 16px;
-    font-weight: 500;
-    color: #ff3535;
+    font-weight: 600;
+font-size: 14px;
+color: #131415;
     line-height: 20px;
     i {
-      font-style: normal;
       font-size: 14px;
     }
   }