Merge branch 'master' of http://git.dayaedu.com/lex/orchestra-app

src/school/companion-teacher/companion-detail.tsx

@@ -232,7 +232,7 @@ export default defineComponent({
                       api: 'joinChatGroup',
                       content: {
                         type: 'single', // single 单人 multi 多人
-                        id: state.detail.id
+                        id: state.detail.imUserId
                       }
                     })
                     state.showMessage = false

src/school/companion-teacher/compontent/teacher.tsx

@@ -15,6 +15,10 @@ export default defineComponent({
     teacherId: {
       type: String,
       default: ''
+    },
+    courseType: {
+      type: String,
+      default: ''
     }
   },
   emits: ['close', 'select'],
@@ -42,6 +46,7 @@ export default defineComponent({
             ...form.params,
             schoolId: state.user.data.school.id,
             removeTeacherId: props.teacherId,
+            courseType: props.courseType,
             delFlag: false
           }
         })

src/school/companion-teacher/index.tsx

@@ -450,7 +450,7 @@ export default defineComponent({
                       api: 'joinChatGroup',
                       content: {
                         type: 'single', // single 单人 multi 多人
-                        id: form.selectItem.id
+                        id: form.selectItem.imUserId
                       }
                     })
                     form.showMessage = false

src/school/companion-teacher/unbind.tsx

@@ -146,6 +146,7 @@ export default defineComponent({
 
         <OPopup v-model:modelValue={state.teacherStatus}>
           <Teacher
+            courseType={state.selectTeacher.courseType}
             teacherId={state.teacherId as any}
             onClose={() => (state.teacherStatus = false)}
             onSelect={onSelectItem}

src/school/orchestra/compontent/information.tsx

@@ -93,9 +93,11 @@ export default defineComponent({
 
     const getDetails = async () => {
       try {
-        const { data } = await request.get('/api-school/classGroup/statistics', {
-          params: {
-            orchestraId: route.query.id
+        const { data } = await request.post('/api-school/classGroup/statistics', {
+          data: {
+            orchestraId: route.query.id,
+            startTime: state.params.startTime,
+            endTime: state.params.endTime
           }
         })
         state.orchestraInfo = data || {}

src/school/orchestra/modal/subject-list.tsx

@@ -60,6 +60,9 @@ export default defineComponent({
                 name={item.id}
                 class={styles.checkbox}
                 ref={(el: any) => (state.checkboxRefs[item.id] = el)}
+                onClick={(e: any) => {
+                  e.stopPropagation()
+                }}
                 v-slots={{
                   icon: (props: any) => (
                     <Icon

src/student/music-group/pre-apply/component/order.tsx

@@ -275,7 +275,7 @@ export default defineComponent({
                   class={styles.phoneName}
                   v-model={form.resion}
                   placeholder="请输入原因"
-                  maxlength={15}
+                  maxlength={50}
                   type="textarea"
                   rows={2}
                 />

src/student/music-group/shop-address/address-operation.tsx

@@ -145,6 +145,7 @@ export default defineComponent({
             type="textarea"
             rows={3}
             v-model={state.detailAddress}
+            maxlength={100}
           />
         </CellGroup>
 

src/student/trade-record/component/paid-list.tsx

@@ -321,7 +321,7 @@ export default defineComponent({
                   class={styles.phoneName}
                   v-model={form.resion}
                   placeholder="请输入原因"
-                  maxlength={15}
+                  maxlength={50}
                   type="textarea"
                   rows={2}
                 />