Merge branch 'iteration_1.3.3' into dev

src/components/silder/index.tsx

@@ -68,8 +68,8 @@ export default defineComponent({
               placement="left"
               trigger="hover"
               popper-class="silderPopver"
-              hide-after={0}
-              show-after={200}
+              // hide-after={50}
+              // show-after={200}
               v-slots={{
                 reference: () => (
                   <div
@@ -134,8 +134,8 @@ export default defineComponent({
               width="230px"
               trigger="hover"
               popper-class="silderPopver"
-              hide-after={0}
-              show-after={200}
+              // hide-after={50}
+              // show-after={200}
               v-slots={{
                 reference: () => (
                   <div

src/views/role-auth/teacherAuth/components/auth/index.tsx

@@ -34,6 +34,9 @@ export default defineComponent({
       })
       teacherState.teacherCert.graduateSchool = info.graduateSchool
       teacherState.teacherCert.subject = info.subject
+      teacherState.teacherCert.styleVideo = info.styleVideoJson
+        ? JSON.parse(info.styleVideoJson)
+        : [{ videoUrl: '', cover: '' }]
       teacherState.teacherCert.gradCertificate = info.gradCertificate
       teacherState.teacherCert.degreeCertificate = info.degreeCertificate
       teacherState.teacherCert.teacherCertificate = info.teacherCertificate

src/views/role-auth/teacherAuth/components/base-info/index.module.less

@@ -21,5 +21,24 @@
       color: var(--el-color-primary);
       box-shadow: no;
     }
+
+    .el-select .el-select__tags .el-tag {
+      background-color: #dffff8;
+      border: 1px solid #4bb39e;
+      color: #4bb39e !important;
+      border-radius: 10px;
+      margin: 0 6px 0 0;
+      height: 30px;
+    }
+    .el-tag .el-icon {
+      color: #4bb39e;
+      background-color: transparent;
+    }
+
+    .plyr {
+      width: 150px;
+      height: 85px;
+      min-width: auto;
+    }
   }
 }

src/views/role-auth/teacherAuth/components/base-info/index.tsx

@@ -1,10 +1,15 @@
+import ColUpload from '@/components/col-upload'
+import ColUploadVideo from '@/components/col-upload-video'
+import ColVideo from '@/components/col-video'
 import {
   ElButton,
+  ElCol,
   ElForm,
   ElFormItem,
   ElInput,
   ElOption,
   ElOptionGroup,
+  ElRow,
   ElSelect
 } from 'element-plus'
 import { defineComponent } from 'vue'
@@ -63,6 +68,28 @@ export default defineComponent({
             rows={5}
           />
         </ElFormItem>
+        {teacherState.teacherCert.styleVideo.map((item: any, index: number) => (
+          <ElRow>
+            <ElCol span={12}>
+              <ElFormItem
+                label="个人风采"
+                prop={`styleVideo.${index}.videoUrl`}
+                rules={[{ required: true, message: '请上传视频' }]}
+              >
+                <ColUploadVideo v-model:modelValue={item.videoUrl} />
+              </ElFormItem>
+            </ElCol>
+            <ElCol span={10}>
+              <ElFormItem
+                style={{ paddingTop: '32px' }}
+                prop={`styleVideo.${index}.cover`}
+                rules={[{ required: true, message: '请上传视频封面' }]}
+              >
+                <ColUpload v-model:modelValue={item.cover} />
+              </ElFormItem>
+            </ElCol>
+          </ElRow>
+        ))}
         <ElFormItem>
           <div class="text-center w-full pt-8">
             <ElButton

src/views/role-auth/teacherAuth/components/edu-information/index.tsx

@@ -35,6 +35,7 @@ export default defineComponent({
             this.loading = true
             const params = deepClone(teacherState.teacherCert)
             params.subjectId = params.subjectId.join(',')
+            params.styleVideoJson = JSON.stringify(params.styleVideo)
             await request.post('/api-website/teacherAuthEntryRecord/doApply', {
               data: params
             })

src/views/role-auth/teacherAuth/teacherState.ts

@@ -17,6 +17,13 @@ export const teacherState = reactive({
     subject: null,
     gradCertificate: '',
     degreeCertificate: '',
-    teacherCertificate: ''
+    teacherCertificate: '',
+    styleVideoJson: '',
+    styleVideo: [
+      {
+        videoUrl: '',
+        cover: ''
+      }
+    ]
   }
 })

src/views/user-info/music-operation/index.tsx

@@ -226,13 +226,11 @@ export default defineComponent({
     },
     onDetail(type: string) {
       let url = `${location.origin}/teacher/#/registerProtocol`
-
       if (type === 'question') {
-        // url = `${location.origin}/teacher/muic-standard/index.html`
+        url = `${location.origin}/teacher/muic-standard/question.html`
       } else if (type === 'music') {
         url = `${location.origin}/teacher/muic-standard/index.html`
       }
-
       window.open(url)
     }
   },
@@ -353,9 +351,9 @@ export default defineComponent({
           ) : (
             <>
               <ElFormItem
-                label="是否带节拍器"
+                label="伴奏类型"
                 prop="accompanimentType"
-                rules={[{ required: true, message: '请选择是否带节拍器' }]}
+                rules={[{ required: true, message: '请选择伴奏类型' }]}
               >
                 <ElRadioGroup v-model={this.form.accompanimentType}>
                   <ElRadioButton label={'HOMEMODE'} class="mr-3 w-24">