Merge branch 'iteration-20241011'

src/business-components/group-plan-step/index.module.less

@@ -56,7 +56,7 @@
       margin-right: 5px;
     }
     .subjectName {
-      padding: 1px 4px 2px;
+      padding: 3px 4px 2px;
       background: #FFF1DE;
       border-radius: 4px;
       font-size: 11px;

src/router/routes-teacher.ts

@@ -214,7 +214,7 @@ export default [
         name: 'groupDetail',
         component: () => import('@/teacher/group-class/group-detail'),
         meta: {
-          title: '小组课详情'
+          title: '课程组详情'
         }
       },
       {

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

@@ -573,7 +573,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'
@@ -572,7 +572,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/group-class/group-detail.tsx

@@ -260,7 +260,7 @@ export default defineComponent({
           <>
             {this.courseOffStatus && (
               <ColSticky position="bottom" background="white">
-                <div class={['btnGroup']} style={{ paddingTop: '12px' }}>
+                <div class={['btnGroup']} >
                   <Button
                     block
                     round

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;