lex-xin 7 månader sedan
förälder
incheckning
423cedfb2b

+ 3 - 7
src/student/teacher-dependent/components/live.tsx

@@ -127,13 +127,9 @@ export default defineComponent({
                       <span>{item.teacherName || `游客${item.teacherId || ''}`}</span>
                     </div> */}
                     <div class={styles.lean}>
-                      {item.existBuy === 1 ? (
-                        <span class={styles.buyNum}>学习</span>
-                      ) : (
-                        <span class={styles.num}>
-                          {item.studentCount}人学习
-                        </span>
-                      )}
+                      <span class={styles.num}>
+                        {item.studentCount}人学习
+                      </span>
                     </div>
                     <div class={styles.price}>
                       {item.coursePrice > 0 && (

+ 4 - 2
src/teacher/teacher-cert/cert-info.tsx

@@ -4,6 +4,7 @@ import { Button, Icon, Image, Sticky } from 'vant'
 import { defineComponent, Transition } from 'vue'
 import styles from './cert-info.module.less'
 import { teacherState } from './teacherState'
+import { browser } from '@/helpers/utils'
 /**
  * 动态引入文件
  * @param fileName 文件名
@@ -33,12 +34,13 @@ export default defineComponent({
   render() {
     return (
       <div class={styles['cert-info']}>
-        <ColHeader
+        {browser().isApp ? <ColHeader
           background="transparent"
           border={false}
           title=" "
           // color="white"
-        />
+        /> : ''}
+        
         <div class={styles.certWrapper}>
           <div class={styles.section}>
             <div class={styles.title}>

+ 9 - 0
src/teacher/teacher-cert/index.tsx

@@ -13,6 +13,7 @@ import request from '@/helpers/request'
 import ColResult from '@/components/col-result'
 import { state } from '@/state'
 import ColHeader from '@/components/col-header'
+import { browser } from '@/helpers/utils'
 
 export default defineComponent({
   name: 'teacherCert',
@@ -228,7 +229,15 @@ export default defineComponent({
                   type="teacherCert"
                   style={{ paddingTop: '60px' }}
                   classImgSize="CERT"
+                  buttonText={browser().isApp ? '我知道了' : '下载酷乐秀学院'}
                   tips="感谢您的申请,小酷将在24小时内完成审核,请留意APP消息及短信获取审核结果。"
+                  onClick={() => {
+                    if (browser().isApp) {
+                      postMessage({ api: 'back', content: {} })
+                    } else {
+                      window.open(location.origin + '/student/#/download?type=teacher')
+                    }
+                  }}
                 />
               </>
             ) : null}

+ 6 - 3
src/views/trade/trade-detail.tsx

@@ -73,6 +73,10 @@ export default defineComponent({
       })
 
       return orderDetailList || []
+    },
+    discountAllPrice() {
+      const result: any = this.result
+      return (result.cardDiscountPrice + result.discountPrice).toFixed(2)
     }
   },
   async mounted() {
@@ -80,7 +84,6 @@ export default defineComponent({
       this.loading = true
       this.orderNo && (await this.getOrder())
       this.loading = false
-
       this.type === 'ING' && this.path !== 'tradeRecord' && this.interval()
     }, 0)
   },
@@ -233,7 +236,7 @@ export default defineComponent({
                 />
               ))}
 
-              {this.result.couponAmount > 0 && (
+              {this.discountAllPrice > 0 && (
                 <Row class={styles.optionRow}>
                   <Col span="8" offset={1}>
                     优惠金额:
@@ -241,7 +244,7 @@ export default defineComponent({
                   <Col span="14">
                     {(this as any).$filters.moneyFormat(
-                      this.result.couponAmount
+                      this.discountAllPrice
                     )}
                   </Col>
                   <Col span="1"> </Col>