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

src/base-event.ts

@@ -0,0 +1,7 @@
+import EventEmitter from "eventemitter3"
+
+export default new EventEmitter()
+
+/**
+ * 事件列表
+ */

src/components/o-upload-all/index.tsx

@@ -48,7 +48,7 @@ export default defineComponent({
     },
     bucket: {
       type: String,
-      default: 'gyt'
+      default: 'daya'
     },
     path: {
       type: String,

src/school/orchestra/compontent/photo-create.tsx

@@ -75,7 +75,7 @@ export default defineComponent({
           await request.post('/api-school/orchestraPhotoAlbum/update', {
             data: {
               id: state.selectItem.id,
-              orchestraId: route.query.id,
+              orchestraId: route.query.orchestraId,
               parentId: route.query.parentId,
               name: state.photoName
             }

src/student/App.tsx

@@ -0,0 +1,32 @@
+import { Toast } from 'vant'
+import { defineComponent, reactive } from 'vue'
+import { Vue3Lottie } from 'vue3-lottie'
+import AstronautJSON from '../components/o-full-refresh/datas/data.json'
+import baseEvent from '@/base-event'
+
+export default defineComponent({
+  name: 'App',
+  setup() {
+    const state = reactive({
+      showToast: true
+    })
+
+    return () => (
+      <>
+        <router-view></router-view>
+        {/* <div class={'appRootToast'}>
+          <Toast v-model:show={state.showToast} overlay duration={30000}>
+            {{
+              message: () => (
+                <>
+                  <Vue3Lottie class={'toastAnimate'} animationData={AstronautJSON}></Vue3Lottie>
+                  <p>加载中...</p>
+                </>
+              )
+            }}
+          </Toast>
+        </div> */}
+      </>
+    )
+  }
+})

src/student/App.vue

@@ -1,11 +0,0 @@
-<template>
-  <router-view></router-view>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-  name: 'App'
-});
-</script>

src/student/main.ts

@@ -1,5 +1,5 @@
 import { createApp } from 'vue'
-import App from './App.vue'
+import App from './App'
 import router from '../router/index'
 // import { postMessage } from '@/helpers/native-message'
 import 'vant/lib/index.css'

src/styles/index.less

@@ -189,6 +189,29 @@ body {
   --music-list-item-free-color: #ff4700;
   --music-list-item-charge-bg: #e1f0ff;
   --music-list-item-charge-color: #0086ff;
+  --van-overlay-background: rgba(0, 0, 0, 0.4);
+}
+
+.appRootToast {
+  // .van-overlay {
+  //   background: rgba(0, 0, 0, 0.4);
+  // }
+  .van-toast__text {
+    width: 100px;
+    height: 100px;
+    color: #333;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+  }
+  .van-toast--text {
+    background-color: #fff;
+  }
+  .toastAnimate {
+    width: 70px;
+    height: 70px;
+  }
 }
 
 .cell-section {

src/teacher/attendance/index.tsx

@@ -158,7 +158,7 @@ export default defineComponent({
       getList()
     }
     return () => (
-      <>
+      <div class={!showContact.value && 'emptyRootContainer'}>
         <OSticky position="top">
           <OHeader />
           <div class={styles.chioseWrap}>
@@ -250,7 +250,7 @@ export default defineComponent({
           actions={state.courseList}
           onSelect={checkSubject}
         ></ActionSheet>
-      </>
+      </div>
     )
   }
 })

src/views/unit-test/model/drag-question/index.tsx

@@ -222,7 +222,6 @@ export default defineComponent({
                     <div class={styles.value}>{item.questionAnswer}</div>
                   )}
                 </div>
-                {props.showRate && <div class={styles.answerChoice}>{item.selectRate}%人选择</div>}
               </div>
             ))}
             <div class={[styles.sortReset, 'van-hairline--top']}>

src/views/unit-test/unit-detail/index.tsx

@@ -87,7 +87,7 @@ export default defineComponent({
         // 问题列表
         const temp = data.examinationQuestionAdds || []
         temp.forEach((item: any) => {
-          item.userAnswer = formatTeacherAnswer(item.answers)
+          item.userAnswer = formatTeacherAnswer(item.answers || [])
           item.showAnalysis = true
           item.showRate = true
           item.analysis = {