Merge branch 'iteration-20241126'

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

@@ -236,12 +236,12 @@ export default defineComponent({
                       <div class={styles.teacherInfoName}>
                         {item.userName || `游客${item.userId || ''}`}
                       </div>
-                      {this.checkBadge('DEGREE', item.teacher) && (
+                      {/* {this.checkBadge('DEGREE', item.teacher) && (
                         <img src={IconXueli} />
                       )}
                       {this.checkBadge('TEACHER', item.teacher) && (
                         <img src={IconJiaozi} />
-                      )}
+                      )} */}
                     </div>
                     <div class={styles.piNameSubject}>
                       {/* <Image

src/student/teacher-dependent/teacher-home.module.less

@@ -31,7 +31,7 @@
       background-color: transparent;
     }
     .van-tabs__line {
-      width: 44px !important;
+      width: 32px !important;
       height: 6px;  
       background: linear-gradient( 90deg, #2DC7AA 0%, rgba(45,199,170,0) 100%) !important;
       border-radius: 3px;

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

@@ -156,7 +156,7 @@ export default defineComponent({
     onCalcCoursePrice(price: number | string) {
       if(!price) { return '-' }
       const money = Number(price)
-      return moneyFormat(numberToTwoUp(this.rate * money / 100))
+      return moneyFormat(numberToTwoUp(money - (this.rate * money / 100)))
     },
     onSelect(item: any) {
       this.form.courseMinutes = item.courseMinutes

src/views/music/album-detail/index.tsx

@@ -171,7 +171,9 @@ export default defineComponent({
         }
       ]
 
-      const res = await request.post('/api-student/userOrder/getPendingOrder', {
+      const res = await request.post('/userOrder/getPendingOrder', {
+        prefix:
+            state.platformType === 'TEACHER' ? '/api-teacher' : '/api-student',
         data: {
           goodType: 'ALBUM',
           bizId: album.id