lex-xin 3 months ago
parent
commit
939e0cf286

+ 4 - 3
src/student/teacher-dependent/teacher-follow.tsx

@@ -10,6 +10,7 @@ import IconXueli from '@common/images/icon-xueli.png'
 import IconJiaozi from '@common/images/icon-jiaozi.png'
 import dayjs from 'dayjs'
 import ColHeader from '@/components/col-header'
+import TheSticky from '@/components/the-sticky'
 export const getAssetsHomeFile = (fileName: string) => {
   const path = `./images/${fileName}`
   const modules = import.meta.globEager('./images/*')
@@ -135,10 +136,10 @@ export default defineComponent({
   render() {
     return (
       <div class={styles.teacherFollow}>
-        <Sticky position="top" offsetTop={0}>
-          <ColHeader border={false} />
+        <TheSticky position="top">
+          <ColHeader border={false} isFixed={false} />
           <ColSearch onSearch={this.onSearch} />
-        </Sticky>
+        </TheSticky>
         {this.dataShow ? (
           <List
             class={styles.liveList}

+ 1 - 1
src/views/order-detail/use-coupons/index.tsx

@@ -90,7 +90,7 @@ export default defineComponent({
     couponCategory() {
       // 如果订单类型不在优惠券类型里面,则默认查询通用券
       const temp = this.orderGoodsType.map((item: any)=> couponEnum[item])
-      return temp.join(',') + ',UNIVERSAL'
+      return  temp.join(',') + (temp.length ? ',UNIVERSAL' : 'UNIVERSAL')
     }
   },
   watch: {