Merge branch 'iteration-20241011' into iteration-20241126

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

@@ -216,7 +216,7 @@
       line-height: 15px;
     }
     .chapterBottom {
-      font-family: DINAlternate, DINAlternate;
+      font-family: DIN;
       font-weight: bold;
       font-size: 22px;
       color: #ffffff;

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

@@ -95,7 +95,7 @@ export default defineComponent({
           ).format('HH:mm')}~${dayjs(endTime).format('HH:mm')}`,
           coursePlan: item.plan,
           roomUid: item.roomUid,
-          teacherName: live.teacherName,
+          teacherName: live.userName,
           subjectName: live.subjectName,
           liveState: item.liveState,
           id: item.courseId

src/student/teacher-dependent/components/live.module.less

@@ -64,7 +64,7 @@
   .priceNum {
     color: #ff0000;
     font-size: 22px;
-    // font-family: DINAlternate, DINAlternate;
+    font-family: DIN;
     font-weight: bold;
     i {
       font-size: 14px;

src/student/teacher-dependent/components/practice.tsx

@@ -432,6 +432,7 @@ export default defineComponent({
                           max={12}
                           min={4}
                           buttonSize={22}
+                          longPress={false}
                           onChange={() => {
                             this.selectCourseList = []
                           }}

src/student/teacher-dependent/components/vip.tsx

@@ -426,6 +426,7 @@ export default defineComponent({
                         <Stepper
                           v-model={this.courseNum}
                           theme="round"
+                          longPress={false}
                           max={12}
                           min={4}
                           buttonSize={22}

src/student/teacher-dependent/model/teacher-header.module.less

@@ -163,7 +163,7 @@
 
     span {
       font-weight: 500;
-      font-family: DINAlternate, DINAlternate;
+      font-family: DIN;
       font-weight: bold;
       font-size: 15px;
       color: #fff;

src/teacher/group-class/create-components/course-start.tsx

@@ -26,6 +26,7 @@ import { formatterDate } from '@/helpers/utils'
 import activeButtonIcon from '@common/images/icon_checkbox.png'
 import inactiveButtonIcon from '@common/images/icon_checkbox_default.png'
 import dayjs from 'dayjs'
+import TheSticky from '@/components/the-sticky'
 
 export default defineComponent({
   name: 'course-start',
@@ -169,7 +170,7 @@ export default defineComponent({
             />
           </ColField>
           <div class={styles.stepTips}>
-            课程停售时，付费学员达到该人数课开课，若未达到该人数，则成课失败，已付费学员将自动退款。
+            课程停售时，付费学员达到该人数可开课，若未达到该人数，则成课失败，已付费学员将自动退款。
           </div>
         </ColFieldGroup>
 
@@ -290,7 +291,7 @@ export default defineComponent({
           </ColField>
         </ColFieldGroup>
 
-        <Sticky offsetBottom={0} position="bottom">
+        <TheSticky position="bottom">
           <div class={['btnGroup', 'btnMore']}>
             <Button
               block
@@ -314,7 +315,7 @@ export default defineComponent({
               下一步
             </Button>
           </div>
-        </Sticky>
+        </TheSticky>
 
         <Popup show={this.dateStatus} position="bottom" round>
           <DatetimePicker

src/teacher/group-class/group-detail.tsx

@@ -86,7 +86,7 @@ export default defineComponent({
             startTime
           ).format('HH:mm')}~${dayjs(endTime).format('HH:mm')}`,
           coursePlan: item.plan,
-          teacherName: live.teacherName,
+          teacherName: live.userName,
           subjectName: live.subjectName,
           roomUid: item.roomUid,
           liveState: item.liveState,

src/teacher/live-class/create-components/course-start.tsx

@@ -26,6 +26,7 @@ import { formatterDate } from '@/helpers/utils'
 import activeButtonIcon from '@common/images/icon_checkbox.png'
 import inactiveButtonIcon from '@common/images/icon_checkbox_default.png'
 import dayjs from 'dayjs'
+import TheSticky from '@/components/the-sticky'
 
 export default defineComponent({
   name: 'course-start',
@@ -284,7 +285,7 @@ export default defineComponent({
           </ColField>
         </ColFieldGroup>
 
-        <Sticky offsetBottom={0} position="bottom">
+        <TheSticky position="bottom">
           <div class={['btnGroup', 'btnMore']}>
             <Button
               block
@@ -308,7 +309,7 @@ export default defineComponent({
               下一步
             </Button>
           </div>
-        </Sticky>
+        </TheSticky>
 
         <Popup show={this.dateStatus} position="bottom" round>
           <DatetimePicker

src/teacher/piano-room/class-arrangement/class-info/index.tsx

@@ -207,7 +207,7 @@ export default defineComponent({
                 placeholder="请输入课时数"
                 v-slots={{
                   input: () => (
-                    <Stepper disable-input v-model={params.classNum}></Stepper>
+                    <Stepper disable-input longPress={false} v-model={params.classNum}></Stepper>
                   )
                 }}
               />

src/teacher/share-page/share-group/index.tsx

@@ -12,6 +12,7 @@ import { defineComponent } from 'vue'
 import { shareCall } from '../share'
 import styles from './index.module.less'
 import qs from 'query-string'
+import GroupPlanStep from '@/business-components/group-plan-step'
 export const getAssetsHomeFile = (fileName: string) => {
   const path = `../images/${fileName}`
   const modules = import.meta.globEager('../images/*')
@@ -20,8 +21,9 @@ export const getAssetsHomeFile = (fileName: string) => {
 interface IProps {
   courseTime: string
   coursePlan: string
-  videoPosterUrl?: string
   roomUid?: string
+  teacherName: string
+  subjectName: string
   liveState?: number
   id?: number | string
 }
@@ -65,6 +67,7 @@ export default defineComponent({
     },
     courseInfo() {
       const tempArr = [] as IProps[]
+      const live = this.live
       const coursePlanList = this.live.planList || []
       coursePlanList.forEach((item: any) => {
         const startTime = item.startTime || new Date()
@@ -74,6 +77,8 @@ export default defineComponent({
             startTime
           ).format('HH:mm')}~${dayjs(endTime).format('HH:mm')}`,
           coursePlan: item.plan,
+          teacherName: live.userName,
+          subjectName: live.subjectName,
           roomUid: item.roomUid,
           liveState: item.liveState,
           id: item.courseId
@@ -171,14 +176,7 @@ export default defineComponent({
           <p class={styles.introduction}>{this.userInfo.lessonDesc}</p>
         </SectionDetail>
 
-        <SectionDetail
-          title="课程列表"
-          icon="courseList"
-          border
-          // contentStyle={{ paddingTop: '0' }}
-        >
-          <CoursePlanStep courseInfo={this.courseInfo} hideVideo={true} />
-        </SectionDetail>
+        <GroupPlanStep courseInfo={this.courseInfo as any}  />
 
         <ColSticky position="bottom">
           <div class={['btnGroup']} style={{ paddingTop: '12px' }}>

src/tenant/member-center/index.module.less

@@ -354,7 +354,7 @@
       color: #EF2F56;
       font-size: 25px;
       line-height: 1.5;
-      font-family: DINAlternate-Bold, DINAlternate;
+      font-family: DIN;
       font-weight: bold;
 
       span {

src/views/cart/index.tsx

@@ -216,6 +216,7 @@ export default defineComponent({
                           v-slots={{
                             num: () => (
                               <Stepper
+                                longPress={false}
                                 v-model={item.quantity}
                                 onClick={e => {
                                   e.stopPropagation()

src/views/order-detail/order-discount/index.tsx

@@ -52,6 +52,7 @@ export default defineComponent({
                   <div class={styles.addNum}>
                     <Stepper
                       disableInput
+                      longPress={false}
                       disabled={item.period === 'PERPETUAL' || this.disabled}
                       v-model={item.num}
                       theme="round"

src/views/order-detail/order-vip/index.tsx

@@ -162,6 +162,7 @@ export default defineComponent({
                   <div class={styles.addNum}>
                     <Stepper
                       disableInput
+                      longPress={false}
                       disabled={item.period === 'PERPETUAL' || this.disabled}
                       v-model={item.num}
                       theme="round"

src/views/shop-mall/modal/add-goods-cart/index.tsx

@@ -264,6 +264,7 @@ export default defineComponent({
             inputWidth="50px"
             theme="round"
             buttonSize="24px"
+            longPress={false}
             max={this.selectItem.stock > 200 ? 200 : this.selectItem.stock}
             min={1}
             disabled={this.selectItem.stock <= 0}

src/views/trade/trade-detail.module.less

@@ -91,6 +91,9 @@
       .van-cell__title {
         flex-basis: 40%;
       }
+      .van-cell__value {
+        flex-basis: 20%;
+      }
     }
   }