Merge branch 'iteration-20241126'

src/components/col-header/index.tsx

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

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
                   : ''
               ]}

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>

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 = []

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 = []

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;
   }
 }
 

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

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

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

@@ -187,7 +187,7 @@ export default defineComponent({
                       `游客${this.userInfo.userId || ''}`}
                   </div>
                   <div class={styles.teacherHonor}>
-                    {/* <div class={styles.score}>评分：</div> */}
+                    <div class={styles.score}>评分：</div>
                     <div class={styles.level}>
                       {this.starGrade ? (
                         <Rate

src/student/teacher-dependent/teacher-style/index.tsx

@@ -61,7 +61,7 @@ export default defineComponent({
     return () => (
       <div class={styles['teacher-elegant']}>
         <TheSticky>
-          <ColHeader border={false} background="transparent" isFixed={false} />
+          <ColHeader border={false} background="#f6f8f9" isFixed={false} />
         </TheSticky>
 
         {state.dataShow ? (

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;

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

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}

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' }}

src/tenant/music/train-tool/index.tsx

@@ -515,7 +515,7 @@ export default defineComponent({
       router.push({
         path: '/orderDetail',
         query: {
-          orderType: 'ALBUM',
+          orderType: 'TENANT_ALBUM',
           album: album.id
         }
       })

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

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

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>

src/views/order-detail/index.tsx

@@ -300,7 +300,8 @@ export default defineComponent({
         } else {
           this.orderInfo = orderStatus.orderObject || {}
           this.orderNo = orderStatus.orderObject.orderNo
-          const paymentChannel = this.orderInfo.paymentConfig.paymentChannel
+          const paymentChannel = this.orderInfo.paymentConfig.paymentConfig.paymentChannel
+          console.log(this.orderInfo.paymentConfig, 'this.orderInfo.paymentConfig')
           // 判断是否为原生支付
           if (
             this.orderInfo.paymentVendor?.indexOf('wxpay') > -1 ||
@@ -472,7 +473,8 @@ export default defineComponent({
     },
     onConfirm(val: any) {
       // debugger
-      const config: any = this.orderInfo.paymentConfig || {}
+      const config: any = this.orderInfo.paymentConfig.paymentConfig || {}
+      console.log(config, '1212')
       this.pay_channel = val.pay_channel
       const params = qs.stringify({
         pay_channel: val.pay_channel,
@@ -485,10 +487,13 @@ export default defineComponent({
         userId: config.userId
       })
       orderStatus.orderObject.paymentConfig.paymentChannel = val.pay_channel
+
+      console.log(params, 'params ---')
       if (val.payCode === 'payResult') {
         window.location.href =
           window.location.origin + state.payBackPath + '#/payResult?' + params
       } else {
+        
         this.qrCodeUrl =
           window.location.origin + state.payBackPath + '#/payDefine?' + params
         this.showQrcode = true
@@ -574,7 +579,6 @@ export default defineComponent({
                     item={item}
                     disabled={this.disabledCoupon}
                     onPriceChange={(price: number) => {
-                      
                       // 畅学卡变更状态时需要重新选择优惠券
                       orderStatus.orderObject.couponId = ''
                       orderStatus.orderObject.couponDiscountPrice = 0
@@ -583,7 +587,6 @@ export default defineComponent({
                       const lastAmount = Number(
                         numberToTwoUp(
                           Number(this.orderAmount) -
-                            Number(item.discountPrice) -
                             Number(orderStatus.orderObject.couponDiscountPrice)
                         )
                       )

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;
     }
   }

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;
     }
   }

src/views/order-detail/qrcode-payment/index.tsx

@@ -16,6 +16,7 @@ export default defineComponent({
     }
   },
   setup(props) {
+    console.log(props.url, 'props.url')
     return () => (
       <div class={[styles.saveShareImage]}>
         <div style={{ overflow: 'hidden' }}>