平原

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

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

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

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

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/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>
 

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

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