Merge branch 'iteration-20241011' into dev

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

@@ -128,4 +128,7 @@
   left: 0;
   right: 0;
   z-index: 9;
+  background: #fff;
+  padding-top: 10px;
+  padding-bottom: 30px;
 }

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

@@ -595,7 +595,6 @@ export default defineComponent({
               </div>
               <div
                 class={['btnGroup', styles.fixedBtn]}
-                style={{ background: '#fff', paddingTop: '10px' }}
               >
                 <Button block round type="primary" onClick={this.onSubmit}>
                   确认约课

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

@@ -128,6 +128,9 @@
   left: 0;
   right: 0;
   z-index: 9;
+  background: #fff;
+  padding-top: 10px;
+  padding-bottom: 30px;
 }
 
 

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

@@ -17,7 +17,7 @@ import {
 } from 'vant'
 import { defineComponent } from 'vue'
 import { getWeekCh } from '@/helpers/utils'
-import styles from './practice.module.less'
+import styles from './vip.module.less'
 import { orderStatus } from '@/views/order-detail/orderStatus'
 import ColResult from '@/components/col-result'
 import { tradeOrder } from '@/student/trade/tradeOrder'
@@ -578,7 +578,6 @@ export default defineComponent({
               </div>
               <div
                 class={['btnGroup', styles.fixedBtn]}
-                style={{ background: '#fff', paddingTop: '10px' }}
               >
                 <Button block round type="primary" onClick={this.onSubmit}>
                   确认约课

src/teacher/cash-protocol/index.module.less

@@ -3,7 +3,7 @@
 
   .submit {
     width: 85%;
-    margin-left: 5%;
+    margin-left: 7.5%;
     margin-bottom: 15px;
     position: absolute;
     bottom: 0;

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

@@ -56,6 +56,7 @@ export default defineComponent({
             'HH:mm'
           )}~${dayjs(endTime).format('HH:mm')}` || '',
         type: 'live',
+        courseStartTime: dayjs(live.courseStartTime).format('YYYY-MM-DD HH:mm'),
         lessonPrice: live.coursePrice,
         buyNum: live.studentCount || 0,
         lessonNum: live.courseNum || 0, // 课时数

src/views/coupons/index.module.less

@@ -72,7 +72,7 @@
     align-items: center;
   }
   .price {
-    font-size: 36px;
+    font-size: 28px;
     font-weight: bold;
     line-height: 42px;
     width: 112px;
@@ -110,6 +110,7 @@
     border-radius: 8px;
     font-weight: 600;
     line-height: 17px;
+    padding-top: 1px;
     min-width: 80px;
     display: inline-block;
     text-align: center;