Merge branch 'iteration-20241126'

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

@@ -12,7 +12,7 @@
 .bg {
   position: fixed;
   top: 0;
-  height: 100vh;
+  height: 100%;
   width: 100%;
   background-color: #000;
   left: 0;
@@ -62,7 +62,7 @@
   position: relative;
 }
 .wrapper {
-  height: calc(100vh - 21.333vw);
+  height: calc(100% - 21.333vw);
   padding: 4vw;
   :global {
     .crop-point {

src/student/discount-card/index.module.less

@@ -186,6 +186,7 @@
         }
       }
       .originPrice {
+        padding-top: 2px;
         padding-left: 6px;
         font-size: 12px;
         color: rgba(19, 20, 21, 0.4)

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

@@ -175,11 +175,36 @@ export default defineComponent({
         }
       } catch {}
     },
+    initLive () {
+      const live = this.live
+      orderStatus.orderObject.orderType = 'LIVE'
+      orderStatus.orderObject.orderName = '直播课购买'
+      orderStatus.orderObject.orderDesc = '直播课购买'
+      orderStatus.orderObject.actualPrice = live.coursePrice
+      orderStatus.orderObject.recomUserId = this.recomUserId
+      orderStatus.orderObject.orderNo = ''
+      orderStatus.orderObject.orderList = [
+        {
+          orderType: 'LIVE',
+          goodsName: '直播课购买',
+          courseGroupId: live.courseGroupId,
+          courseGroupName: live.courseGroupName,
+          coursePrice: live.coursePrice,
+          price: live.coursePrice,
+          teacherName: live.userName || `游客${live.teacherId || ''}`,
+          teacherId: live.teacherId,
+          avatar: live.avatar,
+          courseInfo: this.courseInfo,
+          recomUserId: this.recomUserId
+        }
+      ]
+    },
     async onBuy() {
       try {
         const live = this.live
         // 判断是否是0无订单
         if (live.coursePrice <= 0) {
+          this.initLive()
           await onSubmitZero(() => {
             Dialog.alert({
               message: '领取成功',
@@ -219,27 +244,7 @@ export default defineComponent({
               this.cancelPayment(result.orderNo)
             })
         } else {
-          orderStatus.orderObject.orderType = 'LIVE'
-          orderStatus.orderObject.orderName = '直播课购买'
-          orderStatus.orderObject.orderDesc = '直播课购买'
-          orderStatus.orderObject.actualPrice = live.coursePrice
-          orderStatus.orderObject.recomUserId = this.recomUserId
-          orderStatus.orderObject.orderNo = ''
-          orderStatus.orderObject.orderList = [
-            {
-              orderType: 'LIVE',
-              goodsName: '直播课购买',
-              courseGroupId: live.courseGroupId,
-              courseGroupName: live.courseGroupName,
-              coursePrice: live.coursePrice,
-              price: live.coursePrice,
-              teacherName: live.userName || `游客${live.teacherId || ''}`,
-              teacherId: live.teacherId,
-              avatar: live.avatar,
-              courseInfo: this.courseInfo,
-              recomUserId: this.recomUserId
-            }
-          ]
+          this.initLive()
           this.routerTo()
         }
       } catch {

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

@@ -107,6 +107,31 @@ export default defineComponent({
         }
       })
     },
+    initVideo () {
+      const userInfo = this.userInfo
+      orderStatus.orderObject.orderType = 'VIDEO'
+      orderStatus.orderObject.orderName = '视频课购买'
+      orderStatus.orderObject.orderDesc = '视频课购买'
+      orderStatus.orderObject.actualPrice = userInfo.lessonPrice
+      orderStatus.orderObject.recomUserId = this.recomUserId
+      orderStatus.orderObject.orderNo = ''
+      orderStatus.orderObject.orderList = [
+        {
+          orderType: 'VIDEO',
+          goodsName: '视频课购买',
+          courseGroupId: userInfo.id,
+          courseGroupName: userInfo.lessonName,
+          coursePrice: userInfo.lessonPrice,
+          price: userInfo.lessonPrice,
+          teacherName: userInfo.username || `游客${userInfo.teacherId || ''}`,
+          teacherId: userInfo.teacherId,
+          avatar: userInfo.headUrl,
+          relationType: this.userInfo.relationType,
+          courseInfo: this.detailList,
+          recomUserId: this.recomUserId
+        }
+      ]
+    },
     async onBuy() {
       try {
         if (this.userInfo.payType === 'VIP') {
@@ -131,6 +156,7 @@ export default defineComponent({
 
         // 判断是否是0无订单
         if (userInfo.lessonPrice <= 0) {
+          this.initVideo()
           await onSubmitZero(() => {
             Dialog.alert({
               message: '领取成功',
@@ -170,28 +196,7 @@ export default defineComponent({
               this.cancelPayment(result.orderNo)
             })
         } else {
-          orderStatus.orderObject.orderType = 'VIDEO'
-          orderStatus.orderObject.orderName = '视频课购买'
-          orderStatus.orderObject.orderDesc = '视频课购买'
-          orderStatus.orderObject.actualPrice = userInfo.lessonPrice
-          orderStatus.orderObject.recomUserId = this.recomUserId
-          orderStatus.orderObject.orderNo = ''
-          orderStatus.orderObject.orderList = [
-            {
-              orderType: 'VIDEO',
-              goodsName: '视频课购买',
-              courseGroupId: userInfo.id,
-              courseGroupName: userInfo.lessonName,
-              coursePrice: userInfo.lessonPrice,
-              price: userInfo.lessonPrice,
-              teacherName: userInfo.username || `游客${userInfo.teacherId || ''}`,
-              teacherId: userInfo.teacherId,
-              avatar: userInfo.headUrl,
-              relationType: this.userInfo.relationType,
-              courseInfo: this.detailList,
-              recomUserId: this.recomUserId
-            }
-          ]
+          this.initVideo()
           this.routerTo()
         }
       } catch {}

src/teacher/layout/login-cert.tsx

@@ -33,10 +33,21 @@ export default defineComponent({
   },
   mounted() {
     removeAuth()
+    const userInfo = sessionStorage.getItem('login-cert-store')
+    if(userInfo) {
+      const parseUser = JSON.parse(userInfo)
+      this.username = parseUser.username;
+      this.smsCode = parseUser.smsCode
+      sessionStorage.removeItem('login-cert-store')
+    }
     this.directNext()
   },
   methods: {
     previewProtocol(type: string) {
+      sessionStorage.setItem('login-cert-store', JSON.stringify({
+        username: this.username,
+        smsCode: this.smsCode,
+      }))
       if (type === 'user') {
         this.$router.push({
           path: '/registerProtocol',

src/views/protocol/privacy.tsx

@@ -23,7 +23,7 @@ export default defineComponent({
   render() {
     return (
       <>
-        <ColHeader />
+        <ColHeader hideHeader={this.showHeader ? false : true} />
         <div class={styles.container}>
           <h2 style={{ textAlign: 'center' }}>《{this.name}隐私协议》</h2>
           版本更新时间 <br />

src/views/protocol/register.tsx

@@ -20,7 +20,7 @@ export default defineComponent({
   render() {
     return (
       <>
-        <ColHeader />
+        <ColHeader hideHeader={this.showHeader ? false : true} />
         <div class={styles.container}>
           欢迎来到酷乐秀，酷乐秀 隶属于武汉酷乐秀网络科技有限公司。我们开发并运营的程序有：酷乐秀、酷乐秀学院，以上app均符合遵守本协议。以下协议中所指的酷乐秀，代表以上程序中的任意程序。
           <br />