Merge branch 'iteration-20240624' into jenkins

src/business-components/user-detail/index.tsx

@@ -153,7 +153,7 @@ export default defineComponent({
                   </span>
                   {this.showBuy && (
                     <div class={styles.buyNum}>
-                      {this.userInfo.buyNum}人已学习
+                      {this.userInfo.buyNum}人学习
                     </div>
                   )}
                 </div>

src/components/col-video-tcplayer/index.module.less

@@ -86,6 +86,8 @@
 
   .replay {
     padding-top: 12px;
+    display: flex;
+    align-items: center;
   }
 }
 
@@ -98,4 +100,4 @@
 
 .freeRate {
   color: #32ffd8;
-}
+}

src/components/col-video/index.module.less

@@ -100,6 +100,14 @@
 
   .replay {
     padding-top: 12px;
+    display: flex;
+    align-items: center;
+  }
+
+  .iconReplay {
+    width: 18px;
+    height: 18px;
+    margin-right: 6px;
   }
 }
 
@@ -112,4 +120,4 @@
 
 .freeRate {
   color: #32ffd8;
-}
+}

src/components/col-video/index.tsx

@@ -8,6 +8,7 @@ import TCPlayer from 'tcplayer.js'
 import 'tcplayer.js/dist/tcplayer.css'
 
 import iconVideoPlay from '@/common/images/icon_video_play.png'
+import iconReplay from '@/common/images/icon-replay.png'
 import { browser } from '@/helpers/utils'
 import { state } from '@/state'
 import { listenerMessage, postMessage } from '@/helpers/native-message'
@@ -471,11 +472,12 @@ export default defineComponent({
                   class={state.platformType !== 'STUDENT' && styles.replay}
                   onClick={this.onReplay}
                 >
-                  <Icon
+                  {/* <Icon
                     name="replay"
                     style={{ marginRight: '5px' }}
                     size={16}
-                  />
+                  /> */}
+                  <img class={styles.iconReplay} src={iconReplay} />
                   重播
                 </div>
               </>

src/student/live-class/live-item.tsx

@@ -91,12 +91,12 @@ export default defineComponent({
                 {this.liveInfo.existBuy === 1 && (
                   <span class={styles.buyNum}>
                     {/* <Icon name={iconSuccess} size="15" /> */}
-                    已学习
+                    学习
                   </span>
                 )}
                 {/* : (
                 <span class={styles.num}>
-                   {this.liveInfo.studentCount}人已学习
+                   {this.liveInfo.studentCount}人学习
                 </span>
                 ) */}
               </div>

src/student/teacher-dependent/components/live.tsx

@@ -160,10 +160,10 @@ export default defineComponent({
                     default: () => (
                       <div>
                         {item.existBuy === 1 ? (
-                          <span class={styles.buyNum}>已学习</span>
+                          <span class={styles.buyNum}>学习</span>
                         ) : (
                           <span class={styles.num}>
-                            {item.studentCount}人已学习
+                            {item.studentCount}人学习
                           </span>
                         )}
                       </div>

src/student/video-class/video-detail.tsx

@@ -357,6 +357,7 @@ export default defineComponent({
                 courseNum: this.userInfo.lessonNum,
                 coursePrice: this.userInfo.lessonPrice,
                 teacherName: this.userInfo.username,
+                payType: this.userInfo.payType,
                 teacherId: this.userInfo.id,
                 avatar: this.userInfo.headUrl,
                 studentCount: this.userInfo.buyNum,

src/student/video-class/video-item.module.less

@@ -1,86 +1,88 @@
-.videoItem {
-  border-radius: 8px;
-  background-color: #fff;
-  overflow: hidden;
-  width: 168px;
-  margin-bottom: 12px;
-
-  .viCover {
-    height: 94px;
-    width: 100%;
-    vertical-align: middle;
-  }
-
-  .viSection {
-    padding: 8px 12px 13px;
-  }
-
-  .viTitle {
-    font-size: 14px;
-    color: #1a1a1a;
-    line-height: 20px;
-  }
-
-  // .viUserInfo {
-  //   display: flex;
-  //   align-items: center;
-  //   font-size: 12px;
-  //   color: #999;
-  //   padding: 8px 0;
-
-  //   .viUserLogo {
-  //     width: 18px;
-  //     height: 18px;
-  //     border-radius: 50%;
-  //     margin-right: 5px;
-  //     overflow: hidden;
-  //   }
-
-  //   .viUserName {
-  //     padding-right: 6px;
-  //     margin-right: 6px;
-  //     max-width: 60px;
-  //     white-space: nowrap;
-  //     overflow: hidden;
-  //     text-overflow: ellipsis;
-  //     flex: 1 auto;
-  //   }
-  // }
-
-  .viUserNum {
-    padding-top: 4px;
-    color: #ff802c;
-    font-size: 12px;
-  }
-
-  .viPrice {
-    padding-top: 10px;
-    font-size: 14px;
-    color: #999;
-
-    .priceNum {
-      color: #ff0000;
-      font-size: 18px;
-      font-weight: bold;
-      i {
-        font-size: 15px;
-        font-style: normal;
-      }
-    }
-    .label {
-      padding-left: 8px;
-    }
-  }
-
-  .subjectName {
-    position: absolute;
-    bottom: 6px;
-    right: 6px;
-    font-size: 10px;
-    padding: 3px 5px;
-    color: #ffffff;
-    line-height: 1;
-    border-radius: 2px;
-    background: rgba(0, 0, 0, 0.29);
-  }
-}
+.videoItem {
+  border-radius: 8px;
+  background-color: #fff;
+  overflow: hidden;
+  width: 168px;
+  margin-bottom: 12px;
+
+  .viCover {
+    height: 94px;
+    width: 100%;
+    vertical-align: middle;
+  }
+
+  .viSection {
+    padding: 8px 12px 13px;
+  }
+
+  .viTitle {
+    font-size: 14px;
+    color: #1a1a1a;
+    line-height: 20px;
+  }
+
+  // .viUserInfo {
+  //   display: flex;
+  //   align-items: center;
+  //   font-size: 12px;
+  //   color: #999;
+  //   padding: 8px 0;
+
+  //   .viUserLogo {
+  //     width: 18px;
+  //     height: 18px;
+  //     border-radius: 50%;
+  //     margin-right: 5px;
+  //     overflow: hidden;
+  //   }
+
+  //   .viUserName {
+  //     padding-right: 6px;
+  //     margin-right: 6px;
+  //     max-width: 60px;
+  //     white-space: nowrap;
+  //     overflow: hidden;
+  //     text-overflow: ellipsis;
+  //     flex: 1 auto;
+  //   }
+  // }
+
+  .viUserNum {
+    padding-top: 4px;
+    color: #ff802c;
+    font-size: 12px;
+  }
+
+  .viPrice {
+    padding-top: 10px;
+    font-size: 14px;
+    color: #999;
+
+    .priceNum {
+      color: #ff0000;
+      font-size: 16px;
+      font-weight: bold;
+
+      i {
+        font-size: 15px;
+        font-style: normal;
+      }
+    }
+
+    .label {
+      padding-left: 8px;
+    }
+  }
+
+  .subjectName {
+    position: absolute;
+    bottom: 6px;
+    right: 6px;
+    font-size: 10px;
+    padding: 3px 5px;
+    color: #ffffff;
+    line-height: 1;
+    border-radius: 2px;
+    background: rgba(0, 0, 0, 0.29);
+  }
+}

src/student/video-class/video-item.tsx

@@ -84,7 +84,7 @@ export default defineComponent({
             <span class={styles.label}>/{item?.lessonCount}课时</span>
           </div>
 
-          <div class={styles.viUserNum}>{item?.countStudent}人已学习</div>
+          <div class={styles.viUserNum}>{item?.countStudent}人学习</div>
         </div>
       </div>
     )

src/teacher/share-page/share-video/index.tsx

@@ -96,6 +96,7 @@ export default defineComponent({
         isTeacher: result.videoGroup.teacherFlag ? true : false,
         buyNum: lessonGroup.countStudent,
         lessonNum: lessonGroup.lessonCount,
+        payType: lessonGroup.payType,
         lessonName: lessonGroup.lessonName,
         lessonDesc: lessonGroup.lessonDesc,
         lessonPrice: lessonGroup.lessonPrice,

src/teacher/video-class/video-detail.tsx

@@ -76,6 +76,7 @@ export default defineComponent({
 
       // shareVideo?recomUserId=56&groupId=124
       this.shareUrl = `${location.origin}/teacher/#/shareVideo?recomUserId=${state.user.data?.userId}&groupId=${this.params.videoLessonGroupId}&p=tenant`
+      console.log(this.shareUrl, 'shareVideo')
       !this.myself && this.getList()
     } catch (e) {
       console.log(e)

src/views/live-class/live-item.tsx

@@ -133,13 +133,13 @@ export default defineComponent({
                 </p>
                 {this.liveInfo.existBuy === 1 && (
                   <span class={styles.buyNum}>
-                    {/* {this.liveInfo.coursePrice == 0 ? '已学习' : '已购买'} */}
-                    已学习
+                    {/* {this.liveInfo.coursePrice == 0 ? '学习' : '已购买'} */}
+                    学习
                   </span>
                 )}
                 {/* : (
                 <span class={styles.num}>
-                   {this.liveInfo.studentCount}人已学习
+                   {this.liveInfo.studentCount}人学习
                 </span>
                 ) */}
               </div>